Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +01:00
Code Issues Projects Releases Wiki Activity

Replace default methods with helper classes.

Browse Source 
This is a workaround for AbstractMethodErrors
thrown by on-device tests.
This commit is contained in:
akwizgran
2019-12-11 16:27:55 +00:00
parent 5ba64577bd
commit 5962d3c763
35 changed files with 182 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-core/src/main/java/org/briarproject/briar/BriarCoreEagerSingletons.java
View File

@@ -27,4 +27,17 @@ public interface BriarCoreEagerSingletons {
void inject(SharingModule.EagerSingletons init);
class Helper {
public static void injectEagerSingletons(BriarCoreEagerSingletons c) {
c.inject(new BlogModule.EagerSingletons());
c.inject(new FeedModule.EagerSingletons());
c.inject(new ForumModule.EagerSingletons());
c.inject(new GroupInvitationModule.EagerSingletons());
c.inject(new MessagingModule.EagerSingletons());
c.inject(new PrivateGroupModule.EagerSingletons());
c.inject(new SharingModule.EagerSingletons());
c.inject(new IntroductionModule.EagerSingletons());
}
}
}

11
briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java
View File

@@ -28,15 +28,4 @@ import dagger.Module;
TestModule.class
})
public class BriarCoreModule {
public static void initEagerSingletons(BriarCoreEagerSingletons c) {
c.inject(new BlogModule.EagerSingletons());
c.inject(new FeedModule.EagerSingletons());
c.inject(new ForumModule.EagerSingletons());
c.inject(new GroupInvitationModule.EagerSingletons());
c.inject(new MessagingModule.EagerSingletons());
c.inject(new PrivateGroupModule.EagerSingletons());
c.inject(new SharingModule.EagerSingletons());
c.inject(new IntroductionModule.EagerSingletons());
}
}

8
briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerIntegrationTest.java
View File

@@ -65,23 +65,23 @@ public class BlogManagerIntegrationTest
protected void createComponents() {
BriarIntegrationTestComponent component =
DaggerBriarIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(component);
component.inject(this);
c0 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
.build();
c0.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c0);
c1 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
.build();
c1.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c1);
c2 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
.build();
c2.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c2);
}
@Test

2
briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTest.java
View File

@@ -38,7 +38,7 @@ public class FeedManagerIntegrationTest extends BriarTestCase {
DaggerFeedManagerIntegrationTestComponent.builder()
.testDatabaseConfigModule(
new TestDatabaseConfigModule(testFile)).build();
component.injectFeedManagerEagerSingletons();
FeedManagerIntegrationTestComponent.Helper.injectEagerSingletons(component);
component.inject(this);
IdentityManager identityManager = component.getIdentityManager();

15
briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTestComponent.java
View File

@@ -35,12 +35,6 @@ interface FeedManagerIntegrationTestComponent
void inject(FeedModule.EagerSingletons init);
default void injectFeedManagerEagerSingletons() {
injectBrambleCoreEagerSingletons();
inject(new BlogModule.EagerSingletons());
inject(new FeedModule.EagerSingletons());
}
IdentityManager getIdentityManager();
LifecycleManager getLifecycleManager();
@@ -49,4 +43,13 @@ interface FeedManagerIntegrationTestComponent
BlogManager getBlogManager();
class Helper {
public static void injectEagerSingletons(
FeedManagerIntegrationTestComponent c) {
BrambleCoreEagerSingletons.Helper.injectEagerSingletons(c);
c.inject(new BlogModule.EagerSingletons());
c.inject(new FeedModule.EagerSingletons());
}
}
}

8
briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerTest.java
View File

