[wsas-java-dev] svn commit r728 - in wsas/java/trunk/modules: admin/test/org/wso2/wsas/admin/service/logging core/test-resources integration integration/test/org/wso2/codegen/service integration/test/org/wso2/codegen/service/ajax integration/test/org/wso2/codegen/service/java integration/test/org/wso2/tracer/service integration/test/org/wso2/wsas/rest standalone-edition/conf standalone-edition/test/org/wso2/wsas

svn at wso2.com svn at wso2.com
Mon Feb 5 04:02:56 PST 2007


Author: saminda
Date: Mon Feb  5 04:02:31 2007
New Revision: 728

Modified:
   wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java
   wsas/java/trunk/modules/core/test-resources/axis2.xml
   wsas/java/trunk/modules/integration/pom.xml
   wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/WSDLInfoServiceTest.java
   wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/AjaxClientGeneratorServiceTest.java
   wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/java/JavaClientGeneratorServiceTest.java
   wsas/java/trunk/modules/integration/test/org/wso2/tracer/service/TracerServiceIntegrationTest.java
   wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestSupportTest.java
   wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java
   wsas/java/trunk/modules/standalone-edition/conf/axis2.xml
   wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/AbstractTestCase.java
   wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/JettyServerTest.java
Log:
fixing test cases 


Modified: wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java
==============================================================================
--- wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java	(original)
+++ wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java	Mon Feb  5 04:02:31 2007
@@ -16,6 +16,7 @@
 package org.wso2.wsas.admin.service.logging;
 
 import org.wso2.wsas.TestConstants;
+import org.wso2.wsas.AbstractTestCase;
 import org.wso2.wsas.util.ServerUtils;
 import org.wso2.utils.ServerConfiguration;
 import org.wso2.utils.NetworkUtils;

Modified: wsas/java/trunk/modules/core/test-resources/axis2.xml
==============================================================================
--- wsas/java/trunk/modules/core/test-resources/axis2.xml	(original)
+++ wsas/java/trunk/modules/core/test-resources/axis2.xml	Mon Feb  5 04:02:31 2007
@@ -11,10 +11,10 @@
     <parameter name="cacheAttachments" locked="false">true</parameter>
     <parameter name="attachmentDIR" locked="false">work/mtom</parameter>
     <parameter name="sizeThreshold" locked="false">4000</parameter>
-    <parameter name="wso2wsf.tracer.trace.filter.impl" locked="false">
+    <parameter name="wso2tracer.trace.filter.impl" locked="false">
         org.wso2.wsas.util.TraceFilterImpl
     </parameter>
-    <parameter name="wso2wsf.tracer.trace.persister.impl" locked="false">
+    <parameter name="wso2tracer.trace.persister.impl" locked="false">
         org.wso2.wsas.util.TracePersisterImpl
     </parameter>
 

Modified: wsas/java/trunk/modules/integration/pom.xml
==============================================================================
--- wsas/java/trunk/modules/integration/pom.xml	(original)
+++ wsas/java/trunk/modules/integration/pom.xml	Mon Feb  5 04:02:31 2007
@@ -129,6 +129,8 @@
                     <excludes>
                         <exclude>**/*Abstract*.java</exclude>
                         <exclude>**/*JavaClientGeneratorServiceTest.java</exclude>
