Merge branch 'tests-cleanup' into 'master'
Clean up tests * Broke up ConstantsTest (#280) - the key encoding parts are now in KeyEncodingAndParsingTest, the message encoding parts are in MessageSizeIntegrationTest * Renamed the other integration tests in briar-android-tests * Moved the integration tests in briar-android-tests to the top-level package, as they all involve code from multiple packages * Separated DatabaseExecutorModule from DatabaseModule so we can use a different @DatabaseExecutor in integration tests * Merged AppModule with AndroidModule (@ernir, this touches code you're working on but I don't think there are any conflicts) * Renamed some TestUtils methods for consistency * Used TestUtils.getRandomBytes() where applicable Fixes #280. See merge request !133
Showing
- briar-android-tests/src/test/java/org/briarproject/MessageSizeIntegrationTest.java 14 additions, 55 deletions...est/java/org/briarproject/MessageSizeIntegrationTest.java
- briar-android-tests/src/test/java/org/briarproject/MessageSizeIntegrationTestComponent.java 34 additions, 0 deletions...org/briarproject/MessageSizeIntegrationTestComponent.java
- briar-android-tests/src/test/java/org/briarproject/SimplexMessagingIntegrationTest.java 12 additions, 31 deletions...ava/org/briarproject/SimplexMessagingIntegrationTest.java
- briar-android-tests/src/test/java/org/briarproject/SimplexMessagingIntegrationTestComponent.java 22 additions, 19 deletions...riarproject/SimplexMessagingIntegrationTestComponent.java
- briar-android-tests/src/test/java/org/briarproject/SyncIntegrationTest.java 44 additions, 35 deletions...s/src/test/java/org/briarproject/SyncIntegrationTest.java
- briar-android-tests/src/test/java/org/briarproject/SyncIntegrationTestComponent.java 20 additions, 0 deletions...t/java/org/briarproject/SyncIntegrationTestComponent.java
- briar-android-tests/src/test/java/org/briarproject/protocol/ProtocolTestComponent.java 0 additions, 26 deletions...java/org/briarproject/protocol/ProtocolTestComponent.java
- briar-android/src/org/briarproject/android/AndroidComponent.java 7 additions, 5 deletions...ndroid/src/org/briarproject/android/AndroidComponent.java
- briar-android/src/org/briarproject/android/AndroidEagerSingletons.java 1 addition, 1 deletion.../src/org/briarproject/android/AndroidEagerSingletons.java
- briar-android/src/org/briarproject/android/AndroidModule.java 0 additions, 100 deletions...r-android/src/org/briarproject/android/AndroidModule.java
- briar-android/src/org/briarproject/android/AppModule.java 85 additions, 1 deletionbriar-android/src/org/briarproject/android/AppModule.java
- briar-android/src/org/briarproject/android/BaseActivity.java 2 additions, 8 deletionsbriar-android/src/org/briarproject/android/BaseActivity.java
- briar-android/src/org/briarproject/android/BriarApplication.java 4 additions, 5 deletions...ndroid/src/org/briarproject/android/BriarApplication.java
- briar-android/src/org/briarproject/android/BriarService.java 2 additions, 2 deletionsbriar-android/src/org/briarproject/android/BriarService.java
- briar-android/src/org/briarproject/android/fragment/BaseFragment.java 4 additions, 8 deletions...d/src/org/briarproject/android/fragment/BaseFragment.java
- briar-core/src/org/briarproject/CoreEagerSingletons.java 13 additions, 3 deletionsbriar-core/src/org/briarproject/CoreEagerSingletons.java
- briar-core/src/org/briarproject/CoreModule.java 24 additions, 8 deletionsbriar-core/src/org/briarproject/CoreModule.java
- briar-core/src/org/briarproject/db/DatabaseExecutorModule.java 59 additions, 0 deletions...-core/src/org/briarproject/db/DatabaseExecutorModule.java
- briar-core/src/org/briarproject/db/DatabaseModule.java 2 additions, 41 deletionsbriar-core/src/org/briarproject/db/DatabaseModule.java
- briar-core/src/org/briarproject/transport/KeyManagerImpl.java 4 additions, 4 deletions...r-core/src/org/briarproject/transport/KeyManagerImpl.java
Loading
Please register or sign in to comment