diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-04 21:32:37 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-04 21:32:37 +0200 |
| commit | cae0071342e746c934490298c3dd3ee230a2ee32 (patch) | |
| tree | 5c540d7c8ad84b462fd3cbc87b0aea7c5513fc9c /OpenKeychain/src/androidTest/java/tests | |
| parent | 6a637462782b4ce57ecf154edf0974114181b8ad (diff) | |
| parent | 52f1f30846ad7efa6e6ae11ed96f5b68626bfb3b (diff) | |
| download | open-keychain-cae0071342e746c934490298c3dd3ee230a2ee32.tar.gz open-keychain-cae0071342e746c934490298c3dd3ee230a2ee32.tar.bz2 open-keychain-cae0071342e746c934490298c3dd3ee230a2ee32.zip | |
Merge branch 'master' into automatic-contact-discovery
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/androidTest/java/tests')
| -rw-r--r-- | OpenKeychain/src/androidTest/java/tests/SomeTest.java | 12 |
1 files changed, 12 insertions, 0 deletions
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 |