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

Moved common fields to superclass.

Browse Source
This commit is contained in:
akwizgran
2016-11-16 16:39:30 +00:00
parent 8c3b598ab2
commit eaf17c054f
5 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-tests/src/org/briarproject/ValidatorTestCase.java
View File

@@ -1,13 +1,22 @@
package org.briarproject; package org.briarproject;
import org.briarproject.api.clients.ClientHelper;
import org.briarproject.api.data.MetadataEncoder;
import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.Group; import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.Message; import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageId; import org.briarproject.api.sync.MessageId;
import org.briarproject.api.system.Clock;
public abstract class ValidatorTestCase extends BriarMockTestCase { public abstract class ValidatorTestCase extends BriarMockTestCase {
protected final ClientHelper clientHelper =
context.mock(ClientHelper.class);
protected final MetadataEncoder metadataEncoder =
context.mock(MetadataEncoder.class);
protected final Clock clock = context.mock(Clock.class);
protected final MessageId messageId = protected final MessageId messageId =
new MessageId(TestUtils.getRandomId()); new MessageId(TestUtils.getRandomId());
protected final GroupId groupId = new GroupId(TestUtils.getRandomId()); protected final GroupId groupId = new GroupId(TestUtils.getRandomId());

8
briar-tests/src/org/briarproject/clients/BdfMessageValidatorTest.java
View File

@@ -3,16 +3,13 @@ package org.briarproject.clients;
import org.briarproject.ValidatorTestCase; import org.briarproject.ValidatorTestCase;
import org.briarproject.api.FormatException; import org.briarproject.api.FormatException;
import org.briarproject.api.clients.BdfMessageContext; import org.briarproject.api.clients.BdfMessageContext;
import org.briarproject.api.clients.ClientHelper;
import org.briarproject.api.data.BdfDictionary; import org.briarproject.api.data.BdfDictionary;
import org.briarproject.api.data.BdfList; import org.briarproject.api.data.BdfList;
import org.briarproject.api.data.MetadataEncoder;
import org.briarproject.api.db.Metadata; import org.briarproject.api.db.Metadata;
import org.briarproject.api.sync.Group; import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.InvalidMessageException; import org.briarproject.api.sync.InvalidMessageException;
import org.briarproject.api.sync.Message; import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageContext; import org.briarproject.api.sync.MessageContext;
import org.briarproject.api.system.Clock;
import org.jmock.Expectations; import org.jmock.Expectations;
import org.jmock.lib.legacy.ClassImposteriser; import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.Test; import org.junit.Test;
@@ -25,11 +22,6 @@ import static org.junit.Assert.fail;
public class BdfMessageValidatorTest extends ValidatorTestCase { public class BdfMessageValidatorTest extends ValidatorTestCase {
private final ClientHelper clientHelper = context.mock(ClientHelper.class);
private final MetadataEncoder metadataEncoder =
context.mock(MetadataEncoder.class);
private final Clock clock = context.mock(Clock.class);
private final BdfList body = BdfList.of(123, 456); private final BdfList body = BdfList.of(123, 456);
private final BdfDictionary dictionary = new BdfDictionary(); private final BdfDictionary dictionary = new BdfDictionary();
private final Metadata meta = new Metadata(); private final Metadata meta = new Metadata();

7
briar-tests/src/org/briarproject/forum/ForumPostValidatorTest.java
View File

@@ -5,16 +5,13 @@ import org.briarproject.ValidatorTestCase;
import org.briarproject.api.FormatException; import org.briarproject.api.FormatException;
import org.briarproject.api.UniqueId; import org.briarproject.api.UniqueId;
import org.briarproject.api.clients.BdfMessageContext; import org.briarproject.api.clients.BdfMessageContext;
import org.briarproject.api.clients.ClientHelper;
import org.briarproject.api.data.BdfDictionary; import org.briarproject.api.data.BdfDictionary;
import org.briarproject.api.data.BdfList; import org.briarproject.api.data.BdfList;
import org.briarproject.api.data.MetadataEncoder;
import org.briarproject.api.identity.Author; import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.AuthorFactory; import org.briarproject.api.identity.AuthorFactory;
import org.briarproject.api.identity.AuthorId; import org.briarproject.api.identity.AuthorId;
import org.briarproject.api.sync.InvalidMessageException; import org.briarproject.api.sync.InvalidMessageException;
import org.briarproject.api.sync.MessageId; import org.briarproject.api.sync.MessageId;
import org.briarproject.api.system.Clock;
import org.jmock.Expectations; import org.jmock.Expectations;
import org.junit.Test; import org.junit.Test;
@@ -33,10 +30,6 @@ public class ForumPostValidatorTest extends ValidatorTestCase {
private final AuthorFactory authorFactory = private final AuthorFactory authorFactory =
context.mock(AuthorFactory.class); context.mock(AuthorFactory.class);
private final ClientHelper clientHelper = context.mock(ClientHelper.class);
private final MetadataEncoder metadataEncoder =
context.mock(MetadataEncoder.class);
private final Clock clock = context.mock(Clock.class);
private final MessageId parentId = new MessageId(TestUtils.getRandomId()); private final MessageId parentId = new MessageId(TestUtils.getRandomId());
private final String authorName = private final String authorName =

8
briar-tests/src/org/briarproject/messaging/PrivateMessageValidatorTest.java
View File

@@ -4,11 +4,8 @@ import org.briarproject.TestUtils;
import org.briarproject.ValidatorTestCase; import org.briarproject.ValidatorTestCase;
import org.briarproject.api.FormatException; import org.briarproject.api.FormatException;
import org.briarproject.api.clients.BdfMessageContext; import org.briarproject.api.clients.BdfMessageContext;
import org.briarproject.api.clients.ClientHelper;
import org.briarproject.api.data.BdfDictionary; import org.briarproject.api.data.BdfDictionary;
import org.briarproject.api.data.BdfList; import org.briarproject.api.data.BdfList;
import org.briarproject.api.data.MetadataEncoder;
import org.briarproject.api.system.Clock;
import org.junit.Test; import org.junit.Test;
import static org.briarproject.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_BODY_LENGTH; import static org.briarproject.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_BODY_LENGTH;
@@ -18,11 +15,6 @@ import static org.junit.Assert.assertFalse;
public class PrivateMessageValidatorTest extends ValidatorTestCase { public class PrivateMessageValidatorTest extends ValidatorTestCase {
private final ClientHelper clientHelper = context.mock(ClientHelper.class);
private final MetadataEncoder metadataEncoder =
context.mock(MetadataEncoder.class);
private final Clock clock = context.mock(Clock.class);
@Test(expected = FormatException.class) @Test(expected = FormatException.class)
public void testRejectsTooShortBody() throws Exception { public void testRejectsTooShortBody() throws Exception {
PrivateMessageValidator v = new PrivateMessageValidator(clientHelper, PrivateMessageValidator v = new PrivateMessageValidator(clientHelper,

8
briar-tests/src/org/briarproject/sharing/ForumSharingValidatorTest.java
View File

@@ -5,12 +5,9 @@ import org.briarproject.ValidatorTestCase;
import org.briarproject.api.FormatException; import org.briarproject.api.FormatException;
import org.briarproject.api.UniqueId; import org.briarproject.api.UniqueId;
import org.briarproject.api.clients.BdfMessageContext; import org.briarproject.api.clients.BdfMessageContext;
import org.briarproject.api.clients.ClientHelper;
import org.briarproject.api.clients.SessionId; import org.briarproject.api.clients.SessionId;
import org.briarproject.api.data.BdfDictionary; import org.briarproject.api.data.BdfDictionary;
import org.briarproject.api.data.BdfList; import org.briarproject.api.data.BdfList;
import org.briarproject.api.data.MetadataEncoder;
import org.briarproject.api.system.Clock;
import org.junit.Test; import org.junit.Test;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@@ -35,11 +32,6 @@ import static org.junit.Assert.assertFalse;
public class ForumSharingValidatorTest extends ValidatorTestCase { public class ForumSharingValidatorTest extends ValidatorTestCase {
private final ClientHelper clientHelper = context.mock(ClientHelper.class);
private final MetadataEncoder metadataEncoder =
context.mock(MetadataEncoder.class);
private final Clock clock = context.mock(Clock.class);
private final SessionId sessionId = new SessionId(TestUtils.getRandomId()); private final SessionId sessionId = new SessionId(TestUtils.getRandomId());
private final String forumName = private final String forumName =
TestUtils.getRandomString(MAX_FORUM_NAME_LENGTH); TestUtils.getRandomString(MAX_FORUM_NAME_LENGTH);