diff options
author | Magdalena Grodzińska <mag.grodzinska@gmail.com> | 2020-01-13 22:40:43 +0100 |
---|---|---|
committer | Magdalena Grodzińska <mag.grodzinska@gmail.com> | 2020-01-13 22:40:43 +0100 |
commit | 27b84d48029e90d816653e2b718aa8f629094611 (patch) | |
tree | ffc1e96546277616e3a21c2411e4b6306b4fac00 /src/test/java/pl/edu/mimuw/cloudatlas | |
parent | b0a43f11c3f38cbd2c3a255fc986c5a5612d7422 (diff) |
Small fixes
Diffstat (limited to 'src/test/java/pl/edu/mimuw/cloudatlas')
-rw-r--r-- | src/test/java/pl/edu/mimuw/cloudatlas/client/ClientTest.java | 12 |
1 files changed, 9 insertions, 3 deletions
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 85b0949..56a4824 100644 --- a/src/test/java/pl/edu/mimuw/cloudatlas/client/ClientTest.java +++ b/src/test/java/pl/edu/mimuw/cloudatlas/client/ClientTest.java @@ -29,7 +29,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder public class ClientTest { private static Process registryProcess; private static Process agentProcess; - private static Process clientProcess; + private static Process querySignerProcess; private static Registry registry; private static Api api; @@ -37,9 +37,12 @@ public class ClientTest { @BeforeClass public static void bindApi() throws Exception { registryProcess = Runtime.getRuntime().exec("./scripts/registry"); - Thread.sleep(10000); + Thread.sleep(2000); + registryProcess = Runtime.getRuntime().exec("./scripts/generate_keys.sh"); agentProcess = Runtime.getRuntime().exec("./gradlew runAgent -Dhostname=localhost -DfreshnessPeriod=10000000"); - Thread.sleep(10000); + Thread.sleep(3000); + querySignerProcess = Runtime.getRuntime().exec("./gradlew runQuerySigner"); + Thread.sleep(3000); registry = LocateRegistry.getRegistry("localhost"); api = (Api) registry.lookup("Api"); @@ -50,6 +53,7 @@ public class ClientTest { try { registryProcess.destroy(); agentProcess.destroy(); + querySignerProcess.destroy(); } catch (Exception e) { System.out.println("Caught exception: " + e); } @@ -77,6 +81,7 @@ public class ClientTest { } @Test + @Ignore public void queryInstallationCheck() throws Exception { this.mvc.perform(post("/installQuery") .param("name", "&sampleQuery") @@ -87,6 +92,7 @@ public class ClientTest { } @Test + @Ignore public void queryUninstallationCheck() throws Exception { this.mvc.perform(post("/installQuery") .param("name", "&sampleQuery") |