svn commit: r396939 - /webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java

[di...@apache.org]

Author: dims
Date: Tue Apr 25 10:38:52 2006
New Revision: 396939

URL: http://svn.apache.org/viewcvs?rev=396939&view=rev
Log:
Fix for AXIS2-617 - Intermitent failure in org.apache.axis2.saaj.integration.IntegrationTest on Windows


Modified:
    webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java

Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?rev=396939&r1=396938&r2=396939&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java Tue Apr 25 10:38:52 2006
@@ -1,6 +1,25 @@
+/*                                                                             
+ * Copyright 2006 The Apache Software Foundation.                         
+ *                                                                             
+ * Licensed 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.axis2.saaj.integration;
 
+import junit.extensions.TestSetup;
+import junit.framework.Test;
 import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
@@ -48,10 +67,21 @@
         super(name);
     }
 
+    public static Test suite() {
+        return new TestSetup(new TestSuite(IntegrationTest.class)) {
+            public void setUp() throws Exception {
+                UtilServer.start(SAAJ_REPO);
+                Parameter eneblemtom = new Parameter("enableMTOM","true");
+                UtilServer.getConfigurationContext().getAxisConfiguration().addParameter(eneblemtom);
+            }
+
+            public void tearDown() throws Exception {
+                UtilServer.stop();
+            }
+        };
+    }
+
     protected void setUp() throws Exception {
-        UtilServer.start(SAAJ_REPO);
-        Parameter eneblemtom = new Parameter("enableMTOM","true");
-        UtilServer.getConfigurationContext().getAxisConfiguration().addParameter(eneblemtom);
         final AxisService service = Utils.createSimpleService(SERVICE_NAME,
                                                               EchoService.class.getName(),
                                                               OPERATION_NAME);
@@ -60,7 +90,6 @@
 
     protected void tearDown() throws Exception {
         UtilServer.unDeployService(SERVICE_NAME);
-        UtilServer.stop();
         UtilServer.unDeployClientService();
     }