continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1659097 - in /continuum/trunk/continuum-distributed/continuum-distributed-tests: ./ src/test/it/org/apache/continuum/distributed/transport/tests/
Date Wed, 11 Feb 2015 21:28:33 GMT
Author: batkinson
Date: Wed Feb 11 21:28:32 2015
New Revision: 1659097

URL: http://svn.apache.org/r1659097
Log:
Updated the disabled distributed-tests to junit 4, for completeness.

Modified:
    continuum/trunk/continuum-distributed/continuum-distributed-tests/pom.xml
    continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/MasterBuildAgentTransportServiceTest.java
    continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java

Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/pom.xml?rev=1659097&r1=1659096&r2=1659097&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/pom.xml Wed Feb 11 21:28:32
2015
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>continuum-distributed</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-distributed-tests</artifactId>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/MasterBuildAgentTransportServiceTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/MasterBuildAgentTransportServiceTest.java?rev=1659097&r1=1659096&r2=1659097&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/MasterBuildAgentTransportServiceTest.java
(original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/MasterBuildAgentTransportServiceTest.java
Wed Feb 11 21:28:32 2015
@@ -25,34 +25,37 @@ import org.apache.continuum.distributed.
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.net.URL;
 import java.util.HashMap;
 
+import static org.junit.Assert.*;
+
 /**
  * MasterBuildAgentTransportServiceTest
  */
 public class MasterBuildAgentTransportServiceTest
-    extends TestCase
 {
     private MasterBuildAgentTransportService masterProxy;
 
     private BeanFactory beanFactory = new XmlBeanFactory( new ClassPathResource( "applicationContext.xml"
) );
 
-    protected void setUp()
+    @Before
+    public void setUp()
         throws Exception
     {
-        super.setUp();
-
         masterProxy = new MasterBuildAgentTransportClient( new URL( "http://localhost:9191/master-xmlrpc"
), null,
                                                            null );
     }
 
+    @Test
     public void testReturnBuildResult()
     {
         try
         {
-            masterProxy.returnBuildResult( new HashMap() );
+            masterProxy.returnBuildResult( new HashMap<String, Object>(), /* ??? */
null );
         }
         catch ( Exception e )
         {
@@ -60,18 +63,21 @@ public class MasterBuildAgentTransportSe
         }
     }
 
+    /* this method apparently no longer exists in the interface
+    @Test
     public void testReturnScmResult()
     {
         try
         {
-            masterProxy.returnScmResult( new HashMap() );
+            masterProxy.returnScmResult( new HashMap<String, Object>() );
         }
         catch ( Exception e )
         {
             fail( e.getMessage() );
         }
-    }
+    } */
 
+    @Test
     public void testPing()
     {
         try

Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java?rev=1659097&r1=1659096&r2=1659097&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java
(original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java
Wed Feb 11 21:28:32 2015
@@ -25,28 +25,31 @@ import org.apache.continuum.distributed.
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.net.URL;
 import java.util.Collections;
 
+import static org.junit.Assert.*;
+
 /**
  * SlaveBuildAgentTransportServiceTest
  */
 public class SlaveBuildAgentTransportServiceTest
-    extends TestCase
 {
     private SlaveBuildAgentTransportService slaveProxy;
 
     private BeanFactory beanFactory = new XmlBeanFactory( new ClassPathResource( "applicationContext.xml"
) );
 
+    @Before
     protected void setUp()
         throws Exception
     {
-        super.setUp();
-
         slaveProxy = new SlaveBuildAgentTransportClient( new URL( "http://localhost:9191/slave-xmlrpc"
), null, null );
     }
 
+    @Test
     public void testBuildProjects()
     {
         try
@@ -59,6 +62,7 @@ public class SlaveBuildAgentTransportSer
         }
     }
 
+    @Test
     public void testGetAvailableInstallations()
     {
         try
@@ -71,6 +75,7 @@ public class SlaveBuildAgentTransportSer
         }
     }
 
+    @Test
     public void testGetBuildResult()
     {
         try
@@ -83,6 +88,7 @@ public class SlaveBuildAgentTransportSer
         }
     }
 
+    @Test
     public void testGetProjectCurrentlyBuilding()
     {
         try
@@ -95,6 +101,7 @@ public class SlaveBuildAgentTransportSer
         }
     }
 
+    @Test
     public void testPing()
     {
         try
@@ -107,6 +114,7 @@ public class SlaveBuildAgentTransportSer
         }
     }
 
+    @Test
     public void testExecuteDirectoryPurge()
     {
         try



Mime
View raw message