Fix for tests in Android Studio

18 files changed, 2 insertions, 3 deletions

diff --git a/android/build.gradle b/android/build.gradle
index fbf4f99c..33b64435 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -22,7 +22,7 @@ android {
 
     sourceSets {
         androidTest {
-            java.srcDirs = ['src/androidTest/java', project(':tests').file('src/main/java')]
+            java.srcDirs = ['src/androidTest/java', project(':tests').file('src/test/java')]
         }
     }
 
diff --git a/java/build.gradle b/java/build.gradle
index fdcc4313..bbc49f69 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -15,7 +15,7 @@ repositories {
 sourceSets {
     test {
         java {
-            srcDirs = ['src/test/java/', project(':tests').file('src/main/java')]
+            srcDirs = ['src/test/java/', project(':tests').file('src/test/java')]
         }
     }
 }
diff --git a/tests/build.gradle b/tests/build.gradle
index bc71da90..013779e7 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -6,7 +6,6 @@ repositories {
 }
 
 dependencies {
-    compile 'junit:junit:3.8.2'
     testCompile 'junit:junit:3.8.2'
 
     compile project(':java')
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/InMemoryAxolotlStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryAxolotlStore.java
index e375c574..e375c574 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/InMemoryAxolotlStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryAxolotlStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/InMemoryIdentityKeyStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryIdentityKeyStore.java
index acb6110a..acb6110a 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/InMemoryIdentityKeyStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryIdentityKeyStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/InMemoryPreKeyStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryPreKeyStore.java
index a2ea6811..a2ea6811 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/InMemoryPreKeyStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryPreKeyStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/InMemorySessionStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/InMemorySessionStore.java
index 2d03d437..2d03d437 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/InMemorySessionStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/InMemorySessionStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/InMemorySignedPreKeyStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/InMemorySignedPreKeyStore.java
index 9f452d6d..9f452d6d 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/InMemorySignedPreKeyStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/InMemorySignedPreKeyStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/SessionBuilderTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/SessionBuilderTest.java
index 0912493e..0912493e 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/SessionBuilderTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/SessionBuilderTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/SessionCipherTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/SessionCipherTest.java
index e956ed77..e956ed77 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/SessionCipherTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/SessionCipherTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java b/tests/src/test/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java
index f09fedf8..f09fedf8 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/ecc/Curve25519Test.java b/tests/src/test/java/org/whispersystems/libaxolotl/ecc/Curve25519Test.java
index b10085bb..b10085bb 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/ecc/Curve25519Test.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/ecc/Curve25519Test.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/groups/GroupCipherTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/groups/GroupCipherTest.java
index 7c9892b0..7c9892b0 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/groups/GroupCipherTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/groups/GroupCipherTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/groups/InMemorySenderKeyStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/groups/InMemorySenderKeyStore.java
index c012566a..c012566a 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/groups/InMemorySenderKeyStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/groups/InMemorySenderKeyStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/kdf/HKDFTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/kdf/HKDFTest.java
index 4cf7166a..4cf7166a 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/kdf/HKDFTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/kdf/HKDFTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/ratchet/ChainKeyTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/ChainKeyTest.java
index ad17ebb9..ad17ebb9 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/ratchet/ChainKeyTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/ChainKeyTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/ratchet/RatchetingSessionTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RatchetingSessionTest.java
index 93929455..93929455 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/ratchet/RatchetingSessionTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RatchetingSessionTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/ratchet/RootKeyTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RootKeyTest.java
index 008c7b40..008c7b40 100644
--- a/tests/src/main/java/org/whispersystems/libaxolotl/ratchet/RootKeyTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RootKeyTest.java