Changeset 10 for protocol/src/test/java/geniusweb/protocol/session/saop/SAOPStateTest.java

Timestamp:

01/28/20 10:19:54 (4 years ago)

Author:

bart

Message:

Update 28 jan 2020

File:

• protocol/src/test/java/geniusweb/protocol/session/saop/SAOPStateTest.java (modified) (6 diffs)

protocol/src/test/java/geniusweb/protocol/session/saop/SAOPStateTest.java

@@ -27 +27 @@
 import geniusweb.progress.ProgressTime;
 import geniusweb.protocol.ProtocolException;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
-import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.session.SessionSettings;
 import tudelft.utilities.junit.GeneralTests;
@@ -220 +220 @@
         }
 
-        @Test
+        @Test(expected = IllegalArgumentException.class)
         public void withWrongActionTest() {
                 // wrong because action has actor null which does not match party1
                 SAOPState state = state1.with(party1, action);
-                assertEquals(1, state.getActions().size());
-                assertEquals(action, state.getActions().get(0));
-                assertTrue(state.isFinal(NOW));
-                assertEquals(
-                                "geniusweb.protocol.ProtocolException: party1:act contains wrong credentials: act1",
-                                state.getError().toString());
-        }
-
-        @Test
+//              assertEquals(1, state.getActions().size());
+//              assertEquals(action, state.getActions().get(0));
+//              assertTrue(state.isFinal(NOW));
+        }
+
+        @Test(expected = IllegalArgumentException.class)
         public void withActionTest() {
                 when(action.getActor()).thenReturn(party1);
-                SAOPState state = state1.with(party1, action);
-                assertEquals(1, state.getActions().size());
-                assertEquals(action, state.getActions().get(0));
+                state1.with(party1, action);
         }
 
@@ -265 +260 @@
         }
 
-        @Test
+        @Test(expected = IllegalArgumentException.class)
         public void RefuseImmediateAccept() {
                 Accept nullaccept = new Accept(party1, null);
                 SAOPState state = state1.with(party1, nullaccept);
-                assertTrue(state.isFinal(NOW));
-                assertEquals(
-                                "geniusweb.protocol.ProtocolException: party1:Accept without a recent offer",
-                                state.getError().toString());
-        }
-
-        @Test
+        }
+
+        @Test(expected = IllegalArgumentException.class)
         public void RefuseNotMyTurn() {
                 List<Action> actions = Arrays.asList(offer1);
@@ -281 +272 @@
                                 settings, null, null);
 
-                state = state.with(party1, offer1);
-                assertTrue(state.isFinal(NOW));
-                assertEquals(
-                                "geniusweb.protocol.ProtocolException: party1:Party does not have the turn ",
-                                state.getError().toString());
-        }
-
-        @Test
+                state.with(party1, offer1);
+//              assertTrue(state.isFinal(NOW));
+//              assertEquals(
+//                              "geniusweb.protocol.ProtocolException: party1:Party does not have the turn ",
+//                              state.getError().toString());
+        }
+
+        @Test(expected = IllegalArgumentException.class)
         public void RefuseNullAccept() {
                 List<Action> actions = Arrays.asList(offer1);
@@ -297 +288 @@
                 state = state.with(party2, nullaccept);
                 assertTrue(state.isFinal(NOW));
-                assertTrue(state.getError().toString().matches(
-                                ".*party2.*Party accepts a bid differing from the last offer.*"));
-        }
-
-        @Test
+        }
+
+        @Test(expected = IllegalArgumentException.class)
         public void RefuseNullAction() {
                 List<Action> actions = Arrays.asList(offer1);
@@ -308 +297 @@
 
                 state = state.with(party2, null);
-                assertEquals(
-                                "geniusweb.protocol.ProtocolException: party2:action is null",
-                                state.getError().toString());
         }