[Tests] Add tests for CryptoData and re-organise

Author: Phillipus

org.archicontribs.modelrepository.tests/src/org/archicontribs/modelrepository/AllTests.java

@@ -6,21 +6,19 @@
 package org.archicontribs.modelrepository;
 
 
+import org.archicontribs.modelrepository.authentication.CryptoDataTests;
 import org.archicontribs.modelrepository.grafico.ArchiRepositoryTests;
 import org.archicontribs.modelrepository.grafico.GraficoUtilsTests;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
-import junit.framework.TestSuite;
+@RunWith(Suite.class)
 
-@SuppressWarnings("nls")
-public class AllTests {
-
-    public static junit.framework.Test suite() {
-		TestSuite suite = new TestSuite("org.archicontribs.modelrepository");
+@Suite.SuiteClasses({
+    ArchiRepositoryTests.class,
+    GraficoUtilsTests.class,
+    CryptoDataTests.class
+})
 
-		suite.addTest(ArchiRepositoryTests.suite());
-		suite.addTest(GraficoUtilsTests.suite());
-		
-        return suite;
-	}
-
-}
+public class AllTests {
+}

org.archicontribs.modelrepository.tests/src/org/archicontribs/modelrepository/authentication/CryptoDataTests.java

@@ -0,0 +1,97 @@
+/**
+ * This program and the accompanying materials
+ * are made available under the terms of the License
+ * which accompanies this distribution in the file LICENSE.txt
+ */
+package org.archicontribs.modelrepository.authentication;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+
+@SuppressWarnings("nls")
+public class CryptoDataTests {
+    
+    char[] secretText = "SecretTextToEncode".toCharArray();;
+    byte[] secretBytes = CryptoUtils.convertCharsToBytes(secretText); // These would be encrypted with cipher
+    
+    byte[] salt = CryptoUtils.generateRandomBytes(8);
+    byte[] iv = CryptoUtils.generateRandomBytes(8);
+    
+    /**
+     * No Salt or IV
+     */
+    @Test
+    public void noSaltIV() {
+        CryptoData cd = new CryptoData(null, null, secretBytes);
+        String encoded = cd.getBase64String();
+        
+        assertFalse(encoded.contains(",")); // no salt sep
+        assertFalse(encoded.contains(";")); // no iv sep
+        
+        cd = new CryptoData(encoded);
+        
+        assertNull(cd.getSalt());
+        assertNull(cd.getIV());
+        assertArrayEquals(secretBytes, cd.getEncryptedData());
+    }
+
+    /**
+     * Just Salt
+     */
+    @Test
+    public void justSalt() {
+        CryptoData cd = new CryptoData(salt, null, secretBytes);
+        String encoded = cd.getBase64String();
+        
+        assertTrue(encoded.contains(","));  // has salt sep
+        assertFalse(encoded.contains(";")); // no iv sep
+        
+        cd = new CryptoData(encoded);
+        
+        assertArrayEquals(salt, cd.getSalt());
+        assertNull(cd.getIV());
+        assertArrayEquals(secretBytes, cd.getEncryptedData());
+    }
+    
+    /**
+     * Just IV
+     */
+    @Test
+    public void justIV() {
+        CryptoData cd = new CryptoData(null, iv, secretBytes);
+        String encoded = cd.getBase64String();
+        
+        assertFalse(encoded.contains(",")); // no salt sep
+        assertTrue(encoded.contains(";"));  // has iv sep
+        
+        cd = new CryptoData(encoded);
+        
+        assertNull(cd.getSalt());
+        assertArrayEquals(iv, cd.getIV());
+        assertArrayEquals(secretBytes, cd.getEncryptedData());
+    }
+    
+    /**
+     * Salt and IV
+     */
+    @Test
+    public void saltIV() {
+        CryptoData cd = new CryptoData(salt, iv, secretBytes);
+        String encoded = cd.getBase64String();
+        
+        assertTrue(encoded.contains(","));  // has salt sep
+        assertTrue(encoded.contains(";"));  // has iv sep
+        
+        cd = new CryptoData(encoded);
+        
+        assertArrayEquals(salt, cd.getSalt());
+        assertArrayEquals(iv, cd.getIV());
+        assertArrayEquals(secretBytes, cd.getEncryptedData());
+    }
+
+}

org.archicontribs.modelrepository.tests/src/org/archicontribs/modelrepository/grafico/ArchiRepositoryTests.java

@@ -29,16 +29,10 @@
 import com.archimatetool.model.IArchimateFactory;
 import com.archimatetool.model.IArchimateModel;
 
-import junit.framework.JUnit4TestAdapter;
-
 
 @SuppressWarnings("nls")
 public class ArchiRepositoryTests {
 
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(ArchiRepositoryTests.class);
-    }
-    
     @Before
     public void runOnceBeforeEachTest() {
     }

org.archicontribs.modelrepository.tests/src/org/archicontribs/modelrepository/grafico/GraficoUtilsTests.java

@@ -22,16 +22,10 @@
 import com.archimatetool.model.IArchimateFactory;
 import com.archimatetool.model.IArchimateModel;
 
-import junit.framework.JUnit4TestAdapter;
-
 
 @SuppressWarnings("nls")
 public class GraficoUtilsTests {
 
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(GraficoUtilsTests.class);
-    }
-    
     @Before
     public void runOnceBeforeEachTest() {
     }