svn commit: r703887 - /synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/

[veithen]

Author: veithen
Date: Sun Oct 12 14:51:42 2008
New Revision: 703887

URL: http://svn.apache.org/viewvc?rev=703887&view=rev
Log:
Transport test kit: Improved resource set up/tear down.

Modified:
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseClient.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseFileChannel.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java?rev=703887&r1=703886&r2=703887&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
 Sun Oct 12 14:51:42 2008
@@ -29,12 +29,14 @@
 import org.apache.axis2.transport.testkit.client.ClientOptions;
 import org.apache.axis2.transport.testkit.client.TestClient;
 import org.apache.axis2.transport.testkit.name.Name;
+import org.apache.axis2.transport.testkit.tests.Setup;
+import org.apache.axis2.transport.testkit.tests.Transient;
 
 @Name("java.io")
 public class VFSClient implements TestClient {
-    private File requestFile;
+    private @Transient File requestFile;
     
-    @SuppressWarnings("unused")
+    @Setup @SuppressWarnings("unused")
     private void setUp(VFSFileChannel channel) {
         requestFile = channel.getRequestFile();
     }

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java?rev=703887&r1=703886&r2=703887&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
 Sun Oct 12 14:51:42 2008
@@ -24,10 +24,12 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.transport.testkit.axis2.AxisServiceConfigurator;
+import org.apache.axis2.transport.testkit.tests.Setup;
+import org.apache.axis2.transport.testkit.tests.Transient;
 
 public class VFSFileChannel implements AxisServiceConfigurator {
     private final String path;
-    private File requestFile;
+    private @Transient File requestFile;
     
     public VFSFileChannel(String path) {
         this.path = path;
@@ -54,7 +56,7 @@
         return file;
     }
     
-    @SuppressWarnings("unused")
+    @Setup @SuppressWarnings("unused")
     private void setUp(VFSTestEnvironment env) throws Exception {
         requestFile = preparePath(env, path);
     }

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java?rev=703887&r1=703886&r2=703887&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
 Sun Oct 12 14:51:42 2008
@@ -26,13 +26,15 @@
 import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
 import org.apache.axis2.transport.testkit.message.IncomingMessage;
 import org.apache.axis2.transport.testkit.name.Name;
+import org.apache.axis2.transport.testkit.tests.Setup;
+import org.apache.axis2.transport.testkit.tests.Transient;
 
 @Name("mock")
 public class VFSMockAsyncEndpoint implements AsyncEndpoint<byte[]> {
-    private VFSFileChannel channel;
-    private ContentType contentType;
+    private @Transient VFSFileChannel channel;
+    private @Transient ContentType contentType;
     
-    @SuppressWarnings("unused")
+    @Setup @SuppressWarnings("unused")
     private void setUp(VFSFileChannel channel, TestClient client, 
ClientOptions options) throws Exception {
         this.channel = channel;
         contentType = client.getContentType(options, 
options.getBaseContentType());

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseClient.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseClient.java?rev=703887&r1=703886&r2=703887&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseClient.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseClient.java
 Sun Oct 12 14:51:42 2008
@@ -26,11 +26,13 @@
 import org.apache.axis2.transport.testkit.client.ClientOptions;
 import org.apache.axis2.transport.testkit.client.RequestResponseTestClient;
 import org.apache.axis2.transport.testkit.message.IncomingMessage;
+import org.apache.axis2.transport.testkit.tests.Setup;
+import org.apache.axis2.transport.testkit.tests.Transient;
 
 public class VFSRequestResponseClient extends VFSClient implements 
RequestResponseTestClient<byte[],byte[]> {
-    private File replyFile;
+    private @Transient File replyFile;
     
-    @SuppressWarnings("unused")
+    @Setup @SuppressWarnings("unused")
     private void setUp(VFSRequestResponseFileChannel channel) {
         replyFile = channel.getReplyFile();
     }

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseFileChannel.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseFileChannel.java?rev=703887&r1=703886&r2=703887&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseFileChannel.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseFileChannel.java
 Sun Oct 12 14:51:42 2008
@@ -23,10 +23,12 @@
 
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.transport.testkit.channel.RequestResponseChannel;
+import org.apache.axis2.transport.testkit.tests.Setup;
+import org.apache.axis2.transport.testkit.tests.Transient;
 
 public class VFSRequestResponseFileChannel extends VFSFileChannel implements 
RequestResponseChannel {
     private final String replyPath;
-    private File replyFile;
+    private @Transient File replyFile;
     
     public VFSRequestResponseFileChannel(String path, String replyPath) {
         super(path);
@@ -43,7 +45,7 @@
         service.addParameter("transport.vfs.ReplyFileURI", "vfs:" + 
replyFile.toURL());
     }
     
-    @SuppressWarnings("unused")
+    @Setup @SuppressWarnings("unused")
     private void setUp(VFSTestEnvironment env) throws Exception {
         replyFile = preparePath(env, replyPath);
     }

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java?rev=703887&r1=703886&r2=703887&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java
 Sun Oct 12 14:51:42 2008
@@ -21,6 +21,8 @@
 
 import java.io.File;
 
+import org.apache.axis2.transport.testkit.tests.Setup;
+
 public class VFSTestEnvironment {
     private final File rootDir;
     
@@ -28,7 +30,7 @@
         this.rootDir = rootDir;
     }
 
-    @SuppressWarnings("unused")
+    @Setup @SuppressWarnings("unused")
     private void setUp() {
         rootDir.mkdirs();
     }