Fix for tests in Android Studio

2015-02-10 20:16:27 -08:00 · 2015-02-10 20:16:27 -08:00 · 81e91efb3a
parent a9c42a3641
commit 81e91efb3a
18 changed files with 2 additions and 3 deletions
--- 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')]
        }
    }

--- 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')]
        }
    }
 }
--- 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')
--- a/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryAxolotlStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryAxolotlStore.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryIdentityKeyStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryIdentityKeyStore.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryPreKeyStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryPreKeyStore.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/InMemorySessionStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/InMemorySessionStore.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/InMemorySignedPreKeyStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/InMemorySignedPreKeyStore.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/SessionBuilderTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/SessionBuilderTest.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/SessionCipherTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/SessionCipherTest.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/ecc/Curve25519Test.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/ecc/Curve25519Test.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/groups/GroupCipherTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/groups/GroupCipherTest.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/groups/InMemorySenderKeyStore.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/groups/InMemorySenderKeyStore.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/kdf/HKDFTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/kdf/HKDFTest.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/ChainKeyTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/ChainKeyTest.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RatchetingSessionTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RatchetingSessionTest.java
--- a/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RootKeyTest.java
+++ b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RootKeyTest.java