You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ja...@apache.org on 2008/08/11 05:59:28 UTC
svn commit: r684627 - in
/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http:
client/ server/
Author: janb
Date: Sun Aug 10 20:59:28 2008
New Revision: 684627
URL: http://svn.apache.org/viewvc?rev=684627&view=rev
Log:
Ensure files in /tmp are deleted after every test.
Modified:
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/SecureJettyDeployerTest.java
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SecurePutServer.java
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimplePutServer.java
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java
Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java?rev=684627&r1=684626&r2=684627&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java Sun Aug 10 20:59:28 2008
@@ -93,6 +93,11 @@
public JettyDeployerTest () throws Exception
{
+
+ }
+
+ public void setUpFiles () throws Exception
+ {
//copy the test files from the classpath to disk
_baseDir = File.createTempFile("deployerTestFiles",null);
_baseDir.delete();
@@ -113,7 +118,7 @@
protected void setUp() throws Exception
{
-
+ setUpFiles();
_deployer = new DefaultDeployer();
_putServer = new SimplePutServer();
_putServer.start();
@@ -122,6 +127,22 @@
super.setUp();
}
+
+ public void destroy (File f)
+ {
+ if (f == null)
+ return;
+ if (f.isDirectory())
+ {
+ File[] files = f.listFiles();
+ for (int i=0;files!=null && i<files.length; i++)
+ {
+ destroy (files[i]);
+ }
+ }
+ f.delete();
+ }
+
protected void setUpVerifiers () throws Exception
{
HashSet<org.apache.maven.mercury.transport.api.Server> remoteServerTypes = new HashSet<org.apache.maven.mercury.transport.api.Server>();
@@ -134,7 +155,9 @@
protected void tearDown() throws Exception
{
_putServer.stop();
- _putServer.destroy();
+ _putServer.destroy();
+ destroy(_baseDir);
+ System.err.println("Destroyed "+_baseDir.getAbsolutePath());
super.tearDown();
}
@@ -145,6 +168,8 @@
factories.add(new SHA1VerifierFactory(false, true)); //!lenient, sufficient
remoteServerType.setStreamObserverFactories(factories);
+ System.err.println("Basedir = "+_baseDir.getAbsolutePath());
+
_file0 = new File(_baseDir, "file0.txt");
_file1 = new File(_baseDir, "file1.txt");
_file2 = new File(_baseDir, "file2.txt");
Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java?rev=684627&r1=684626&r2=684627&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java Sun Aug 10 20:59:28 2008
@@ -54,6 +54,7 @@
SimpleTestServer server;
Server remoteServerType;
HashSet<StreamObserverFactory> factories;
+ File dir;
public class TxtValidator implements Validator
@@ -119,8 +120,24 @@
super.tearDown();
server.stop();
server.destroy();
+ destroy(dir);
+ }
+
+
+ public void destroy (File f)
+ {
+ if (f == null)
+ return;
+ if (f.isDirectory())
+ {
+ File[] files = f.listFiles();
+ for (int i=0;files!=null && i<files.length; i++)
+ {
+ destroy (files[i]);
+ }
+ }
+ f.delete();
}
-
public File mkTempDir()
@@ -143,7 +160,7 @@
remoteServerType.setStreamObserverFactories(factories);
//make local dir to put stuff in
- final File dir = mkTempDir();
+ dir = mkTempDir();
DefaultRetrievalRequest request = new DefaultRetrievalRequest();
HashSet<Binding> bindings = new HashSet<Binding>();
@@ -196,7 +213,7 @@
remoteServerType.setStreamObserverFactories(factories);
//make local dir to put stuff in
- final File dir = mkTempDir();
+ dir = mkTempDir();
DefaultRetrievalRequest request = new DefaultRetrievalRequest();
HashSet<Binding> bindings = new HashSet<Binding>();
@@ -254,7 +271,7 @@
remoteServerType.setStreamObserverFactories(factories);
//make local dir to put stuff in
- final File dir = mkTempDir();
+ dir = mkTempDir();
DefaultRetrievalRequest request = new DefaultRetrievalRequest();
HashSet<Binding> bindings = new HashSet<Binding>();
@@ -302,7 +319,7 @@
factories.add(new SHA1VerifierFactory(true, true)); //lenient, sufficient
remoteServerType.setStreamObserverFactories(factories);
//make local dir to put stuff in
- final File dir = mkTempDir();
+ dir = mkTempDir();
DefaultRetrievalRequest request = new DefaultRetrievalRequest();
HashSet<Binding> bindings = new HashSet<Binding>();
@@ -350,7 +367,7 @@
remoteServerType.setStreamObserverFactories(factories);
//make local dir to put stuff in
- final File dir = mkTempDir();
+ dir = mkTempDir();
DefaultRetrievalRequest request = new DefaultRetrievalRequest();
HashSet<Binding> bindings = new HashSet<Binding>();
HashSet<Validator> validators = new HashSet<Validator>();
@@ -402,7 +419,7 @@
remoteServerType.setStreamObserverFactories(factories);
//make local dir to put stuff in
- final File dir = mkTempDir();
+ dir = mkTempDir();
DefaultRetrievalRequest request = new DefaultRetrievalRequest();
HashSet<Binding> bindings = new HashSet<Binding>();
HashSet<Validator> validators = new HashSet<Validator>();
@@ -455,7 +472,7 @@
remoteServerType.setStreamObserverFactories(factories);
//make local dir to put stuff in
- final File dir = mkTempDir();
+ dir = mkTempDir();
DefaultRetrievalRequest request = new DefaultRetrievalRequest();
HashSet<Binding> bindings = new HashSet<Binding>();
HashSet<Validator> validators = new HashSet<Validator>();
Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/SecureJettyDeployerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/SecureJettyDeployerTest.java?rev=684627&r1=684626&r2=684627&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/SecureJettyDeployerTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/SecureJettyDeployerTest.java Sun Aug 10 20:59:28 2008
@@ -33,6 +33,7 @@
{
_HOST_FRAGMENT = "https://localhost:";
+ setUpFiles();
_deployer = new DefaultDeployer();
_putServer = new SecurePutServer();
_putServer.start();
Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java?rev=684627&r1=684626&r2=684627&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java Sun Aug 10 20:59:28 2008
@@ -65,8 +65,24 @@
protected void tearDown() throws Exception
{
super.tearDown();
+ tester.stop();
+ destroy(_baseDir);
}
+ public void destroy (File f)
+ {
+ if (f == null)
+ return;
+ if (f.isDirectory())
+ {
+ File[] files = f.listFiles();
+ for (int i=0;files!=null && i<files.length; i++)
+ {
+ destroy (files[i]);
+ }
+ }
+ f.delete();
+ }
public void testHandlePutWithoutBatching() throws Exception
{
Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SecurePutServer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SecurePutServer.java?rev=684627&r1=684626&r2=684627&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SecurePutServer.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SecurePutServer.java Sun Aug 10 20:59:28 2008
@@ -74,12 +74,7 @@
public void destroy ()
{
super.destroy();
- File[] files = _base.listFiles();
- for (int i=0;files!=null && i>0; i++)
- {
- files[i].delete();
- }
- _base.delete();
+ destroy(_base);
}
public static void main(String[] args)
Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimplePutServer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimplePutServer.java?rev=684627&r1=684626&r2=684627&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimplePutServer.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimplePutServer.java Sun Aug 10 20:59:28 2008
@@ -57,14 +57,26 @@
public void destroy ()
{
super.destroy();
- File[] files = _base.listFiles();
- for (int i=0;files!=null && i>0; i++)
+ destroy(_base);
+ }
+
+ public void destroy (File f)
+ {
+ if (f == null)
+ return;
+ if (f.isDirectory())
{
- files[i].delete();
+ File[] files = f.listFiles();
+ for (int i=0;files!=null && i<files.length; i++)
+ {
+ destroy (files[i]);
+ }
}
- _base.delete();
+ f.delete();
}
+
+
/* (non-Javadoc)
* @see org.apache.maven.mercury.spi.http.server.PutServer#getPutDir()
*/
Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java?rev=684627&r1=684626&r2=684627&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java Sun Aug 10 20:59:28 2008
@@ -32,6 +32,9 @@
public class SimpleTestServer
extends Server
{
+ File base;
+
+
public SimpleTestServer()
throws Exception
{
@@ -49,7 +52,7 @@
Context context = new Context( handlers, remotePathFragment );
handlers.addHandler( new DefaultHandler() );
- File base = File.createTempFile( "simpleTestServer", null );
+ base = File.createTempFile( "simpleTestServer", null );
base.delete();
base.mkdir();
base.deleteOnExit();
@@ -75,6 +78,28 @@
{
return getConnectors()[0].getLocalPort();
}
+
+ public void destroy()
+ {
+ super.destroy();
+ destroy(base);
+ }
+
+ public void destroy (File f)
+ {
+ if (f == null)
+ return;
+ if (f.isDirectory())
+ {
+ File[] files = f.listFiles();
+ for (int i=0;files!=null && i<files.length; i++)
+ {
+ destroy (files[i]);
+ }
+ }
+ f.delete();
+ }
+
public static void main( String[] args )
throws Exception