Updated to a version of cool that fixes JENKINS-20747. Updated J-Unit…

… version.
jenkinsci · Nov 26, 2013 · 525e46d · 525e46d
1 parent f839cac
commit 525e46d
Show file tree

Hide file tree

Showing 38 changed files with 69 additions and 73 deletions.
diff --git a/pom.xml b/pom.xml
@@ -445,22 +445,22 @@
         <dependency>
             <groupId>net.praqma</groupId>
             <artifactId>cool</artifactId>
-            <version>0.6.25-SNAPSHOT</version>
+            <version>0.6.25</version>
             <type>jar</type>
         </dependency>
 
         <dependency>
             <groupId>net.praqma</groupId>
             <artifactId>cool</artifactId>
-            <version>0.6.25-SNAPSHOT</version>
+            <version>0.6.25</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>4.11</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/child/ActivityTest.java b/src/test/java/net/praqma/hudson/test/integration/child/ActivityTest.java
@@ -37,7 +37,7 @@
 public class ActivityTest extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
 
 	private static Logger logger = Logger.getLogger();
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/child/BaselinesFound.java b/src/test/java/net/praqma/hudson/test/integration/child/BaselinesFound.java
@@ -39,10 +39,10 @@
 public class BaselinesFound extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
 
 	@Rule
-	public static DescriptionRule desc = new DescriptionRule();
+	public DescriptionRule desc = new DescriptionRule();
 
 	private static Logger logger = Logger.getLogger();
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/child/BaselinesFoundFailed.java b/src/test/java/net/praqma/hudson/test/integration/child/BaselinesFoundFailed.java
@@ -38,7 +38,7 @@
 public class BaselinesFoundFailed extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
 
 	private static Logger logger = Logger.getLogger();
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/child/GetBaselinesTest.java b/src/test/java/net/praqma/hudson/test/integration/child/GetBaselinesTest.java
@@ -42,7 +42,7 @@ public class GetBaselinesTest extends BaseTestClass {
 	public static LoggerRule loggerRule = new LoggerRule();
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm-child-getbaselines" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm-child-getbaselines" );
 
 	private static Logger logger = Logger.getLogger();
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/child/Polling.java b/src/test/java/net/praqma/hudson/test/integration/child/Polling.java
@@ -41,7 +41,7 @@
 public class Polling extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm-child-polling" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm-child-polling" );
 
 	private static Logger logger = Logger.getLogger();
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/self/Any.java b/src/test/java/net/praqma/hudson/test/integration/self/Any.java
@@ -23,19 +23,22 @@
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
 
 /**
  * User: cwolfgang
  * Date: 08-11-12
  * Time: 22:12
  */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class Any extends BaseTestClass {
 
     @Rule
-    public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
+    public ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
 
     @Rule
-    public static DescriptionRule desc = new DescriptionRule();
+    public DescriptionRule desc = new DescriptionRule();
 
     private static Logger logger = Logger.getLogger();
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/self/BaselinesFound.java b/src/test/java/net/praqma/hudson/test/integration/self/BaselinesFound.java
@@ -1,10 +1,7 @@
 package net.praqma.hudson.test.integration.self;
 
-import static org.junit.Assert.*;
 
 import net.praqma.hudson.test.BaseTestClass;
-import net.praqma.util.test.junit.LoggingRule;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -14,17 +11,18 @@
 import net.praqma.clearcase.test.junit.ClearCaseRule;
 import net.praqma.clearcase.ucm.entities.Baseline;
 import net.praqma.clearcase.ucm.entities.Project.PromotionLevel;
-import net.praqma.hudson.test.CCUCMRule;
 import net.praqma.hudson.test.SystemValidator;
 import net.praqma.util.test.junit.TestDescription;
 
-import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
 
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class BaselinesFound extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
 
 	private static Logger logger = Logger.getLogger( BaselinesFound.class.getName() );
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/self/BaselinesFoundFails.java b/src/test/java/net/praqma/hudson/test/integration/self/BaselinesFoundFails.java
@@ -1,33 +1,28 @@
 package net.praqma.hudson.test.integration.self;
 
-import static org.junit.Assert.*;
 
 import net.praqma.hudson.test.BaseTestClass;
-import net.praqma.util.test.junit.LoggingRule;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.jvnet.hudson.test.JenkinsRule;
 
 import hudson.model.AbstractBuild;
-import hudson.model.FreeStyleProject;
 import hudson.model.Result;
-import net.praqma.clearcase.Environment;
 import net.praqma.clearcase.test.annotations.ClearCaseUniqueVobName;
 import net.praqma.clearcase.test.junit.ClearCaseRule;
 import net.praqma.clearcase.ucm.entities.Baseline;
 import net.praqma.clearcase.ucm.entities.Project.PromotionLevel;
-import net.praqma.hudson.test.CCUCMRule;
 import net.praqma.hudson.test.SystemValidator;
 import net.praqma.util.test.junit.TestDescription;
 import net.praqma.util.debug.Logger;
 
-import java.util.logging.Level;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
 
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class BaselinesFoundFails extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
 
 	private static Logger logger = Logger.getLogger();
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/self/NoNewBaselinesFound.java b/src/test/java/net/praqma/hudson/test/integration/self/NoNewBaselinesFound.java
@@ -17,7 +17,7 @@
 public class NoNewBaselinesFound extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "no-new-baselines", "setup-basic.xml" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "no-new-baselines", "setup-basic.xml" );
 
 	private static Logger logger = Logger.getLogger( NoNewBaselinesFound.class.getName() );
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/self/Polling.java b/src/test/java/net/praqma/hudson/test/integration/self/Polling.java
@@ -33,7 +33,7 @@
 public class Polling extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );
 
 	private static Logger logger = Logger.getLogger();
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/sibling/BaselinesFound.java b/src/test/java/net/praqma/hudson/test/integration/sibling/BaselinesFound.java
@@ -22,7 +22,7 @@
 public class BaselinesFound extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm", "setup-interproject.xml" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm", "setup-interproject.xml" );
 
 	private static Logger logger = Logger.getLogger();
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS13944.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS13944.java
@@ -17,10 +17,10 @@
 public class JENKINS13944 extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-13944" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-13944" );
 
 	@Rule
