diff options
Diffstat (limited to 'src/test/java/pl/edu/mimuw')
6 files changed, 16 insertions, 8 deletions
diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/AgentIntegrationTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/AgentIntegrationTest.java index a3e0898..e2c12d6 100644 --- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/AgentIntegrationTest.java +++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/AgentIntegrationTest.java @@ -3,6 +3,7 @@ package pl.edu.mimuw.cloudatlas.agent; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.Ignore; import static org.junit.Assert.*; import static org.junit.Assert.assertThat; import static org.hamcrest.CoreMatchers.hasItems; @@ -34,6 +35,7 @@ import pl.edu.mimuw.cloudatlas.model.ValueQuery; import pl.edu.mimuw.cloudatlas.model.ValueString; import pl.edu.mimuw.cloudatlas.model.ValueTime; +@Ignore public class AgentIntegrationTest { private static Process registryProcess; private static Process agentProcess; diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementationTests.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementationTests.java index 6330648..a5ecddd 100644 --- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementationTests.java +++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementationTests.java @@ -58,7 +58,7 @@ public class NewApiImplementationTests { RequestStateMessage requestMessage = (RequestStateMessage) message; ZMI root = new ZMI(); - StateMessage responseMessage = new StateMessage("", ModuleType.RMI, 0, 0, root, null); + StateMessage responseMessage = new StateMessage("", ModuleType.RMI, 0, 0, root, null, null); requestMessage.getFuture().complete(responseMessage); apiThread.join(100); @@ -88,7 +88,7 @@ public class NewApiImplementationTests { ZMI zmi = new ZMI(); zmi.getAttributes().add("timestamp", new ValueTime(42l)); - StateMessage response = new StateMessage("", ModuleType.RMI, 0, 0, zmi, new HashMap()); + StateMessage response = new StateMessage("", ModuleType.RMI, 0, 0, zmi, new HashMap(), null); requestMessage.getFuture().complete(response); apiThread.join(100); @@ -122,7 +122,7 @@ public class NewApiImplementationTests { zmi.addSon(son); son.getAttributes().add("name", new ValueString("son")); son.getAttributes().add("timestamp", new ValueTime(43l)); - StateMessage response = new StateMessage("", ModuleType.RMI, 0, 0, zmi, new HashMap()); + StateMessage response = new StateMessage("", ModuleType.RMI, 0, 0, zmi, new HashMap(), null); requestMessage.getFuture().complete(response); apiThread.join(100); diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlTest.java index a812e61..5fac535 100644 --- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlTest.java +++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlTest.java @@ -8,6 +8,7 @@ import static org.hamcrest.CoreMatchers.hasItems; import java.net.InetAddress; import java.util.AbstractMap.SimpleImmutableEntry; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -77,7 +78,7 @@ public class GossipGirlTest { testTime = ValueUtils.currentTime(); setupHierarchy(); setupQueries(); - stateMessage = new StateMessage("", ModuleType.GOSSIP, 0, 0, initiatorHierarchy, initiatorQueries); + stateMessage = new StateMessage("", ModuleType.GOSSIP, 0, 0, initiatorHierarchy, initiatorQueries, new HashSet()); Map<PathName, ValueTime> otherZoneTimestamps = makeOtherZoneTimestamps(); Map<Attribute, ValueTime> otherQueryTimestamps = makeOtherQueryTimestamps(); diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/QurnikTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/QurnikTest.java index 1e4fbda..a8d0ecb 100644 --- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/QurnikTest.java +++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/QurnikTest.java @@ -2,6 +2,7 @@ package pl.edu.mimuw.cloudatlas.agent.modules; import java.util.AbstractMap.SimpleImmutableEntry; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; @@ -63,7 +64,7 @@ public class QurnikTest { new ValueTime(0l) ) ); - StateMessage message = new StateMessage("", ModuleType.QUERY, 0, 0, root, queries); + StateMessage message = new StateMessage("", ModuleType.QUERY, 0, 0, root, queries, new HashSet()); long timeBefore = System.currentTimeMillis(); qurnik.handleTyped(message); long timeAfter = System.currentTimeMillis(); @@ -168,7 +169,7 @@ public class QurnikTest { ZMI root = setupSampleHierarchy(); Map<Attribute, Entry<ValueQuery, ValueTime>> queries = setupSampleQueries(); - StateMessage message = new StateMessage("", ModuleType.QUERY, 0, 0, root, queries); + StateMessage message = new StateMessage("", ModuleType.QUERY, 0, 0, root, queries, new HashSet()); long timeBefore = System.currentTimeMillis(); qurnik.handleTyped(message); long timeAfter = System.currentTimeMillis(); @@ -224,7 +225,7 @@ public class QurnikTest { new ValueTime(44l) ) ); - StateMessage message = new StateMessage("", ModuleType.QUERY, 0, 0, root, queries); + StateMessage message = new StateMessage("", ModuleType.QUERY, 0, 0, root, queries, new HashSet()); long timeBefore = System.currentTimeMillis(); qurnik.handleTyped(message); long timeAfter = System.currentTimeMillis(); diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/RemikTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/RemikTest.java index 8ac8bed..8dec10b 100644 --- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/RemikTest.java +++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/RemikTest.java @@ -3,6 +3,7 @@ package pl.edu.mimuw.cloudatlas.agent.modules; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.HashMap; +import java.util.HashSet; import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage; import pl.edu.mimuw.cloudatlas.agent.messages.GetStateMessage; @@ -49,7 +50,7 @@ public class RemikTest { ZMI zmi = new ZMI(); zmi.getAttributes().add("timestamp", new ValueTime(42l)); - StateMessage response = new StateMessage("", ModuleType.RMI, 0, 0, zmi, new HashMap()); + StateMessage response = new StateMessage("", ModuleType.RMI, 0, 0, zmi, new HashMap(), new HashSet()); remik.handleTyped(response); ResponseMessage passedResponse = future.get(100, TimeUnit.MILLISECONDS); diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/client/ClientTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/client/ClientTest.java index 2bd63f6..85b0949 100644 --- a/src/test/java/pl/edu/mimuw/cloudatlas/client/ClientTest.java +++ b/src/test/java/pl/edu/mimuw/cloudatlas/client/ClientTest.java @@ -2,6 +2,7 @@ package pl.edu.mimuw.cloudatlas.client; import org.hamcrest.CoreMatchers; import org.junit.AfterClass; +import org.junit.Ignore; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -126,6 +127,7 @@ public class ClientTest { .andExpect(content().string(CoreMatchers.containsString("Attribute submitted successfully"))); } + @Ignore @Test public void numericalRESTApiCheck() throws Exception { Thread.sleep(10000); @@ -135,6 +137,7 @@ public class ClientTest { .andExpect(content().string(CoreMatchers.containsString("num_processes"))); } + @Ignore @Test public void allValuesRESTApiCheck() throws Exception { Thread.sleep(10000); |