From 4548be307689af35faf52535835b1990a2a59276 Mon Sep 17 00:00:00 2001 From: Ivan Olexyn Date: Tue, 21 Apr 2020 00:50:56 +0200 Subject: [PATCH] ~ remove sleep. --- mispmock/src/actor/AppMock.java | 5 ----- mispmock/src/actor/UserMock.java | 18 ++++++++++++++++-- mispmock/src/core/BridgeMock.java | 4 +--- mispmock/src/core/Main.java | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/mispmock/src/actor/AppMock.java b/mispmock/src/actor/AppMock.java index 6abaa10..2a76b3e 100644 --- a/mispmock/src/actor/AppMock.java +++ b/mispmock/src/actor/AppMock.java @@ -23,12 +23,7 @@ public class AppMock extends ActorRunnable { @Override public void run() { while (true) { - try { - Thread.sleep(Main.WAIT_SPEED); - } catch (InterruptedException e) { - e.printStackTrace(); - } } } diff --git a/mispmock/src/actor/UserMock.java b/mispmock/src/actor/UserMock.java index 93c5f54..757545f 100644 --- a/mispmock/src/actor/UserMock.java +++ b/mispmock/src/actor/UserMock.java @@ -9,18 +9,30 @@ import exchange.ExchangeMock; public class UserMock extends ActorRunnable { + + + final String longRequest; + int requestCount = 0; public UserMock(MockSet mockSet){ super(mockSet); mockSet.userMock = this; + + + StringBuilder sb = new StringBuilder(); + for (int i=0;i<100;i++){ + sb.append("foo"); + } + longRequest = sb.toString(); + + } @Override public void run() { while (true){ try { - Thread.sleep(Main.WAIT_SPEED); sendGetRequest(); } catch (IOException | InterruptedException e) { e.printStackTrace(); @@ -52,6 +64,8 @@ public class UserMock extends ActorRunnable { exchange.request.setMethod("GET"); //exchange.request.setContentType("application/json"); + + //String requestBody = longRequest+"-"+(++requestCount); String requestBody = "REQUEST-"+(++requestCount); String jsonString = "{\"request\":\""+requestBody+ "\"}"; exchange.request.setContent(jsonString.getBytes()); @@ -64,7 +78,7 @@ public class UserMock extends ActorRunnable { // handle OK (Data) String data = exchange.response.getContentAsString(); - System.out.println(data + " of REQUEST-"+requestCount); + System.out.println(data + " of "+requestBody); exchange.notify(); } } diff --git a/mispmock/src/core/BridgeMock.java b/mispmock/src/core/BridgeMock.java index 5207f03..74ce8c3 100644 --- a/mispmock/src/core/BridgeMock.java +++ b/mispmock/src/core/BridgeMock.java @@ -40,7 +40,6 @@ public class BridgeMock extends BridgeServlet { while (available.size() < 1) { available.notify(); - Thread.sleep(Main.WAIT_SPEED); available.wait(); } // ride exists only locally, thus safe @@ -64,7 +63,6 @@ public class BridgeMock extends BridgeServlet { while (!loaded.containsKey(ride.getID())) { loaded.notify(); - Thread.sleep(Main.WAIT_SPEED); loaded.wait(); } @@ -145,7 +143,7 @@ public class BridgeMock extends BridgeServlet { // ID is final/threadsafe while(!(booked.containsKey(ride.getID()))){ - Thread.sleep(Main.WAIT_SPEED); + } synchronized (booked) { diff --git a/mispmock/src/core/Main.java b/mispmock/src/core/Main.java index 2d5dab7..9f1a47d 100644 --- a/mispmock/src/core/Main.java +++ b/mispmock/src/core/Main.java @@ -5,7 +5,7 @@ import actor.UserMock; public class Main { - final public static int WAIT_SPEED = 0; +