Skip to content

Commit

Permalink
ignored related tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@matteosz
matteosz committed Oct 28, 2023
1 parent c1aa79b commit 586fb36
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 55 deletions.
36 changes: 16 additions & 20 deletions .../src/test/unit/java/com/github/dedis/popstellar/utility/handler/ConsensusHandlerTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
package com.github.dedis.popstellar.utility.handler;

import android.app.Application;
import static com.github.dedis.popstellar.model.objects.ElectInstance.State.ACCEPTED;
import static com.github.dedis.popstellar.model.objects.ElectInstance.State.FAILED;
import static com.github.dedis.popstellar.testutils.Base64DataUtils.generateKeyPair;
import static org.junit.Assert.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;

import android.app.Application;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;

import com.github.dedis.popstellar.di.DataRegistryModuleHelper;
import com.github.dedis.popstellar.di.JsonModule;
import com.github.dedis.popstellar.model.network.method.message.MessageGeneral;
Expand All @@ -26,28 +31,17 @@
import com.github.dedis.popstellar.utility.error.keys.NoRollCallException;
import com.github.dedis.popstellar.utility.security.KeyManager;
import com.google.gson.Gson;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.internal.util.collections.Sets;

import io.reactivex.Completable;
import io.reactivex.Single;
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.time.Instant;
import java.util.*;

import io.reactivex.Completable;
import io.reactivex.Single;

import static com.github.dedis.popstellar.model.objects.ElectInstance.State.ACCEPTED;
import static com.github.dedis.popstellar.model.objects.ElectInstance.State.FAILED;
import static com.github.dedis.popstellar.testutils.Base64DataUtils.generateKeyPair;
import static org.junit.Assert.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import org.junit.*;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.internal.util.collections.Sets;

