From e7fa124108e72b0eaaa1319467d666d876278467 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 12 May 2014 22:18:11 +0200
Subject: update unit test support in build files

---
 .../src/androidTest/java/tests/SomeTest.java       | 12 ++++++
 .../keychain/PgpKeyOperationTest.java              | 46 ----------------------
 .../keychain/RobolectricGradleTestRunner.java      | 23 -----------
 3 files changed, 12 insertions(+), 69 deletions(-)
 create mode 100644 OpenKeychain/src/androidTest/java/tests/SomeTest.java
 delete mode 100644 OpenKeychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java
 delete mode 100644 OpenKeychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java

(limited to 'OpenKeychain/src')

diff --git a/OpenKeychain/src/androidTest/java/tests/SomeTest.java b/OpenKeychain/src/androidTest/java/tests/SomeTest.java
new file mode 100644
index 000000000..edf5f7bcc
--- /dev/null
+++ b/OpenKeychain/src/androidTest/java/tests/SomeTest.java
@@ -0,0 +1,12 @@
+package tests;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class SomeTest {
+    @Test
+    public void willFail() {
+        // stub
+        // Assert.assertThat();
+    }
+}
\ No newline at end of file
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java
deleted file mode 100644
index 72f29a1e3..000000000
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.sufficientlysecure.keychain;
-
-import org.junit.Before;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-
-import org.sufficientlysecure.keychain.pgp.*;
-import org.spongycastle.openpgp.*;
-
-@RunWith(RobolectricGradleTestRunner.class)
-public class PgpKeyOperationTest {
-
-    PGPSecretKey key;
-
-    @Before
-    public void setUp() throws Exception {
-
-        /* Input */
-        int algorithm = Id.choice.algorithm.dsa;
-        String passphrase = "swag";
-        int keysize = 2048;
-        boolean masterKey = true;
-
-        /* Operation */
-        PgpKeyOperation keyOperations = new PgpKeyOperation(null);
-        key = keyOperations.createKey(algorithm, keysize, passphrase, masterKey);
-
-        System.err.println("initialized, test key: " + PgpKeyHelper.convertKeyIdToHex(key.getKeyID()));
-    }
-
-    @After
-    public void tearDown() {
-    }
-
-    @Test
-    public void createTest() {
-    }
-
-    @Test
-    public void certifyKey() {
-        System.err.println("swag");
-    }
-
-}
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java
deleted file mode 100644
index b64ffde07..000000000
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.sufficientlysecure.keychain;
-
-import org.junit.runners.model.InitializationError;
-import org.robolectric.AndroidManifest;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.res.Fs;
-import org.robolectric.res.FsFile;
-
-import org.sufficientlysecure.keychain.KeychainApplication;
-
-public class RobolectricGradleTestRunner extends RobolectricTestRunner {
-    public RobolectricGradleTestRunner(Class<?> testClass) throws InitializationError {
-        super(testClass);
-    }
-
-    @Override protected AndroidManifest getAppManifest(Config config) {
-        String myAppPath = KeychainApplication.class.getProtectionDomain().getCodeSource().getLocation().getPath();
-        String manifestPath = myAppPath + "../../../src/main/AndroidManifest.xml";
-        return createAppManifest(Fs.fileFromPath(manifestPath));
-    }
-}
-
-- 
cgit v1.2.3