svn commit: r680883 - in /maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client: JettyDeployerTest.java SecureJettyDeployerTest.java

[janb]

Author: janb
Date: Tue Jul 29 16:37:58 2008
New Revision: 680883

URL: http://svn.apache.org/viewvc?rev=680883&view=rev
Log:
Expose setup of Server and Verifiers to test subclasses.

Modified:
    
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
    
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/SecureJettyDeployerTest.java

Modified: 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java?rev=680883&r1=680882&r2=680883&view=diff
==============================================================================
--- 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
 (original)
+++ 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
 Tue Jul 29 16:37:58 2008
@@ -122,12 +122,17 @@
         _putServer = new SimplePutServer();
         _putServer.start();
         _port = String.valueOf(_putServer.getPort());
+        setUpVerifiers();
+        super.setUp();
+    }
+    
+    protected void setUpVerifiers () throws Exception
+    {
         HashSet<org.apache.maven.mercury.transport.api.Server> 
remoteServerTypes = new 
HashSet<org.apache.maven.mercury.transport.api.Server>();
         remoteServerType = new 
org.apache.maven.mercury.transport.api.Server(new URL(_HOST_FRAGMENT+_port));
         factories = new HashSet<StreamObserverFactory>();       
         remoteServerTypes.add(remoteServerType);
         _deployer.setServers(remoteServerTypes);
-        super.setUp();
     }
 
     protected void tearDown() throws Exception

Modified: 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/SecureJettyDeployerTest.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/SecureJettyDeployerTest.java?rev=680883&r1=680882&r2=680883&view=diff
==============================================================================
--- 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/SecureJettyDeployerTest.java
 (original)
+++ 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/SecureJettyDeployerTest.java
 Tue Jul 29 16:37:58 2008
@@ -37,6 +37,7 @@
         _putServer = new SecurePutServer();
         _putServer.start();
         _port = String.valueOf(_putServer.getPort());
+        setUpVerifiers();
         //super.setUp();
     }