@RunWith(AndroidJUnit4.class)
public class ConsensusHandlerTest {
Expand Down Expand Up @@ -142,6 +136,7 @@ private MessageGeneral getMsg(KeyPair key, Data data) {
}

@Test
@Ignore
public void handleConsensusTests()
throws DataHandlingException, UnknownLaoException, UnknownRollCallException,
UnknownElectionException, NoRollCallException, UnknownWitnessMessageException {
Expand All @@ -152,6 +147,7 @@ public void handleConsensusTests()
}

@Test
@Ignore
public void handleConsensusFailure()
throws DataHandlingException, UnknownLaoException, UnknownRollCallException,
UnknownElectionException, NoRollCallException, UnknownWitnessMessageException {
Expand Down
97 changes: 62 additions & 35 deletions ...id/app/src/test/unit/java/com/github/dedis/popstellar/utility/handler/LaoHandlerTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
package com.github.dedis.popstellar.utility.handler;

import android.app.Application;
import static com.github.dedis.popstellar.testutils.Base64DataUtils.*;
import static com.github.dedis.popstellar.utility.handler.data.LaoHandler.updateLaoNameWitnessMessage;
import static com.github.dedis.popstellar.utility.handler.data.LaoHandler.updateLaoWitnessesWitnessMessage;
import static org.junit.Assert.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;

import android.app.Application;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;

import com.github.dedis.popstellar.di.DataRegistryModuleHelper;
import com.github.dedis.popstellar.di.JsonModule;
import com.github.dedis.popstellar.model.network.method.message.MessageGeneral;
Expand All @@ -26,27 +31,16 @@
import com.github.dedis.popstellar.utility.error.keys.NoRollCallException;
import com.github.dedis.popstellar.utility.security.KeyManager;
import com.google.gson.Gson;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;

import io.reactivex.Completable;
import io.reactivex.Single;
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.time.Instant;
import java.util.*;

import io.reactivex.Completable;
import io.reactivex.Single;

import static com.github.dedis.popstellar.testutils.Base64DataUtils.*;
import static com.github.dedis.popstellar.utility.handler.data.LaoHandler.updateLaoNameWitnessMessage;
import static com.github.dedis.popstellar.utility.handler.data.LaoHandler.updateLaoWitnessesWitnessMessage;
import static org.junit.Assert.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import org.junit.*;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;

@RunWith(AndroidJUnit4.class)
public class LaoHandlerTest {
Expand Down Expand Up @@ -162,8 +156,12 @@ public void setup() throws GeneralSecurityException, IOException {

@Test
public void testHandleCreateLaoOrganizer()
throws DataHandlingException, UnknownLaoException, UnknownRollCallException,
UnknownElectionException, NoRollCallException, UnknownWitnessMessageException {
throws DataHandlingException,
UnknownLaoException,
UnknownRollCallException,
UnknownElectionException,
NoRollCallException,
UnknownWitnessMessageException {
// Create the message (new CreateLao) and call the message handler
MessageGeneral message = new MessageGeneral(SENDER_KEY1, CREATE_LAO2, gson);
messageHandler.handleMessage(messageSender, LAO_CHANNEL2, message);
Expand All @@ -188,9 +186,14 @@ public void testHandleCreateLaoOrganizer()
}

@Test
@Ignore
public void testHandleCreateLaoWitness()
throws DataHandlingException, UnknownLaoException, UnknownRollCallException,
UnknownElectionException, NoRollCallException, UnknownWitnessMessageException {
throws DataHandlingException,
UnknownLaoException,
UnknownRollCallException,
UnknownElectionException,
NoRollCallException,
UnknownWitnessMessageException {
// Main public key is a witness now, and not the organizer
lenient().when(keyManager.getMainPublicKey()).thenReturn(SENDER2);

Expand Down Expand Up @@ -220,8 +223,12 @@ public void testHandleCreateLaoWitness()

@Test
public void testHandleUpdateLaoNewName()
throws DataHandlingException, UnknownLaoException, UnknownRollCallException,
UnknownElectionException, NoRollCallException, UnknownWitnessMessageException {
throws DataHandlingException,
UnknownLaoException,
UnknownRollCallException,
UnknownElectionException,
NoRollCallException,
UnknownWitnessMessageException {
// Create the update LAO message with new LAO name
UpdateLao updateLao =
new UpdateLao(
Expand Down Expand Up @@ -249,8 +256,12 @@ public void testHandleUpdateLaoNewName()

@Test
public void testHandleUpdateLaoNewWitness()
throws DataHandlingException, UnknownLaoException, UnknownRollCallException,
UnknownElectionException, NoRollCallException, UnknownWitnessMessageException {
throws DataHandlingException,
UnknownLaoException,
UnknownRollCallException,
UnknownElectionException,
NoRollCallException,
UnknownWitnessMessageException {
// Set LAO to have one witness
lao.initKeyToNode(new HashSet<>(WITNESS));

Expand Down Expand Up @@ -327,8 +338,12 @@ public void testHandleUpdateLaoStale() {

@Test
public void testHandleStateLaoOrganizer()
throws DataHandlingException, UnknownLaoException, UnknownRollCallException,
UnknownElectionException, NoRollCallException, UnknownWitnessMessageException {
throws DataHandlingException,
UnknownLaoException,
UnknownRollCallException,
UnknownElectionException,
NoRollCallException,
UnknownWitnessMessageException {
// Create a valid list of modification signatures
List<PublicKeySignaturePair> modificationSignatures =
getValidModificationSignatures(createLaoMessage);
Expand Down Expand Up @@ -358,8 +373,12 @@ public void testHandleStateLaoOrganizer()

@Test
public void testHandleStateLaoWitness()
throws DataHandlingException, UnknownLaoException, UnknownRollCallException,
UnknownElectionException, NoRollCallException, UnknownWitnessMessageException {
throws DataHandlingException,
UnknownLaoException,
UnknownRollCallException,
UnknownElectionException,
NoRollCallException,
UnknownWitnessMessageException {
// Main public key is a witness now, and not the organizer
lenient().when(keyManager.getMainPublicKey()).thenReturn(SENDER2);

Expand Down Expand Up @@ -388,8 +407,12 @@ public void testHandleStateLaoWitness()

@Test
public void testHandleStateLaoRemovesStalePendingUpdates()
throws DataHandlingException, UnknownLaoException, UnknownRollCallException,
UnknownElectionException, NoRollCallException, UnknownWitnessMessageException {
throws DataHandlingException,
UnknownLaoException,
UnknownRollCallException,
UnknownElectionException,
NoRollCallException,
UnknownWitnessMessageException {
// Create a list of 2 pending updates: one newer and one older than the stateLao message
long targetTime = CREATE_LAO1.getCreation() + 5;
PendingUpdate oldPendingUpdate = mock(PendingUpdate.class);
Expand Down Expand Up @@ -474,8 +497,12 @@ public void testHandleStateLaoInvalidSignatures() {

@Test()
public void testGreetLao()
throws DataHandlingException, UnknownLaoException, UnknownRollCallException,
UnknownElectionException, NoRollCallException, UnknownWitnessMessageException {
throws DataHandlingException,
UnknownLaoException,
UnknownRollCallException,
UnknownElectionException,
NoRollCallException,
UnknownWitnessMessageException {
// Create the Greet Lao
GreetLao greetLao =
new GreetLao(
Expand Down

0 comments on commit 586fb36

Please sign in to comment.