Changeset 8 for src/test/java/geniusweb/partiesserver

Timestamp:

11/28/19 14:41:10 (5 years ago)

Author:

bart

Message:

Release 1.1.0

Location:

src/test/java/geniusweb/partiesserver

Files:

• AvailablePartiesUpdaterTest.java (modified) (4 diffs)
• JavaClientTest.java (modified) (3 diffs)
• repository/RunningPartyTest.java (modified) (5 diffs)
• websocket/PartySocketTest.java (modified) (2 diffs)

src/test/java/geniusweb/partiesserver/AvailablePartiesUpdaterTest.java

@@ -31 +31 @@
 
 public class AvailablePartiesUpdaterTest {
+        private static final String RANDOMPARTY = "target/jars/randomparty-1.1.0.jar";
         private static final int TESTRATE = 200; // check file changes every 200ms
         @SuppressWarnings("unchecked")
@@ -146 +147 @@
         public void randomPartyJarTest() throws IOException, InterruptedException {
                 init();
-                Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"),
-                                tmpdir.resolve(RNDPARTY));
+                Files.copy(Paths.get(RANDOMPARTY), tmpdir.resolve(RNDPARTY));
 
                 Thread.sleep(2 * TESTRATE);
@@ -157 +157 @@
         public void removeJarTest() throws IOException, InterruptedException {
                 init();
-                Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"), RNDPARTY);
+                Files.copy(Paths.get(RANDOMPARTY), RNDPARTY);
                 Thread.sleep(2 * TESTRATE);
                 assertEquals(1, repo.list().size());
@@ -169 +169 @@
         public void removeRootTest() throws IOException, InterruptedException {
                 init();
-                Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"), RNDPARTY);
+                Files.copy(Paths.get(RANDOMPARTY), RNDPARTY);
                 Thread.sleep(2 * TESTRATE);
                 assertEquals(1, repo.list().size());

src/test/java/geniusweb/partiesserver/JavaClientTest.java

@@ -39 +39 @@
  */
 public class JavaClientTest {
-//      private static final String JSON = "{\"jobs\":[\"jobs1\"]}";
+        private static final String RANDOMPARTY = "http://localhost:8080/partiesserver/run/randomparty-1.1.0";
+        // private static final String JSON = "{\"jobs\":[\"jobs1\"]}";
 //      private static final String JOBS1PROFILE = "{\"LinearAdditiveUtilitySpace\":{\"issueUtilities\":{\"lease car\":{\"discreteutils\":{\"valueUtilities\":{\"no\":0,\"yes\":1}}},\"permanent contract\":{\"discreteutils\":{\"valueUtilities\":{\"no\":0,\"yes\":1}}},\"career development opportunities\":{\"discreteutils\":{\"valueUtilities\":{\"high\":1,\"low\":0,\"medium\":0.5}}},\"fte\":{\"discreteutils\":{\"valueUtilities\":{\"1.0\":0.75,\"0.6\":0.25,\"0.8\":0.5}}},\"salary\":{\"discreteutils\":{\"valueUtilities\":{\"4000\":1.0,\"2500\":0.25,\"3500\":0.75,\"2000\":0,\"3000\":0.3}}},\"work from home\":{\"discreteutils\":{\"valueUtilities\":{\"1\":0.5,\"2\":0.666666666666,\"0\":0.333333333}}}},\"issueWeights\":{\"lease car\":0.06,\"permanent contract\":0.16,\"career development opportunities\":0.04,\"fte\":0.32,\"salary\":0.24,\"work from home\":0.18},\"domain\":{\"name\":\"jobs\",\"issuesValues\":{\"lease car\":{\"values\":[\"yes\",\"no\"]},\"permanent contract\":{\"values\":[\"yes\",\"no\"]},\"career development opportunities\":{\"values\":[\"low\",\"medium\",\"high\"]},\"fte\":{\"values\":[\"0.6\",\"0.8\",\"1.0\"]},\"salary\":{\"values\":[\"2000\",\"2500\",\"3000\",\"3500\",\"4000\"]},\"work from home\":{\"values\":[\"0\",\"1\",\"2\"]}}},\"name\":\"jobs1\"}}";
         private EmbeddedTomcat tomcat = new EmbeddedTomcat();
@@ -60 +61 @@
         public void after() throws Throwable {
                 Thread.sleep(2000);
+                System.setSecurityManager(null);
                 tomcat.stop();
         }
@@ -157 +159 @@
          */
         private String startParty() throws IOException, InterruptedException {
-                URL url = new URL(
-                                "http://localhost:8080/partiesserver/run/randomparty-1.0.0");
+                URL url = new URL(RANDOMPARTY);
                 HttpURLConnection conn = (HttpURLConnection) url.openConnection();
                 conn.setRequestMethod("GET");

src/test/java/geniusweb/partiesserver/repository/RunningPartyTest.java

@@ -16 +16 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import geniusweb.actions.Action;
 import geniusweb.actions.PartyId;
-import geniusweb.connection.DefaultConnection;
-import geniusweb.partiesserver.repository.AvailableParty;
-import geniusweb.partiesserver.repository.RunningParty;
+import geniusweb.partiesserver.websocket.PartySocket;
 import geniusweb.party.Capabilities;
 import geniusweb.party.DefaultParty;
@@ -90 +87 @@
                 RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
                                 null);
-                DefaultConnection<Inform, Action> connection = mock(
-                                DefaultConnection.class);
+                PartySocket connection = mock(PartySocket.class);
                 rparty = rparty.withConnection(connection);
         }
@@ -99 +95 @@
                 RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
                                 null);
-                DefaultConnection<Inform, Action> connection = mock(
-                                DefaultConnection.class);
+                PartySocket connection = mock(PartySocket.class);
                 rparty = rparty.withConnection(connection);
                 rparty = rparty.withConnection(connection);
@@ -112 +107 @@
                 RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
                                 null);
-                DefaultConnection<Inform, Action> connection = mock(
-                                DefaultConnection.class);
+                PartySocket connection = mock(PartySocket.class);
                 rparty = rparty.withConnection(connection);
 
@@ -120 +114 @@
 
                 ArgumentCaptor<Inform> argument = ArgumentCaptor.forClass(Inform.class);
-                verify(connection, times(1)).notifyChange(argument.capture());
+                verify(connection, times(1)).notifyListeners(argument.capture());
                 assertEquals(info, argument.getValue());
         }

src/test/java/geniusweb/partiesserver/websocket/PartySocketTest.java

@@ -23 +23 @@
 import geniusweb.actions.EndNegotiation;
 import geniusweb.actions.PartyId;
-import geniusweb.connection.Connection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.partiesserver.repository.RunningPartiesRepo;
 import geniusweb.partiesserver.repository.RunningParty;
-import geniusweb.partiesserver.websocket.PartySocket;
 import geniusweb.party.Party;
 import geniusweb.party.inform.Inform;
@@ -83 +82 @@
 
                 @SuppressWarnings("unchecked")
-                Connection<Inform, Action> connection = mock(Connection.class);
+                ConnectionEnd<Inform, Action> connection = mock(ConnectionEnd.class);
                 /*
                  * we must call runningparty directly on this one because