Changeset 8 for src/test


Ignore:
Timestamp:
11/28/19 14:41:10 (5 years ago)
Author:
bart
Message:

Release 1.1.0

Location:
src/test/java/geniusweb/partiesserver
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r1 r8  
    3131
    3232public class AvailablePartiesUpdaterTest {
     33        private static final String RANDOMPARTY = "target/jars/randomparty-1.1.0.jar";
    3334        private static final int TESTRATE = 200; // check file changes every 200ms
    3435        @SuppressWarnings("unchecked")
    … …  
    146147        public void randomPartyJarTest() throws IOException, InterruptedException {
    147148                init();
    148                 Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"),
    149                                 tmpdir.resolve(RNDPARTY));
     149                Files.copy(Paths.get(RANDOMPARTY), tmpdir.resolve(RNDPARTY));
    150150
    151151                Thread.sleep(2 * TESTRATE);
    … …  
    157157        public void removeJarTest() throws IOException, InterruptedException {
    158158                init();
    159                 Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"), RNDPARTY);
     159                Files.copy(Paths.get(RANDOMPARTY), RNDPARTY);
    160160                Thread.sleep(2 * TESTRATE);
    161161                assertEquals(1, repo.list().size());
    … …  
    169169        public void removeRootTest() throws IOException, InterruptedException {
    170170                init();
    171                 Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"), RNDPARTY);
     171                Files.copy(Paths.get(RANDOMPARTY), RNDPARTY);
    172172                Thread.sleep(2 * TESTRATE);
    173173                assertEquals(1, repo.list().size());

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

    r7 r8  
    3939 */
    4040public class JavaClientTest {
    41 //      private static final String JSON = "{\"jobs\":[\"jobs1\"]}";
     41        private static final String RANDOMPARTY = "http://localhost:8080/partiesserver/run/randomparty-1.1.0";
     42        // private static final String JSON = "{\"jobs\":[\"jobs1\"]}";
    4243//      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\"}}";
    4344        private EmbeddedTomcat tomcat = new EmbeddedTomcat();
    … …  
    6061        public void after() throws Throwable {
    6162                Thread.sleep(2000);
     63                System.setSecurityManager(null);
    6264                tomcat.stop();
    6365        }
    … …  
    157159         */
    158160        private String startParty() throws IOException, InterruptedException {
    159                 URL url = new URL(
    160                                 "http://localhost:8080/partiesserver/run/randomparty-1.0.0");
     161                URL url = new URL(RANDOMPARTY);
    161162                HttpURLConnection conn = (HttpURLConnection) url.openConnection();
    162163                conn.setRequestMethod("GET");

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

    r1 r8  
    1616import com.fasterxml.jackson.databind.ObjectMapper;
    1717
    18 import geniusweb.actions.Action;
    1918import geniusweb.actions.PartyId;
    20 import geniusweb.connection.DefaultConnection;
    21 import geniusweb.partiesserver.repository.AvailableParty;
    22 import geniusweb.partiesserver.repository.RunningParty;
     19import geniusweb.partiesserver.websocket.PartySocket;
    2320import geniusweb.party.Capabilities;
    2421import geniusweb.party.DefaultParty;
    … …  
    9087                RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
    9188                                null);
    92                 DefaultConnection<Inform, Action> connection = mock(
    93                                 DefaultConnection.class);
     89                PartySocket connection = mock(PartySocket.class);
    9490                rparty = rparty.withConnection(connection);
    9591        }
    … …  
    9995                RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
    10096                                null);
    101                 DefaultConnection<Inform, Action> connection = mock(
    102                                 DefaultConnection.class);
     97                PartySocket connection = mock(PartySocket.class);
    10398                rparty = rparty.withConnection(connection);
    10499                rparty = rparty.withConnection(connection);
    … …  
    112107                RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
    113108                                null);
    114                 DefaultConnection<Inform, Action> connection = mock(
    115                                 DefaultConnection.class);
     109                PartySocket connection = mock(PartySocket.class);
    116110                rparty = rparty.withConnection(connection);
    117111
    … …  
    120114
    121115                ArgumentCaptor<Inform> argument = ArgumentCaptor.forClass(Inform.class);
    122                 verify(connection, times(1)).notifyChange(argument.capture());
     116                verify(connection, times(1)).notifyListeners(argument.capture());
    123117                assertEquals(info, argument.getValue());
    124118        }

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

    r1 r8  
    2323import geniusweb.actions.EndNegotiation;
    2424import geniusweb.actions.PartyId;
    25 import geniusweb.connection.Connection;
     25import geniusweb.connection.ConnectionEnd;
    2626import geniusweb.partiesserver.repository.RunningPartiesRepo;
    2727import geniusweb.partiesserver.repository.RunningParty;
    28 import geniusweb.partiesserver.websocket.PartySocket;
    2928import geniusweb.party.Party;
    3029import geniusweb.party.inform.Inform;
    … …  
    8382
    8483                @SuppressWarnings("unchecked")
    85                 Connection<Inform, Action> connection = mock(Connection.class);
     84                ConnectionEnd<Inform, Action> connection = mock(ConnectionEnd.class);
    8685                /*
    8786                 * we must call runningparty directly on this one because
Note: See TracChangeset for help on using the changeset viewer.