@@ -56,23 +56,23 @@ public class ForumManagerTest
protected void createComponents() {
BriarIntegrationTestComponent component =
DaggerBriarIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(component);
component.inject(this);
c0 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
.build();
c0.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c0);
c1 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
.build();
c1.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c1);
c2 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
.build();
c2.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c2);
}
private ForumPost createForumPost(GroupId groupId,

3
briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionCryptoIntegrationTest.java
View File

@@ -54,7 +54,8 @@ public class IntroductionCryptoIntegrationTest extends BrambleTestCase {
public IntroductionCryptoIntegrationTest() {
IntroductionIntegrationTestComponent component =
DaggerIntroductionIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
IntroductionIntegrationTestComponent.Helper
.injectEagerSingletons(component);
component.inject(this);
crypto = new IntroductionCryptoImpl(cryptoComponent, clientHelper);

9
briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
View File

@@ -114,23 +114,24 @@ public class IntroductionIntegrationTest
protected void createComponents() {
IntroductionIntegrationTestComponent component =
DaggerIntroductionIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
IntroductionIntegrationTestComponent.Helper
.injectEagerSingletons(component);
component.inject(this);
c0 = DaggerIntroductionIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
.build();
c0.injectBriarEagerSingletons();
IntroductionIntegrationTestComponent.Helper.injectEagerSingletons(c0);
c1 = DaggerIntroductionIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
.build();
c1.injectBriarEagerSingletons();
IntroductionIntegrationTestComponent.Helper.injectEagerSingletons(c1);
c2 = DaggerIntroductionIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
.build();
c2.injectBriarEagerSingletons();
IntroductionIntegrationTestComponent.Helper.injectEagerSingletons(c2);
}
@Test

3
briar-core/src/test/java/org/briarproject/briar/introduction/MessageEncoderParserIntegrationTest.java
View File

@@ -74,7 +74,8 @@ public class MessageEncoderParserIntegrationTest extends BrambleTestCase {
public MessageEncoderParserIntegrationTest() {
IntroductionIntegrationTestComponent component =
DaggerIntroductionIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
IntroductionIntegrationTestComponent.Helper
.injectEagerSingletons(component);
component.inject(this);
messageEncoder = new MessageEncoderImpl(clientHelper, messageFactory);

3
briar-core/src/test/java/org/briarproject/briar/introduction/SessionEncoderParserIntegrationTest.java
View File

@@ -83,7 +83,8 @@ public class SessionEncoderParserIntegrationTest extends BrambleTestCase {
public SessionEncoderParserIntegrationTest() {
IntroductionIntegrationTestComponent component =
DaggerIntroductionIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
IntroductionIntegrationTestComponent.Helper
.injectEagerSingletons(component);
component.inject(this);
sessionEncoder = new SessionEncoderImpl(clientHelper);

3
briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java
View File

@@ -44,7 +44,8 @@ public class MessageSizeIntegrationTest extends BriarTestCase {
public MessageSizeIntegrationTest() {
MessageSizeIntegrationTestComponent component =
DaggerMessageSizeIntegrationTestComponent.builder().build();
component.injectMessageSizeEagerSingletons();
MessageSizeIntegrationTestComponent.Helper
.injectEagerSingletons(component);
component.inject(this);
}

12
briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java
View File

@@ -27,9 +27,13 @@ interface MessageSizeIntegrationTestComponent
void inject(MessagingModule.EagerSingletons init);
default void injectMessageSizeEagerSingletons() {
injectBrambleCoreEagerSingletons();
inject(new ForumModule.EagerSingletons());
inject(new MessagingModule.EagerSingletons());
class Helper {
public static void injectEagerSingletons(
MessageSizeIntegrationTestComponent c) {
BrambleCoreEagerSingletons.Helper.injectEagerSingletons(c);
c.inject(new ForumModule.EagerSingletons());
c.inject(new MessagingModule.EagerSingletons());
}
}
}

8
briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerIntegrationTest.java
View File

@@ -68,23 +68,23 @@ public class MessagingManagerIntegrationTest
protected void createComponents() {
BriarIntegrationTestComponent component =
DaggerBriarIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(component);
component.inject(this);
c0 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
.build();
c0.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c0);
c1 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
.build();
c1.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c1);
c2 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
.build();
c2.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c2);
}
@Test

6
briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java
View File

@@ -60,11 +60,13 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
alice = DaggerSimplexMessagingIntegrationTestComponent.builder()
.testDatabaseConfigModule(
new TestDatabaseConfigModule(aliceDir)).build();
alice.injectSimplexMessagingEagerSingletons();
SimplexMessagingIntegrationTestComponent.Helper
.injectEagerSingletons(alice);
bob = DaggerSimplexMessagingIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(bobDir))
.build();
bob.injectSimplexMessagingEagerSingletons();
SimplexMessagingIntegrationTestComponent.Helper
.injectEagerSingletons(bob);
}
@Test

14
briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java
View File

@@ -28,11 +28,6 @@ interface SimplexMessagingIntegrationTestComponent
void inject(MessagingModule.EagerSingletons init);
default void injectSimplexMessagingEagerSingletons() {
injectBrambleCoreEagerSingletons();
inject(new MessagingModule.EagerSingletons());
}
LifecycleManager getLifecycleManager();
IdentityManager getIdentityManager();
@@ -46,4 +41,13 @@ interface SimplexMessagingIntegrationTestComponent
EventBus getEventBus();
ConnectionManager getConnectionManager();
class Helper {
public static void injectEagerSingletons(
SimplexMessagingIntegrationTestComponent c) {
BrambleCoreEagerSingletons.Helper.injectEagerSingletons(c);
c.inject(new MessagingModule.EagerSingletons());
}
}
}

8
briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupIntegrationTest.java
View File

@@ -70,23 +70,23 @@ public class PrivateGroupIntegrationTest
protected void createComponents() {
BriarIntegrationTestComponent component =
DaggerBriarIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(component);
component.inject(this);
c0 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
.build();
c0.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c0);
c1 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
.build();
c1.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c1);
c2 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
.build();
c2.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c2);
}
@Test

