You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/01/09 21:54:21 UTC
svn commit: r1431058 -
/cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
Author: dkulp
Date: Wed Jan 9 20:54:20 2013
New Revision: 1431058
URL: http://svn.apache.org/viewvc?rev=1431058&view=rev
Log:
Merged revisions 1430990 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1430990 | dkulp | 2013-01-09 13:05:25 -0500 (Wed, 09 Jan 2013) | 18 lines
Merged revisions 1430984 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1430984 | dkulp | 2013-01-09 13:03:27 -0500 (Wed, 09 Jan 2013) | 10 lines
Merged revisions 1430965 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1430965 | dkulp | 2013-01-09 12:24:25 -0500 (Wed, 09 Jan 2013) | 2 lines
Add some extra information to the assert message
........
........
........
Modified:
cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java?rev=1431058&r1=1431057&r2=1431058&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java Wed Jan 9 20:54:20 2013
@@ -123,8 +123,10 @@ public class HTTPConduitURLConnectionTes
@Test
public void testTLSServerParameters() throws Exception {
Object connection = doTestTLSServerParameters();
- assertTrue("TLS Client Parameters should generate an HttpsURLConnection",
- HttpsURLConnection.class.isInstance(connection));
+ assertNotNull("Connection should not be null", connection);
+ assertTrue("TLS Client Parameters should generate an HttpsURLConnection instead of "
+ + connection.getClass().getName(),
+ HttpsURLConnection.class.isInstance(connection));
}
/**
@@ -140,7 +142,9 @@ public class HTTPConduitURLConnectionTes
try {
System.setProperty(javaProtocolHandlerPkgsKey, "com.sun.net.ssl.internal.www.protocol");
Object connection = doTestTLSServerParameters();
- assertTrue("TLS Client Parameters should generate an HttpsURLConnection",
+ assertNotNull("Connection should not be null", connection);
+ assertTrue("TLS Client Parameters should generate an HttpsURLConnection instead of "
+ + connection.getClass().getName(),
connection.getClass().getName().contains("HttpsURLConnection"));
} finally {
if (javaProtocolHandlerPkgsValue == null) {