1 files changed, 5 insertions, 19 deletions

diff --git a/src/androidTest/java/org/whispersystems/test/SimultaneousInitiateTests.java b/tests/src/main/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java
index dffde57c..f09fedf8 100644
--- a/src/androidTest/java/org/whispersystems/test/SimultaneousInitiateTests.java
+++ b/tests/src/main/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java
@@ -1,18 +1,7 @@
-package org.whispersystems.test;
-
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import org.whispersystems.libaxolotl.DuplicateMessageException;
-import org.whispersystems.libaxolotl.InvalidKeyException;
-import org.whispersystems.libaxolotl.InvalidKeyIdException;
-import org.whispersystems.libaxolotl.InvalidMessageException;
-import org.whispersystems.libaxolotl.InvalidVersionException;
-import org.whispersystems.libaxolotl.LegacyMessageException;
-import org.whispersystems.libaxolotl.NoSessionException;
-import org.whispersystems.libaxolotl.SessionBuilder;
-import org.whispersystems.libaxolotl.SessionCipher;
-import org.whispersystems.libaxolotl.UntrustedIdentityException;
+package org.whispersystems.libaxolotl;
+
+import junit.framework.TestCase;
+
 import org.whispersystems.libaxolotl.ecc.Curve;
 import org.whispersystems.libaxolotl.ecc.ECKeyPair;
 import org.whispersystems.libaxolotl.protocol.CiphertextMessage;
@@ -27,7 +16,7 @@ import org.whispersystems.libaxolotl.util.Medium;
 import java.util.Arrays;
 import java.util.Random;
 
-public class SimultaneousInitiateTests extends AndroidTestCase {
+public class SimultaneousInitiateTests extends TestCase {
 
   private static final long BOB_RECIPENT_ID    = 12345;
   private static final long ALICE_RECIPIENT_ID = 6789;
@@ -243,7 +232,6 @@ public class SimultaneousInitiateTests extends AndroidTestCase {
     assertFalse(isSessionIdEqual(aliceStore, bobStore));
 
     for (int i=0;i<50;i++) {
-      Log.w("SimultaneousInitiateTests", "Iteration: " + i);
       CiphertextMessage messageForBobRepeat   = aliceSessionCipher.encrypt("hey there".getBytes());
       CiphertextMessage messageForAliceRepeat = bobSessionCipher.encrypt("sample message".getBytes());
 
@@ -323,7 +311,6 @@ public class SimultaneousInitiateTests extends AndroidTestCase {
     }
 
     for (int i=0;i<50;i++) {
-      Log.w("SimultaneousInitiateTests", "Iteration: " + i);
       CiphertextMessage messageForBobRepeat   = aliceSessionCipher.encrypt("hey there".getBytes());
       CiphertextMessage messageForAliceRepeat = bobSessionCipher.encrypt("sample message".getBytes());
 
@@ -412,7 +399,6 @@ public class SimultaneousInitiateTests extends AndroidTestCase {
     }
 
     for (int i=0;i<50;i++) {
-      Log.w("SimultaneousInitiateTests", "Iteration: " + i);
       CiphertextMessage messageForBobRepeat   = aliceSessionCipher.encrypt("hey there".getBytes());
       CiphertextMessage messageForAliceRepeat = bobSessionCipher.encrypt("sample message".getBytes());