8
briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupManagerIntegrationTest.java
View File

@@ -59,23 +59,23 @@ public class PrivateGroupManagerIntegrationTest
protected void createComponents() {
BriarIntegrationTestComponent component =
DaggerBriarIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(component);
component.inject(this);
c0 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
.build();
c0.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c0);
c1 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
.build();
c1.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c1);
c2 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
.build();
c2.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c2);
}
@Test

8
briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java
View File

@@ -66,23 +66,23 @@ public class GroupInvitationIntegrationTest
protected void createComponents() {
BriarIntegrationTestComponent component =
DaggerBriarIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(component);
component.inject(this);
c0 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
.build();
c0.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c0);
c1 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
.build();
c1.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c1);
c2 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
.build();
c2.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c2);
}
@Test

8
briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java
View File

@@ -82,23 +82,23 @@ public class BlogSharingIntegrationTest
protected void createComponents() {
BriarIntegrationTestComponent component =
DaggerBriarIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(component);
component.inject(this);
c0 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
.build();
c0.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c0);
c1 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
.build();
c1.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c1);
c2 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
.build();
c2.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c2);
}
@Test

8
briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java
View File

@@ -99,23 +99,23 @@ public class ForumSharingIntegrationTest
protected void createComponents() {
BriarIntegrationTestComponent component =
DaggerBriarIntegrationTestComponent.builder().build();
component.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(component);
component.inject(this);
c0 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
.build();
c0.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c0);
c1 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
.build();
c1.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c1);
c2 = DaggerBriarIntegrationTestComponent.builder()
.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
.build();
c2.injectBriarEagerSingletons();
BriarIntegrationTestComponent.Helper.injectEagerSingletons(c2);
}
private void addForumForSharer() throws DbException {

26
briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java
View File

@@ -69,17 +69,6 @@ public interface BriarIntegrationTestComponent
void inject(SharingModule.EagerSingletons init);
default void injectBriarEagerSingletons() {
injectBrambleCoreEagerSingletons();
inject(new BlogModule.EagerSingletons());
inject(new ForumModule.EagerSingletons());
inject(new GroupInvitationModule.EagerSingletons());
inject(new IntroductionModule.EagerSingletons());
inject(new MessagingModule.EagerSingletons());
inject(new PrivateGroupModule.EagerSingletons());
inject(new SharingModule.EagerSingletons());
}
LifecycleManager getLifecycleManager();
EventBus getEventBus();
@@ -121,4 +110,19 @@ public interface BriarIntegrationTestComponent
BlogFactory getBlogFactory();
ConnectionManager getConnectionManager();
class Helper {
public static void injectEagerSingletons(
BriarIntegrationTestComponent c) {
BrambleCoreEagerSingletons.Helper.injectEagerSingletons(c);
c.inject(new BlogModule.EagerSingletons());
c.inject(new ForumModule.EagerSingletons());
c.inject(new GroupInvitationModule.EagerSingletons());
c.inject(new IntroductionModule.EagerSingletons());
c.inject(new MessagingModule.EagerSingletons());
c.inject(new PrivateGroupModule.EagerSingletons());
c.inject(new SharingModule.EagerSingletons());
}
}
}