-	public static DescriptionRule desc = new DescriptionRule();
+	public DescriptionRule desc = new DescriptionRule();
 
 	@Test
 	@TestDescription( title = "JENKINS-13944", text = "A baseline ís built successfully, but the tagging is not done, because the tag tyoe is not installed", configurations = { "Tag = true" }	)

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS14436.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS14436.java
@@ -33,10 +33,10 @@
 public class JENKINS14436 extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-14436", "setup-JENKINS-14436.xml" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-14436", "setup-JENKINS-14436.xml" );
 
 	@Rule
-	public static DescriptionRule desc = new DescriptionRule();
+	public DescriptionRule desc = new DescriptionRule();
 
 	@Test
 	@TestDescription( title = "JENKINS-14436", text = "Not all versions, only the latest are shown" )

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS14702.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS14702.java
@@ -22,10 +22,10 @@
 public class JENKINS14702 extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-14702", "setup-JENKINS-14702.xml" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-14702", "setup-JENKINS-14702.xml" );
 
 	@Rule
-	public static DescriptionRule desc = new DescriptionRule();
+	public DescriptionRule desc = new DescriptionRule();
 
 	@Test
 	@TestDescription( title = "JENKINS-14702", text = "Use the current streams project, if the jenkins build project is not found", configurations = { "Jenkins project = not created" }	)

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS14806.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS14806.java
@@ -30,10 +30,10 @@
 public class JENKINS14806 extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-14806", "setup-JENKINS-14806.xml" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-14806", "setup-JENKINS-14806.xml" );
 
 	@Rule
