JBossWS SVN: r18555 - stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-04-01 08:29:55 -0400 (Tue, 01 Apr 2014)
New Revision: 18555
Added:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallHrefTestCase.java
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java
Log:
[JBWS-3764] fix of leaks of HRef.
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallHrefTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallHrefTestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallHrefTestCase.java 2014-04-01 12:29:55 UTC (rev 18555)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.encoded.href;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test soap encoded href
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 23-Mar-2007
+ */
+public class MarshallHrefTestCase extends JBossWSTest
+{
+ private static MarshallTest port;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(MarshallHrefTestCase.class, "jaxrpc-encoded-href.war, jaxrpc-encoded-href-client.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (MarshallTest)service.getPort(MarshallTest.class);
+ }
+ }
+
+ public void testHrefMessage() throws Exception
+ {
+ HRefHandler.setHrefEncoding(true);
+ byte[] retObj = port.base64BinaryTest("HandlerReplacesThis".getBytes());
+ assertEquals("HrefEncodedResponse", new String(retObj));
+ }
+}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2014-04-01 09:46:30 UTC (rev 18554)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2014-04-01 12:29:55 UTC (rev 18555)
@@ -57,14 +57,8 @@
public void testByteArrayTest() throws Exception
{
+ HRefHandler.setHrefEncoding(false);
byte[] retObj = port.base64BinaryTest("Hello World!".getBytes());
assertEquals("Hello World!", new String(retObj));
}
-
- public void testHrefMessage() throws Exception
- {
- HRefHandler.setHrefEncoding(true);
- byte[] retObj = port.base64BinaryTest("HandlerReplacesThis".getBytes());
- assertEquals("HrefEncodedResponse", new String(retObj));
- }
}
10 years, 8 months
- 1
- 0
JBossWS SVN: r18554 - stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-04-01 05:46:30 -0400 (Tue, 01 Apr 2014)
New Revision: 18554
Modified:
stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
Log:
Minor fix: no need to use AtomicLong
Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2014-04-01 07:50:47 UTC (rev 18553)
+++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2014-04-01 09:46:30 UTC (rev 18554)
@@ -31,7 +31,6 @@
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-import java.util.concurrent.atomic.AtomicLong;
import javax.management.MBeanServerConnection;
import javax.naming.NamingException;
@@ -70,7 +69,7 @@
private Map<String, String> httpsConnOptions;
private CleanupOperation cleanupOp;
- private static volatile AtomicLong lastHttpsConnectorRemoval = new AtomicLong(0);
+ private static volatile long lastHttpsConnectorRemoval = 0;
public JBossWSTestSetup(Class<?> testClass, String archiveList)
{
@@ -255,7 +254,7 @@
Thread.currentThread().setContextClassLoader(cl);
}
if (httpsConnOptions != null) {
- final long lr = lastHttpsConnectorRemoval.get();
+ final long lr = lastHttpsConnectorRemoval;
if (lr != 0) {
final long wait = HTTPS_CONNECTION_REUSE_TIMEOUT - (System.currentTimeMillis() - lr);
if (wait > 0) {
@@ -327,7 +326,7 @@
if (httpsConnOptions != null)
{
JBossWSTestHelper.removeHttpsConnector();
- lastHttpsConnectorRemoval.set(System.currentTimeMillis());
+ lastHttpsConnectorRemoval = System.currentTimeMillis();
}
}
}
10 years, 8 months
- 1
- 0
JBossWS SVN: r18553 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-04-01 03:50:47 -0400 (Tue, 01 Apr 2014)
New Revision: 18553
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Wait WFLY-3187 merge and temporarily exclude MixedTypeTestcase
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-31 16:44:53 UTC (rev 18552)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-04-01 07:50:47 UTC (rev 18553)
@@ -881,6 +881,9 @@
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
+
+ <!--[WFLY-3187] Uncomment this after it is merged-->
+ <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase*</exclude>
</excludes>
</configuration>
</plugin>
10 years, 8 months
- 1
- 0