Author: davsclaus Date: Wed May 23 08:38:15 2012 New Revision: 1341787 URL: http://svn.apache.org/viewvc?rev=1341787&view=rev Log: Fixed tests.
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java?rev=1341787&r1=1341786&r2=1341787&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java Wed May 23 08:38:15 2012 @@ -33,7 +33,6 @@ public class JsseUtilTest extends OSGiIn @Test public void testSslContextParameters() throws Exception { - SSLContextParameters scp = this.applicationContext.getBean(SSLContextParameters.class); assertEquals("TLS", scp.getSecureSocketProtocol()); @@ -62,23 +61,19 @@ public class JsseUtilTest extends OSGiIn @Test public void testKeyStoreParametersResourceLoading() throws Exception { - KeyStoreParameters ksp = new KeyStoreParameters(); ksp.setPassword("changeit"); ksp.setResource("org/apache/camel/itest/osgi/util/jsse/localhost.ks"); - - + KeyStore ks = ksp.createKeyStore(); assertNotNull(ks.getCertificate("server")); - - + URL resourceUrl = this.getClass().getResource("/org/apache/camel/itest/osgi/util/jsse/localhost.ks"); ksp.setResource(resourceUrl.toExternalForm()); ks = ksp.createKeyStore(); assertNotNull(ks.getCertificate("server")); - - - File file = new File("../test-classes/org/apache/camel/itest/osgi/util/jsse/localhost.ks"); + + File file = new File("../../test-classes/org/apache/camel/itest/osgi/util/jsse/localhost.ks"); ksp.setResource(file.getAbsolutePath()); ks = ksp.createKeyStore(); assertNotNull(ks.getCertificate("server"));