| commit | c17cf0b6982891b391a060d626d9fec2c0faf058 | [log] [tgz] |
|---|---|---|
| author | Robert Burrell Donkin <rdonkin@apache.org> | Sun Nov 11 12:36:01 2012 +0000 |
| committer | Robert Burrell Donkin <rdonkin@apache.org> | Sun Nov 11 12:36:01 2012 +0000 |
| tree | 7f19f352704034d6fc415c6022e78c2aed6ccc67 | |
| parent | 8274f4827a0e175fc2dfa936fb2245e0c5d93e36 [diff] |
Improve recognition of CDDL phrasing varients in integration tests git-svn-id: https://svn.apache.org/repos/asf/creadur/whisker/trunk@1407956 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/apache-whisker-plugin4maven/src/it/example-copyright-notices/descriptor.xml b/apache-whisker-plugin4maven/src/it/example-copyright-notices/descriptor.xml index 43cf745..e617f0e 100644 --- a/apache-whisker-plugin4maven/src/it/example-copyright-notices/descriptor.xml +++ b/apache-whisker-plugin4maven/src/it/example-copyright-notices/descriptor.xml
@@ -94,7 +94,7 @@ <license name='COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0' id='osi:CDDL-1.0' url='opensource.org/licenses/CDDL-1.0'> <text> - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0 (CDDL-1.0) 1. Definitions. 1.1. Contributor means each individual or entity that
diff --git a/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/Helpers.java b/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/Helpers.java index 26e7981..86c31f6 100644 --- a/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/Helpers.java +++ b/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/Helpers.java
@@ -19,6 +19,7 @@ package org.apache.creadur.whisker.it; import static org.apache.creadur.whisker.it.Not.not; +import static org.apache.creadur.whisker.it.CheckHelpers.*; import java.io.File; @@ -41,7 +42,9 @@ } public static Check aLineContainsCDDL1() { - return new AnyLineContainsCheck("COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0"); + return aLineContainsEither( + "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0", + "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0 (CDDL-1.0)"); } public static Check aLineContains(String value) {
diff --git a/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/LicenseVerifier.java b/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/LicenseVerifier.java index ceed250..bc2e2cf 100644 --- a/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/LicenseVerifier.java +++ b/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/LicenseVerifier.java
@@ -35,7 +35,7 @@ this.checks = new ArrayList<Check>(); } - public LicenseVerifier expectThat(final AnyLineContainsCheck check) { + public LicenseVerifier expectThat(final Check check) { this.checks.add(check); return this; }