Author: mageshbk(a)jboss.com Date: 2008-09-28 03:17:40 -0400 (Sun, 28 Sep 2008) New Revision: 8277 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java Log: [JBPAPP-1194]-Fix Testcase failures against EAP Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java 2008-09-28 07:12:00 UTC (rev 8276) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java 2008-09-28 07:17:40 UTC (rev 8277) @@ -54,6 +54,7 @@ { wsdlLocation = "http://" + getServerHost() + ":8080/jaxrpc-addressrewrite/ValidURL?wsdl"; wsdlLocationSec = "http://" + getServerHost() + ":8080/jaxrpc-addressrewrite-sec/ValidURL?wsdl"; + login(); modifySOAPAddress = (Boolean)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "ModifySOAPAddress"); webServiceHost = (String)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "WebServiceHost"); } @@ -62,6 +63,7 @@ { Attribute attr = new Attribute("ModifySOAPAddress", modifySOAPAddress); getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); + logout(); } public void testRewrite() throws Exception Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2008-09-28 07:12:00 UTC (rev 8276) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2008-09-28 07:17:40 UTC (rev 8277) @@ -41,6 +41,16 @@ { private final ObjectName manager = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); + public void setUp() throws Exception + { + login(); + } + + public void tearDown() throws Exception + { + logout(); + } + public void testDiscoverWebServicePort() throws Exception { MBeanServerConnection server = getServer(); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2008-09-28 07:12:00 UTC (rev 8276) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2008-09-28 07:17:40 UTC (rev 8277) @@ -87,6 +87,10 @@ MBeanServerConnection server = getServer(); ObjectName objectName = new ObjectName("jboss.web:host=localhost,path=/jaxrpc-jbws1179,type=Manager"); - return ((Integer)server.getAttribute(objectName, "activeSessions")).intValue(); + login(); + int asessions = ((Integer)server.getAttribute(objectName, "activeSessions")).intValue(); + logout(); + + return asessions; } } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2008-09-28 07:12:00 UTC (rev 8276) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2008-09-28 07:17:40 UTC (rev 8277) @@ -55,11 +55,13 @@ { // Deploy jbpm-bpel.sar if it is not deployed already JBossWSTestHelper helper = new JBossWSTestHelper(); + JBossWSTestHelper.login(); if (JBossWSTestHelper.getServer().isRegistered(oname) == false) { helper.deploy("jbpm-bpel.sar"); undeployOnTearDown = true; } + JBossWSTestHelper.logout(); for (int i = 0; i < processFiles.length; i++) { Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-09-28 07:12:00 UTC (rev 8276) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-09-28 07:17:40 UTC (rev 8277) @@ -61,6 +61,7 @@ protected void setUp() throws Exception { MBeanServerConnection server = JBossWSTestHelper.getServer(); + JBossWSTestHelper.login(); useJBossWebLoader = (Boolean)server.getAttribute(new ObjectName("jboss.web:service=WebServer"), "UseJBossWebLoader"); server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", Boolean.TRUE)); super.setUp(); @@ -71,6 +72,7 @@ super.tearDown(); MBeanServerConnection server = JBossWSTestHelper.getServer(); server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", useJBossWebLoader)); + JBossWSTestHelper.logout(); } }; } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2008-09-28 07:12:00 UTC (rev 8276) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2008-09-28 07:17:40 UTC (rev 8277) @@ -57,6 +57,7 @@ public void setUp() throws Exception { + login(); // Setting the WebServiceHost to an empty string, causes the request host to be used. // This must be done before deploy time. webServiceHost = (String)getServer().getAttribute(objectName, "WebServiceHost"); @@ -68,6 +69,8 @@ { super.tearDown(); getServer().setAttribute(objectName, new Attribute("WebServiceHost", webServiceHost)); + logout(); + } }; return testSetup; Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2008-09-28 07:12:00 UTC (rev 8276) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2008-09-28 07:17:40 UTC (rev 8277) @@ -92,6 +92,7 @@ protected void setUp() throws Exception { + login(); if (eventSourcePort == null) { eventSourceURI = new URI(EVENT_SOURCE_NAME); @@ -115,6 +116,7 @@ /*ObjectName oname = EventingConstants.getSubscriptionManagerName(); getServer().invoke(oname, "removeEventSource", new Object[] { new URI(eventSourceURI) }, new String[] { "java.net.URI" }); */ + logout(); } // ----------------------------------------------------------------------------