creadur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r1407956 - in /creadur/whisker/trunk/apache-whisker-plugin4maven/src: it/example-copyright-notices/descriptor.xml test/java/org/apache/creadur/whisker/it/Helpers.java test/java/org/apache/creadur/whisker/it/LicenseVerifier.java
Date Sun, 11 Nov 2012 12:36:03 GMT
Author: rdonkin
Date: Sun Nov 11 12:36:01 2012
New Revision: 1407956

URL: http://svn.apache.org/viewvc?rev=1407956&view=rev
Log:
Improve recognition of CDDL phrasing varients in integration tests

Modified:
    creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/example-copyright-notices/descriptor.xml
    creadur/whisker/trunk/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/Helpers.java
    creadur/whisker/trunk/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/LicenseVerifier.java

Modified: creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/example-copyright-notices/descriptor.xml
URL: http://svn.apache.org/viewvc/creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/example-copyright-notices/descriptor.xml?rev=1407956&r1=1407955&r2=1407956&view=diff
==============================================================================
--- creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/example-copyright-notices/descriptor.xml
(original)
+++ creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/example-copyright-notices/descriptor.xml
Sun Nov 11 12:36:01 2012
@@ -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

Modified: creadur/whisker/trunk/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/Helpers.java
URL: http://svn.apache.org/viewvc/creadur/whisker/trunk/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/Helpers.java?rev=1407956&r1=1407955&r2=1407956&view=diff
==============================================================================
--- creadur/whisker/trunk/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/Helpers.java
(original)
+++ creadur/whisker/trunk/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/Helpers.java
Sun Nov 11 12:36:01 2012
@@ -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 class Helpers {
     }
 
     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) {

Modified: creadur/whisker/trunk/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/LicenseVerifier.java
URL: http://svn.apache.org/viewvc/creadur/whisker/trunk/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/LicenseVerifier.java?rev=1407956&r1=1407955&r2=1407956&view=diff
==============================================================================
--- creadur/whisker/trunk/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/LicenseVerifier.java
(original)
+++ creadur/whisker/trunk/apache-whisker-plugin4maven/src/test/java/org/apache/creadur/whisker/it/LicenseVerifier.java
Sun Nov 11 12:36:01 2012
@@ -35,7 +35,7 @@ public class LicenseVerifier {
         this.checks = new ArrayList<Check>();
     }
 
-    public LicenseVerifier expectThat(final AnyLineContainsCheck check) {
+    public LicenseVerifier expectThat(final Check check) {
         this.checks.add(check);
         return this;
     }



Mime
View raw message