X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fcore%2FSslKeyStoreTest.java;h=c2a13df8a1b546f7adf242a7f3684d08aa7b351a;hb=07de1ed897da9d7dc70c6d550f38c59339ed751e;hp=7c871bbd56260c01477b394fd26d315058cca6f4;hpb=dfaeef38744f68c8caad72e83cdfd23d83afba9a;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslKeyStoreTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslKeyStoreTest.java
index 7c871bbd..c2a13df8 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslKeyStoreTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslKeyStoreTest.java
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.core;
 
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
 
@@ -33,33 +32,24 @@ public class SslKeyStoreTest {
     }
 
     /**
-     * Test keystore file access
-     * @throws Exception 
+     * Test keystore file access - via classpath
+     * @throws Exception
      */
     @Test
     public void testAsInputStream() throws Exception {
-        InputStream inputStream = SslKeyStore.asInputStream("src/main/resources/key.bin", PathType.PATH);
+        InputStream inputStream = SslKeyStore.asInputStream("/key.bin", PathType.CLASSPATH);
         assertNotNull( inputStream );
         inputStream.close();
     }
 
     /**
-     * Test certificate password retrieval
+     * Test keystore file access - via relative path
+     * @throws Exception
      */
     @Test
-    public void testGetCertificatePassword() {
-        char[] password = SslKeyStore.getCertificatePassword();
-        assertNotNull(password);
-        assertTrue (password.length>0) ;
-    }
-
-    /**
-     * Test keystore password retrieval
-     */
-    @Test
-    public void testGetKeyStorePassword() {
-        char[] password = SslKeyStore.getKeyStorePassword() ;
-        assertNotNull(password);
-        assertTrue (password.length>0) ;
+    public void testAsInputStream2() throws Exception {
+        InputStream inputStream = SslKeyStore.asInputStream("src/test/resources/key.bin", PathType.PATH);
+        assertNotNull( inputStream );
+        inputStream.close();
     }
-}
\ No newline at end of file
+}