-	public static DescriptionRule desc = new DescriptionRule();
+	public DescriptionRule desc = new DescriptionRule();
 
 	@Test
 	@TestDescription( title = "JENKINS-14806", text = "Multisite polling finds the same baseline times", configurations = { "ClearCase multisite = true" }	)

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS16487.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS16487.java
@@ -21,10 +21,10 @@
 public class JENKINS16487 extends BaseTestClass {
 
     @Rule
-    public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-16487", "setup-JENKINS-16620.xml" );
+    public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-16487", "setup-JENKINS-16620.xml" );
 
     @Rule
-    public static DescriptionRule desc = new DescriptionRule();
+    public DescriptionRule desc = new DescriptionRule();
 
     @Test
     @TestDescription( title = "JENKINS-16487", text = "Promotion Level being set to INITIAL" )

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS16620.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS16620.java
@@ -25,10 +25,10 @@
 public class JENKINS16620 extends BaseTestClass {
 
     @Rule
-    public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-16620", "setup-JENKINS-16620.xml" );
+    public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-16620", "setup-JENKINS-16620.xml" );
 
     @Rule
-    public static DescriptionRule desc = new DescriptionRule();
+    public DescriptionRule desc = new DescriptionRule();
 
     @Test
     @TestDescription( title = "JENKINS-16620", text = "Changed baselines cannot be rebuild" )

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS16636.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS16636.java
@@ -25,10 +25,10 @@
 public class JENKINS16636 extends BaseTestClass {
 
     @Rule
-    public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-16636", "setup-JENKINS-16620.xml" );
+    public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-16636", "setup-JENKINS-16620.xml" );
 
     @Rule
-    public static DescriptionRule desc = new DescriptionRule();
+    public DescriptionRule desc = new DescriptionRule();
 
     @Test
     @TestDescription( title = "JENKINS-16636", text = "No new baseline found, but can be build anyway" )

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18278.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18278.java
@@ -38,10 +38,10 @@ public class JENKINS18278 extends BaseTestClass {
     private static Logger logger = Logger.getLogger( JENKINS18278.class.getName() );
 
     @Rule
-    public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-18278", "setup-basic.xml" );
+    public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-18278", "setup-basic.xml" );
 
     @Rule
-    public static DescriptionRule desc = new DescriptionRule();
+    public DescriptionRule desc = new DescriptionRule();
 
     @Test
     @ClearCaseUniqueVobName( name = "regular" )

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18278Base.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18278Base.java
@@ -33,7 +33,7 @@ public abstract class JENKINS18278Base extends BaseTestClass {
     private static Logger logger = Logger.getLogger( JENKINS18278Base.class.getName() );
 
     @Rule
-    public static DescriptionRule desc = new DescriptionRule();
+    public DescriptionRule desc = new DescriptionRule();
 
     public void printChangeLog( AbstractBuild build ) {
         System.out.println( "LISTING THE CHANGESET FOR " + build );

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18278Interproject.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18278Interproject.java
@@ -29,7 +29,7 @@ public class JENKINS18278Interproject extends JENKINS18278Base {
     private static Logger logger = Logger.getLogger( JENKINS18278Interproject.class.getName() );
 
     @Rule
-    public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-18278", "setup-interproject-basic.xml" );
+    public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-18278", "setup-interproject-basic.xml" );
 
     //@Test
     @ClearCaseUniqueVobName( name = "interproject" )

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18279.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18279.java
@@ -27,10 +27,10 @@ public class JENKINS18279 extends BaseTestClass {
     private static Logger logger = Logger.getLogger( JENKINS18279.class.getName() );
 
     @Rule
-    public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-18279" );
+    public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-18279" );
 
     @Rule
-    public static DescriptionRule desc = new DescriptionRule();
+    public DescriptionRule desc = new DescriptionRule();
 
     @Test
     @TestDescription( title = "JENKINS-18279", text = "Testing the swipe function. UPDT's must remain as non-view private files." )

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18280.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18280.java
@@ -21,10 +21,10 @@
 public class JENKINS18280 extends BaseTestClass {
 
     @Rule
-    public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-18280" );
+    public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-18280" );
 
     @Rule
-    public static DescriptionRule desc = new DescriptionRule();
+    public DescriptionRule desc = new DescriptionRule();
 
     @Test
     @TestDescription( title = "JENKINS-18280", text = "Testing the swipe function. Off and should leave the view private files as they were." )

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18281.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS18281.java
@@ -36,10 +36,10 @@ public class JENKINS18281 extends BaseTestClass {
     private static Logger logger = Logger.getLogger( JENKINS18281.class.getName() );
 
     @Rule
-    public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-18281", "setup-basic.xml" );
+    public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-18281", "setup-basic.xml" );
 
     @Rule
-    public static DescriptionRule desc = new DescriptionRule();
+    public DescriptionRule desc = new DescriptionRule();
 
     @Test
     @TestDescription( title = "JENKINS-18281", text = "Possibility to remove the contributing activities from the change set of the build. The WASHED CHANGESET fix." )

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS19558.java b/src/test/java/net/praqma/hudson/test/integration/userstories/JENKINS19558.java
@@ -23,10 +23,10 @@
 public class JENKINS19558 extends BaseTestClass {
 
     @Rule
-    public static ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-19558", "setup-bl-on-dev.xml" );
+    public ClearCaseRule ccenv = new ClearCaseRule( "JENKINS-19558", "setup-bl-on-dev.xml" );
 
     @Rule
-    public static DescriptionRule desc = new DescriptionRule();
+    public DescriptionRule desc = new DescriptionRule();
 
     @Test
     @TestDescription( title = "JENKINS-19558", text = "Failed deliver looses changeset, no changelog written" )

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/Story01.java b/src/test/java/net/praqma/hudson/test/integration/userstories/Story01.java
@@ -27,7 +27,7 @@
 public class Story01 extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm-story01" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm-story01" );
 
 	private static Logger logger = Logger.getLogger();
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/Story02.java b/src/test/java/net/praqma/hudson/test/integration/userstories/Story02.java
@@ -27,7 +27,7 @@
 public class Story02 extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm-story02" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm-story02" );
 
 	private static Logger logger = Logger.getLogger();
 

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/Story03.java b/src/test/java/net/praqma/hudson/test/integration/userstories/Story03.java
@@ -28,7 +28,7 @@
 public class Story03 extends BaseTestClass {
 
 	@Rule
-	public static ClearCaseRule ccenv = new ClearCaseRule( "ccucm-story03", "setup-story3.xml" );
+	public ClearCaseRule ccenv = new ClearCaseRule( "ccucm-story03", "setup-story3.xml" );
 
 	private static Logger logger = Logger.getLogger();