+                        <exclude>**/*TraderServiceIntegrationTest.java</exclude>
+                        <exclude>**/*CommodityQuoteServiceIntegrationTest.java</exclude>
                     </excludes>
                     <includes>
                         <include>**/*Test.java</include>

Modified: wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/WSDLInfoServiceTest.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/WSDLInfoServiceTest.java	(original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/WSDLInfoServiceTest.java	Mon Feb  5 04:02:31 2007
@@ -19,6 +19,7 @@
 import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
 import org.wso2.wsas.ServerConstants;
 import org.wso2.wsas.TestConstants;
+import org.wso2.wsas.AbstractTestCase;
 import org.wso2.wsas.util.ServerUtils;
 import org.wso2.utils.NetworkUtils;
 
@@ -30,7 +31,7 @@
 
     protected void setUp() {
         try {
-            super.setUp("../core/conf/server.xml");
+            super.setUp("../standalone-edition/conf/server.xml");
 
             ConfigurationContext configContext = getConfigContext();
             configContext.setProperty(ServerConstants.FILE_RESOURCE_MAP,

Modified: wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/AjaxClientGeneratorServiceTest.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/AjaxClientGeneratorServiceTest.java	(original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/AjaxClientGeneratorServiceTest.java	Mon Feb  5 04:02:31 2007
@@ -21,6 +21,7 @@
 import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
 import org.wso2.wsas.ServerConstants;
 import org.wso2.wsas.TestConstants;
+import org.wso2.wsas.AbstractTestCase;
 import org.wso2.wsas.services.version.Version;
 import org.wso2.utils.ServerConfiguration;
 import org.wso2.wsas.util.ServerUtils;
@@ -34,7 +35,7 @@
 
     protected void setUp() {
         try {
-            ServerConfiguration.configurationXMLLocation = "../core/conf/server.xml";
+            ServerConfiguration.configurationXMLLocation = "../standalone-edition/conf/server.xml";
             super.setUp();
 
             ConfigurationContext configContext = getConfigContext();

Modified: wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/java/JavaClientGeneratorServiceTest.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/java/JavaClientGeneratorServiceTest.java	(original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/java/JavaClientGeneratorServiceTest.java	Mon Feb  5 04:02:31 2007
@@ -19,6 +19,7 @@
 import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
 import org.wso2.wsas.ServerConstants;
 import org.wso2.wsas.TestConstants;
+import org.wso2.wsas.AbstractTestCase;
 import org.wso2.wsas.services.version.Version;
 import org.wso2.utils.ServerConfiguration;
 import org.wso2.wsas.util.ServerUtils;

Modified: wsas/java/trunk/modules/integration/test/org/wso2/tracer/service/TracerServiceIntegrationTest.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/tracer/service/TracerServiceIntegrationTest.java	(original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/tracer/service/TracerServiceIntegrationTest.java	Mon Feb  5 04:02:31 2007
@@ -19,6 +19,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.wso2.wsas.ServerConstants;
 import org.wso2.wsas.TestConstants;
+import org.wso2.wsas.AbstractTestCase;
 import org.wso2.wsas.persistence.PersistenceManager;
 import org.wso2.wsas.persistence.dataobject.*;
 import org.wso2.wsas.persistence.exception.ServiceAlreadyExistsException;
@@ -44,7 +45,7 @@
 
     protected void setUp() {
         try {
-            ServerConfiguration.configurationXMLLocation = "../core/conf/server.xml";
+            ServerConfiguration.configurationXMLLocation = "../standalone-edition/conf/server.xml";
             super.setUp();
 
             HibernateConfig hbConfig =
@@ -123,6 +124,7 @@
                                                              "/soap/" +
                                                              serviceName.getLocalPart() + "/" +
                                                              operationName.getLocalPart());
+            client._getServiceClient().getOptions().setTimeOutInMilliSeconds(1000000);
 
             long timestamp = System.currentTimeMillis();
             addMessageToDB(timestamp);

Modified: wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestSupportTest.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestSupportTest.java	(original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestSupportTest.java	Mon Feb  5 04:02:31 2007
@@ -28,6 +28,7 @@
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.wso2.wsas.ServerConstants;
 import org.wso2.wsas.TestConstants;
+import org.wso2.wsas.AbstractTestCase;
 import org.wso2.wsas.util.MessageExposeHandler;
 import org.wso2.wsas.util.ServerUtils;
 import org.wso2.utils.NetworkUtils;

Modified: wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java	(original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java	Mon Feb  5 04:02:31 2007
@@ -18,6 +18,7 @@
 
 import org.wso2.wsas.ServerConstants;
 import org.wso2.wsas.TestConstants;
+import org.wso2.wsas.AbstractTestCase;
 import org.wso2.wsas.util.MessageExposeHandler;
 import org.wso2.utils.NetworkUtils;
 import org.apache.axiom.om.OMElement;

Modified: wsas/java/trunk/modules/standalone-edition/conf/axis2.xml
==============================================================================
--- wsas/java/trunk/modules/standalone-edition/conf/axis2.xml	(original)
+++ wsas/java/trunk/modules/standalone-edition/conf/axis2.xml	Mon Feb  5 04:02:31 2007
@@ -16,10 +16,10 @@
     <parameter name="cacheAttachments" locked="false">true</parameter>
     <parameter name="attachmentDIR" locked="false">work/mtom</parameter>
     <parameter name="sizeThreshold" locked="false">4000</parameter>
-    <parameter name="wso2wsf.tracer.trace.filter.impl" locked="false">
+    <parameter name="wso2tracer.trace.filter.impl" locked="false">
         org.wso2.wsas.util.TraceFilterImpl
     </parameter>
-    <parameter name="wso2wsf.tracer.trace.persister.impl" locked="false">
+    <parameter name="wso2tracer.trace.persister.impl" locked="false">
         org.wso2.wsas.util.TracePersisterImpl
     </parameter>
 

Modified: wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/AbstractTestCase.java
==============================================================================
--- wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/AbstractTestCase.java	(original)
+++ wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/AbstractTestCase.java	Mon Feb  5 04:02:31 2007
@@ -41,6 +41,7 @@
         System.setProperty(ServerConstants.DERBY_HOME, "conf");
         System.setProperty(org.apache.axis2.Constants.AXIS2_CONF,
                            "target/repository/axis2.xml");
+        System.setProperty(ServerConstants.WSO2WSAS_ADMIN_PASSWORD, "abc");
         serverUtils = new ServerUtils();
         serverUtils.startServer(serverConfigLocation);
     }

Modified: wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/JettyServerTest.java
==============================================================================
--- wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/JettyServerTest.java	(original)
+++ wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/JettyServerTest.java	Mon Feb  5 04:02:31 2007
@@ -38,6 +38,7 @@
 
     protected void setUp() throws Exception {
         ServerConfiguration.configurationXMLLocation = "conf/server.xml";
+        System.setProperty(ServerConstants.WSO2WSAS_ADMIN_PASSWORD, "abc");
         System.setProperty("axis2.xml", "target/repository/axis2.xml");
         System.setProperty(ServerConstants.DERBY_HOME, "conf");
         serverUtils = new ServerUtils();




More information about the Wsas-java-dev mailing list