[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/config ...

[Tom Elrod]

  User: telrod  
  Date: 06/08/07 17:17:33

  Modified:    src/tests/org/jboss/test/remoting/transport/config 
                        FactoryConfigTestCaseSSLParent.java
  Log:
  JBREM-568 - updated ssl socket builder so attribute types (getter/setter) is of same type for all attributes.
  
  Revision  Changes    Path
  1.7       +125 -126  JBossRemoting/src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseSSLParent.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FactoryConfigTestCaseSSLParent.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseSSLParent.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- FactoryConfigTestCaseSSLParent.java	1 Aug 2006 06:33:19 -0000	1.6
  +++ FactoryConfigTestCaseSSLParent.java	7 Aug 2006 21:17:33 -0000	1.7
  @@ -46,7 +46,6 @@
   import javax.net.ssl.SSLServerSocketFactory;
   import javax.net.ssl.SSLSocketFactory;
   import javax.xml.parsers.DocumentBuilderFactory;
  -
   import java.io.ByteArrayInputStream;
   import java.io.File;
   import java.io.IOException;
  @@ -455,7 +454,7 @@
            assertFalse(builder.isServerSocketUseClientMode());
            assertEquals("JKS", builder.getKeyStoreType());
            File file1 = new File(keyStoreFilePath);
  -         File file2 = new File(builder.getKeyStoreURL().getFile());
  +         File file2 = new File(builder.getKeyStore().getFile());
            assertEquals(file1, file2);
            
            
  @@ -487,7 +486,7 @@
            assertTrue(builder.isSocketUseClientMode());
            assertEquals("JKS", builder.getKeyStoreType());
            file1 = new File(trustStoreFilePath);
  -         file2 = new File(builder.getTrustStoreURL().getFile());
  +         file2 = new File(builder.getTrustStore().getFile());
            assertEquals(file1, file2);   
            
            //////////////////////////////////////////////
  @@ -529,7 +528,7 @@
            assertFalse(builder.isSocketUseClientMode());
            assertEquals("JKS", builder.getKeyStoreType());
            file1 = new File(keyStoreFilePath);
  -         file2 = new File(builder.getKeyStoreURL().getFile());
  +         file2 = new File(builder.getKeyStore().getFile());
            assertEquals(file1, file2); 
            
            client.disconnect();