Author: veithen
Date: Thu Sep  4 12:13:05 2008
New Revision: 692195

URL: http://svn.apache.org/viewvc?rev=692195&view=rev
Log:
Transport test kit:
* Changed the naming algorithm to include an ID (sequence) in the test case 
names.
* Added infrastructure to allow logging of requests at various stages in the 
tests.

Added:
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/LogManager.java
Modified:
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/GreenMailTestEnvironment.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyAsyncEndpoint.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java?rev=692195&r1=692194&r2=692195&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java
 Thu Sep  4 12:13:05 2008
@@ -46,7 +46,7 @@
 
 public class JMSListenerTest extends TestCase {
     public static TestSuite suite() {
-        TransportTestSuite suite = new TransportTestSuite();
+        TransportTestSuite suite = new 
TransportTestSuite(JMSListenerTest.class);
         TransportDescriptionFactory tdf = new JMSTransportDescriptionFactory();
         AxisAsyncEndpoint asyncEndpoint = new AxisAsyncEndpoint();
         AxisEchoEndpoint echoEndpoint = new AxisEchoEndpoint();

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/GreenMailTestEnvironment.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/GreenMailTestEnvironment.java?rev=692195&r1=692194&r2=692195&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/GreenMailTestEnvironment.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/GreenMailTestEnvironment.java
 Thu Sep  4 12:13:05 2008
@@ -19,6 +19,7 @@
 
 package org.apache.synapse.transport.mail;
 
+import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -27,6 +28,7 @@
 import javax.mail.Flags;
 
 import org.apache.synapse.transport.testkit.name.Name;
+import org.apache.synapse.transport.testkit.util.LogManager;
 
 import com.icegreen.greenmail.store.FolderListener;
 import com.icegreen.greenmail.store.MailFolder;
@@ -43,14 +45,14 @@
     private static final ServerSetup POP3 =
             new ServerSetup(7110, "127.0.0.1", ServerSetup.PROTOCOL_POP3);
 
-    private static boolean debug = false;
-    
+    private LogManager logManager;
     private GreenMail greenMail;
     private int accountNumber;
     private List<Account> unallocatedAccounts;
 
     @SuppressWarnings("unused")
-    private void setUp() throws Exception {
+    private void setUp(LogManager logManager) throws Exception {
+        this.logManager = logManager;
         greenMail = new GreenMail(new ServerSetup[] { SMTP, POP3 });
         greenMail.start();
         unallocatedAccounts = new LinkedList<Account>();
@@ -62,6 +64,7 @@
         greenMail = null;
         accountNumber = 1;
         unallocatedAccounts = null;
+        logManager = null;
     }
     
     @Override
@@ -73,23 +76,26 @@
     public Account allocateAccount() throws Exception {
         if (unallocatedAccounts.isEmpty()) {
             GreenMailUser user = greenMail.setUser("test" + accountNumber++, 
"password");
-            if (debug) {
-                final MailFolder inbox = 
greenMail.getManagers().getImapHostManager().getInbox(user);
-                inbox.addListener(new FolderListener() {
-                    public void added(int msn) {
-                        StoredMessage storedMessage = 
(StoredMessage)inbox.getMessages().get(msn-1);
+            final MailFolder inbox = 
greenMail.getManagers().getImapHostManager().getInbox(user);
+            inbox.addListener(new FolderListener() {
+                public void added(int msn) {
+                    StoredMessage storedMessage = 
(StoredMessage)inbox.getMessages().get(msn-1);
+                    try {
+                        OutputStream out = logManager.createLog("greenmail");
                         try {
-                            storedMessage.getMimeMessage().writeTo(System.out);
-                        } catch (Exception ex) {
-                            ex.printStackTrace();
+                            storedMessage.getMimeMessage().writeTo(out);
+                        } finally {
+                            out.close();
                         }
+                    } catch (Exception ex) {
+                        ex.printStackTrace();
                     }
-    
-                    public void expunged(int msn) {}
-                    public void flagsUpdated(int msn, Flags flags, Long uid) {}
-                    public void mailboxDeleted() {}
-                });
-            }
+                }
+
+                public void expunged(int msn) {}
+                public void flagsUpdated(int msn, Flags flags, Long uid) {}
+                public void mailboxDeleted() {}
+            });
             return new Account(user.getEmail(), user.getLogin(), 
user.getPassword());
         } else {
             return unallocatedAccounts.remove(0);

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java?rev=692195&r1=692194&r2=692195&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java
 Thu Sep  4 12:13:05 2008
@@ -19,6 +19,7 @@
 
 package org.apache.synapse.transport.mail;
 
+import java.io.OutputStream;
 import java.util.Date;
 import java.util.Properties;
 
@@ -36,10 +37,12 @@
 import org.apache.synapse.transport.testkit.client.TestClient;
 import org.apache.synapse.transport.testkit.name.Name;
 import org.apache.synapse.transport.testkit.name.Named;
+import org.apache.synapse.transport.testkit.util.LogManager;
 
 @Name("javamail")
 public abstract class MailClient implements TestClient {
     private final MessageLayout layout;
+    private LogManager logManager;
     private MailChannel channel;
     private Session session;
     
@@ -53,12 +56,20 @@
     }
 
     @SuppressWarnings("unused")
-    private void setUp(MailTestEnvironment env, MailChannel channel) throws 
Exception {
+    private void setUp(LogManager logManager, MailTestEnvironment env, 
MailChannel channel) throws Exception {
+        this.logManager = logManager;
         Properties props = new Properties();
         props.putAll(env.getOutProperties());
         session = Session.getInstance(props);
         this.channel = channel;
     }
+    
+    @SuppressWarnings("unused")
+    private void tearDown() {
+        logManager = null;
+        channel = null;
+        session = null;
+    }
 
     public ContentType getContentType(ClientOptions options, ContentType 
contentType) {
         return contentType;
@@ -74,6 +85,12 @@
         msg.setHeader(MailConstants.MAIL_HEADER_X_MESSAGE_ID, msgId);
         DataHandler dh = new DataHandler(new ByteArrayDataSource(message, 
contentType.toString()));
         layout.setupMessage(msg, dh);
+        OutputStream out = logManager.createLog("javamail");
+        try {
+            msg.writeTo(out);
+        } finally {
+            out.close();
+        }
         Transport.send(msg);
         return msgId;
     }

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java?rev=692195&r1=692194&r2=692195&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
 Thu Sep  4 12:13:05 2008
@@ -41,7 +41,7 @@
 
 public class MailTransportListenerTest extends TestCase {
     public static TestSuite suite() throws Exception {
-        TransportTestSuite suite = new TransportTestSuite(false);
+        TransportTestSuite suite = new 
TransportTestSuite(MailTransportListenerTest.class, false);
         
         // TODO: these test don't work; need more analysis why this is so
         suite.addExclude("(&(messageType=SOAP12)(data=Latin1))");

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java?rev=692195&r1=692194&r2=692195&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java
 Thu Sep  4 12:13:05 2008
@@ -46,7 +46,7 @@
 
 public class HttpCoreNIOListenerTest extends TestCase {
     public static TestSuite suite() throws Exception {
-        TransportTestSuite suite = new TransportTestSuite();
+        TransportTestSuite suite = new 
TransportTestSuite(HttpCoreNIOListenerTest.class);
         
         
suite.addExclude("(&(client=*)(endpoint=*)(!(|(client=axis)(endpoint=axis))))");
         

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyAsyncEndpoint.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyAsyncEndpoint.java?rev=692195&r1=692194&r2=692195&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyAsyncEndpoint.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyAsyncEndpoint.java
 Thu Sep  4 12:13:05 2008
@@ -20,6 +20,10 @@
 package org.apache.synapse.transport.nhttp;
 
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.util.Enumeration;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
@@ -31,6 +35,7 @@
 import org.apache.synapse.transport.testkit.message.IncomingMessage;
 import org.apache.synapse.transport.testkit.name.Name;
 import org.apache.synapse.transport.testkit.server.AsyncEndpoint;
+import org.apache.synapse.transport.testkit.util.LogManager;
 import org.mortbay.http.HttpException;
 import org.mortbay.http.HttpHandler;
 import org.mortbay.http.HttpRequest;
@@ -40,12 +45,14 @@
 @Name("jetty")
 @SuppressWarnings("serial")
 public class JettyAsyncEndpoint implements AsyncEndpoint<byte[]> {
+    private LogManager logManager;
     private JettyServer server;
     private HttpHandler handler;
     BlockingQueue<IncomingMessage<byte[]>> queue;
     
     @SuppressWarnings("unused")
-    private void setUp(JettyServer server, HttpChannel channel) throws 
Exception {
+    private void setUp(LogManager logManager, JettyServer server, HttpChannel 
channel) throws Exception {
+        this.logManager = logManager;
         this.server = server;
         final String path = "/" + channel.getServiceName();
         queue = new LinkedBlockingQueue<IncomingMessage<byte[]>>();
@@ -54,6 +61,8 @@
                     HttpRequest request, HttpResponse response) throws 
HttpException,
                     IOException {
                 
+                byte[] data = IOUtils.toByteArray(request.getInputStream());
+                logRequest(request, data);
                 if (pathInContext.equals(path)) {
                     ContentType contentType;
                     try {
@@ -61,7 +70,6 @@
                     } catch (ParseException ex) {
                         throw new HttpException(500, "Unparsable 
Content-Type");
                     }
-                    byte[] data = 
IOUtils.toByteArray(request.getInputStream());
                     queue.add(new IncomingMessage<byte[]>(contentType, data));
                     request.setHandled(true);
                 }
@@ -71,12 +79,29 @@
         handler.start();
     }
     
+    void logRequest(HttpRequest request, byte[] data) throws IOException {
+        OutputStream out = logManager.createLog("jetty");
+        PrintWriter pw = new PrintWriter(new OutputStreamWriter(out), false);
+        for (Enumeration<?> e = request.getFieldNames(); e.hasMoreElements(); 
) {
+            String name = (String)e.nextElement();
+            for (Enumeration<?> e2 = request.getFieldValues(name); 
e2.hasMoreElements(); ) {
+                pw.print(name);
+                pw.print(": ");
+                pw.println((String)e2.nextElement());
+            }
+        }
+        pw.println();
+        pw.flush();
+        out.write(data);
+    }
+    
     @SuppressWarnings("unused")
     private void tearDown() throws Exception {
         handler.stop();
         server.getContext().removeHandler(handler);
         server = null;
         queue = null;
+        logManager = null;
     }
     
     public IncomingMessage<byte[]> waitForMessage(int timeout) throws 
Throwable {

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java?rev=692195&r1=692194&r2=692195&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java
 Thu Sep  4 12:13:05 2008
@@ -29,6 +29,7 @@
 import junit.framework.TestResult;
 import junit.framework.TestSuite;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.synapse.transport.testkit.client.AsyncTestClient;
 import org.apache.synapse.transport.testkit.client.RequestResponseTestClient;
 import org.apache.synapse.transport.testkit.filter.FilterExpression;
@@ -50,6 +51,7 @@
 import org.apache.synapse.transport.testkit.tests.async.TextPlainTestCase;
 import 
org.apache.synapse.transport.testkit.tests.async.XMLAsyncMessageTestCase;
 import 
org.apache.synapse.transport.testkit.tests.echo.XMLRequestResponseMessageTestCase;
+import org.apache.synapse.transport.testkit.util.LogManager;
 
 public class TransportTestSuite extends TestSuite {
     public static final String testString = "\u00e0 peine arriv\u00e9s nous 
entr\u00e2mes dans sa chambre";
@@ -73,17 +75,24 @@
             new Parameter("param", "value1"),
             new Parameter("param", "value2"),
         });
-        
+    
+    private final Class<?> testClass;
     private final List<FilterExpression> excludes = new 
LinkedList<FilterExpression>();
     private final boolean reuseResources;
     private boolean invertExcludes;
+    private int nextId = 1;
     
-    public TransportTestSuite(boolean reuseResources) {
+    public TransportTestSuite(Class<?> testClass, boolean reuseResources) {
+        this.testClass = testClass;
         this.reuseResources = reuseResources;
     }
     
-    public TransportTestSuite() {
-        this(true);
+    public TransportTestSuite(Class<?> testClass) {
+        this(testClass, true);
+    }
+
+    public Class<?> getTestClass() {
+        return testClass;
     }
 
     public void addExclude(String filter) throws ParseException {
@@ -170,6 +179,7 @@
                 return;
             }
             ttest.setManaged(reuseResources);
+            ttest.setId(StringUtils.leftPad(String.valueOf(nextId++), 4, '0'));
             ttest.getResourceSet().resolve();
         }
         super.addTest(test);
@@ -177,37 +187,42 @@
 
     @Override
     public void run(TestResult result) {
-        if (!reuseResources) {
-            super.run(result);
-        } else {
-            TestResourceSet resourceSet = null;
-            for (Enumeration<?> e = tests(); e.hasMoreElements(); ) {
-                Test test = (Test)e.nextElement();
-                if (test instanceof TransportTestCase) {
-                    TransportTestCase ttest = (TransportTestCase)test;
-                    TestResourceSet newResourceSet = ttest.getResourceSet();
-                    try {
-                        if (resourceSet == null) {
-                            newResourceSet.setUp();
-                        } else {
-                            newResourceSet.setUp(resourceSet);
+        LogManager.INSTANCE.setTestSuite(this);
+        try {
+            if (!reuseResources) {
+                super.run(result);
+            } else {
+                TestResourceSet resourceSet = null;
+                for (Enumeration<?> e = tests(); e.hasMoreElements(); ) {
+                    Test test = (Test)e.nextElement();
+                    if (test instanceof TransportTestCase) {
+                        TransportTestCase ttest = (TransportTestCase)test;
+                        TestResourceSet newResourceSet = 
ttest.getResourceSet();
+                        try {
+                            if (resourceSet == null) {
+                                newResourceSet.setUp();
+                            } else {
+                                newResourceSet.setUp(resourceSet);
+                            }
+                        } catch (Throwable t) {
+                            result.addError(this, t);
+                            return;
                         }
+                        resourceSet = newResourceSet;
+                    }
+                    runTest(test, result);
+                }
+                if (resourceSet != null) {
+                    try {
+                        resourceSet.tearDown();
                     } catch (Throwable t) {
                         result.addError(this, t);
                         return;
                     }
-                    resourceSet = newResourceSet;
-                }
-                runTest(test, result);
-            }
-            if (resourceSet != null) {
-                try {
-                    resourceSet.tearDown();
-                } catch (Throwable t) {
-                    result.addError(this, t);
-                    return;
                 }
             }
+        } finally {
+            LogManager.INSTANCE.setTestSuite(null);
         }
     }
 }

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java?rev=692195&r1=692194&r2=692195&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java
 Thu Sep  4 12:13:05 2008
@@ -26,17 +26,20 @@
 
 import org.apache.synapse.transport.testkit.name.Key;
 import org.apache.synapse.transport.testkit.name.NameUtils;
+import org.apache.synapse.transport.testkit.util.LogManager;
 
 @Key("test")
 public abstract class TransportTestCase extends TestCase {
     private final TestResourceSet resourceSet = new TestResourceSet();
     
+    private String id;
     private Map<String,String> nameComponents;
     
     private boolean managed;
 
     public TransportTestCase(Object... resources) {
         resourceSet.addResources(resources);
+        addResource(LogManager.INSTANCE);
     }
 
     protected void addResource(Object resource) {
@@ -55,13 +58,28 @@
         return nameComponents;
     }
     
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     @Override
     public String getName() {
         String testName = super.getName();
         if (testName == null) {
             StringBuilder buffer = new StringBuilder();
+            if (id != null) {
+                buffer.append(id);
+                buffer.append(':');
+            }
+            boolean first = true;
             for (Map.Entry<String,String> entry : 
getNameComponents().entrySet()) {
-                if (buffer.length() > 0) {
+                if (first) {
+                    first = false;
+                } else {
                     buffer.append(',');
                 }
                 buffer.append(entry.getKey());
@@ -84,6 +102,7 @@
 
     @Override
     protected void setUp() throws Exception {
+        LogManager.INSTANCE.setTestCase(this);
         if (!managed) {
             resourceSet.setUp();
         }
@@ -94,5 +113,6 @@
         if (!managed) {
             resourceSet.tearDown();
         }
+        LogManager.INSTANCE.setTestCase(null);
     }
 }
\ No newline at end of file

Added: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/LogManager.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/LogManager.java?rev=692195&view=auto
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/LogManager.java
 (added)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/LogManager.java
 Thu Sep  4 12:13:05 2008
@@ -0,0 +1,65 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.synapse.transport.testkit.util;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.synapse.transport.testkit.TransportTestSuite;
+import org.apache.synapse.transport.testkit.tests.TransportTestCase;
+
+public class LogManager {
+    public static final LogManager INSTANCE = new LogManager();
+    
+    private final File logDir;
+    private File testSuiteDir;
+    private File testCaseDir;
+    private int sequence;
+    
+    private LogManager() {
+        logDir = new File("target" + File.separator + "testkit-logs");
+    }
+    
+    public void setTestSuite(TransportTestSuite suite) {
+        if (suite == null) {
+            testSuiteDir = null;
+        } else {
+            testSuiteDir = new File(logDir, suite.getTestClass().getName());
+        }
+        testCaseDir = null;
+    }
+    
+    public void setTestCase(TransportTestCase testCase) {
+        if (testCase == null) {
+            testCaseDir = null;
+        } else {
+            testCaseDir = new File(testSuiteDir, testCase.getId());
+            sequence = 1;
+        }
+    }
+    
+    public OutputStream createLog(String name) throws IOException {
+        testCaseDir.mkdirs();
+        return new FileOutputStream(new File(testCaseDir, 
StringUtils.leftPad(String.valueOf(sequence++), 2, '0') + "-" + name + ".log"));
+    }
+}

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java?rev=692195&r1=692194&r2=692195&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java
 Thu Sep  4 12:13:05 2008
@@ -46,7 +46,7 @@
 public class VFSTransportListenerTest extends TestCase {
     public static TestSuite suite() {
         // TODO: the VFS listener doesn't like reuseServer == true...
-        TransportTestSuite suite = new TransportTestSuite(false);
+        TransportTestSuite suite = new 
TransportTestSuite(VFSTransportListenerTest.class, false);
         TransportDescriptionFactory tdf =
             new SimpleTransportDescriptionFactory("vfs", 
VFSTransportListener.class,
                     VFSTransportSender.class);

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java?rev=692195&r1=692194&r2=692195&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java
 Thu Sep  4 12:13:05 2008
@@ -36,7 +36,7 @@
 
 public class VFSTransportSenderTest extends TestCase {
     public static TestSuite suite() {
-        TransportTestSuite suite = new TransportTestSuite(false);
+        TransportTestSuite suite = new 
TransportTestSuite(VFSTransportSenderTest.class, false);
         
         VFSTestEnvironment env = new VFSTestEnvironment(new 
File("target/vfs4"));
         TransportDescriptionFactory tdf =


Reply via email to