[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/marshall/encrypt ...

[Anil Saldhana]

  User: asaldhana
  Date: 06/08/16 17:44:06

  Modified:    src/tests/org/jboss/test/remoting/marshall/encrypt 
                        EncryptionStandaloneTestCase.java
  Log:
  JBREM-419: refactor the test
  
  Revision  Changes    Path
  1.3       +41 -67    JBossRemoting/src/tests/org/jboss/test/remoting/marshall/encrypt/EncryptionStandaloneTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EncryptionStandaloneTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/marshall/encrypt/EncryptionStandaloneTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EncryptionStandaloneTestCase.java	16 Aug 2006 20:54:26 -0000	1.2
  +++ EncryptionStandaloneTestCase.java	16 Aug 2006 21:44:06 -0000	1.3
  @@ -37,70 +37,58 @@
   
   import junit.framework.TestCase;
   
  -//$Id: EncryptionStandaloneTestCase.java,v 1.2 2006/08/16 20:54:26 asaldhana Exp $
  +//$Id: EncryptionStandaloneTestCase.java,v 1.3 2006/08/16 21:44:06 asaldhana Exp $
   
   /**
    *  Tests Remoting Encryption facilities
    *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
    *  @since  Aug 16, 2006 
  - *  @version $Revision: 1.2 $
  + *  @version $Revision: 1.3 $
    */
   public class EncryptionStandaloneTestCase extends TestCase
   {
      private Marshaller marshaller;
      private UnMarshaller unmarshaller;
      
  +   private String[] standard = new String[]
  +        {null, "AES", "DES", "Blowfish", "DESede"};
  +   
  +   private String[] padded = new String[]
  +        {"AES/CBC/PKCS5Padding", "AES/PCBC/PKCS5Padding","AES/PCBC/PKCS5Padding",
  +         "AES/CFB/PKCS5Padding", "AES/OFB/PKCS5Padding",
  +         "DES/CBC/PKCS5Padding", "DES/PCBC/PKCS5Padding","DES/PCBC/PKCS5Padding",
  +         "DES/CFB/PKCS5Padding", "DES/OFB/PKCS5Padding",
  +         "DESede/CBC/PKCS5Padding", "DESede/PCBC/PKCS5Padding","DESede/PCBC/PKCS5Padding",
  +         "DESede/CFB/PKCS5Padding", "DESede/OFB/PKCS5Padding"};
  +   
  +   private String[] unpadded = new String[]
  +        {"AES/CBC/NoPadding", "AES/PCBC/NoPadding","AES/PCBC/NoPadding",
  +         "AES/CFB/NoPadding", "AES/OFB/NoPadding",
  +         "DES/CBC/NoPadding", "DES/PCBC/NoPadding","DES/PCBC/NoPadding",
  +         "DES/CFB/NoPadding", "DES/OFB/NoPadding",
  +         "DESede/CBC/NoPadding", "DESede/PCBC/NoPadding","DESede/PCBC/NoPadding",
  +         "DESede/CFB/NoPadding", "DESede/OFB/NoPadding"}; 
  +
  +   
      public void testSerializable() throws IOException, ClassNotFoundException
      {  
  -      //Test default DES
  -      runAlgoTest(null);
  -      //TEST AES 
  -      runAlgoTest("AES"); 
  -      //TEST Blowfish
  -      runAlgoTest("Blowfish");  
  -      //Test TripleDES
  -      runAlgoTest("DESede"); 
  -      
  -      runAlgoTest("DES");
  -      runAlgoTest("DES/ECB/NoPadding");
  -      runAlgoTest("DES/CBC/NoPadding");
  -      runAlgoTest("DES/CBC/PKCS5Padding");
  -       
  -      runAlgoTest("DESede/ECB/NoPadding");
  -      runAlgoTest("DESede/CBC/NoPadding");
  -      runAlgoTest("DESede/CBC/PKCS5Padding");
  -      
  -      runAlgoTest("AES/ECB/NoPadding");
  -      runAlgoTest("AES/CBC/NoPadding");
  -      runAlgoTest("AES/CBC/PKCS5Padding"); 
  +      for(int i = 0 ; i < standard.length; i++)
  +         runAlgoTest(standard[i]);
  +      for(int i = 0 ; i < padded.length; i++)
  +         runAlgoTest(padded[i]);
  +      for(int i = 0 ; i < unpadded.length; i++)
  +         runAlgoTest(unpadded[i]); 
      }
   
   
      public void testWrappedSerializable() throws IOException, ClassNotFoundException
      { 
  -      //Test default DES
  -      runWrappedSerializableTest(null);
  -      //TEST AES 
  -      runWrappedSerializableTest("AES");  
  -      
  -      //TEST Blowfish
  -      runWrappedSerializableTest("Blowfish"); 
  -      
  -      //Test TripleDES
  -      runWrappedSerializableTest("DESede");
  -      
  -      runWrappedSerializableTest("DES");
  -      runWrappedSerializableTest("DES/ECB/NoPadding");
  -      runWrappedSerializableTest("DES/CBC/NoPadding");
  -      runWrappedSerializableTest("DES/CBC/PKCS5Padding");
  -       
  -      runWrappedSerializableTest("DESede/ECB/NoPadding");
  -      runWrappedSerializableTest("DESede/CBC/NoPadding");
  -      runWrappedSerializableTest("DESede/CBC/PKCS5Padding");
  -      
  -      runWrappedSerializableTest("AES/ECB/NoPadding");
  -      runWrappedSerializableTest("AES/CBC/NoPadding");
  -      runWrappedSerializableTest("AES/CBC/PKCS5Padding");
  +      for(int i = 0 ; i < standard.length; i++)
  +         runWrappedSerializableTest(standard[i]);
  +      for(int i = 0 ; i < padded.length; i++)
  +         runWrappedSerializableTest(padded[i]);
  +      for(int i = 0 ; i < unpadded.length; i++)
  +         runWrappedSerializableTest(unpadded[i]);  
      }
   
      /**
  @@ -110,27 +98,13 @@
       */
      public void testHTTP() throws IOException, ClassNotFoundException
      { 
  -      //Test default DES
  -      runHttpTest(null);
  -      //TEST AES 
  -      runHttpTest("AES");   
  -      //TEST Blowfish
  -      runHttpTest("Blowfish");  
  -      //Test TripleDES
  -      runHttpTest("DESede");
  -      
  -      runHttpTest("DES");
  -      //runHttpTest("DES/ECB/NoPadding");
  -      //runHttpTest("DES/CBC/NoPadding");
  -      runHttpTest("DES/CBC/PKCS5Padding");
  -       
  -      //runHttpTest("DESede/ECB/NoPadding");
  -      //runHttpTest("DESede/CBC/NoPadding");
  -      runHttpTest("DESede/CBC/PKCS5Padding");
  -      
  -      //runHttpTest("AES/ECB/NoPadding");
  -      //runHttpTest("AES/CBC/NoPadding");
  -      runHttpTest("AES/CBC/PKCS5Padding");
  +      for(int i = 0 ; i < standard.length; i++)
  +         runHttpTest(standard[i]);
  +      for(int i = 0 ; i < padded.length; i++)
  +         runHttpTest(padded[i]);
  +      //NoPadding is not correctly supported by HttpUnMarshaller
  +      /*for(int i = 0 ; i < unpadded.length; i++)
  +         runHttpTest(unpadded[i]); */  
      }