Changeset 18 for simplerunner/src/test/java

Timestamp:

06/11/20 16:34:40 (4 years ago)

Author:

bart

Message:

Update to version 1.41

File:

• simplerunner/src/test/java/geniusweb/simplerunner/SessionRunnerTest.java (modified) (6 diffs)

simplerunner/src/test/java/geniusweb/simplerunner/SessionRunnerTest.java

@@ -17 +17 @@
 
 import geniusweb.protocol.CurrentNegoState;
+import geniusweb.protocol.NegoState;
 import geniusweb.protocol.ProtocolException;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
@@ -22 +23 @@
 import geniusweb.protocol.session.SessionSettings;
 import geniusweb.protocol.session.SessionState;
-import geniusweb.simplerunner.NegoRunner;
 import tudelft.utilities.listener.Listener;
 import tudelft.utilities.logging.ReportToLogger;
@@ -59 +59 @@
                                 ProtocolToPartyConnFactory.class);
 
-                NegoRunner runner = spy(
-                                new NegoRunner(settings, factory, logger));
+                NegoRunner runner = spy(new NegoRunner(settings, factory, logger));
                 runner.run();
 
@@ -82 +81 @@
                 ProtocolToPartyConnFactory factory = mock(
                                 ProtocolToPartyConnFactory.class);
-                NegoRunner runner = spy(
-                                new NegoRunner(settings, factory, logger));
+                NegoRunner runner = spy(new NegoRunner(settings, factory, logger) {
+                        @Override
+                        protected void logFinal(Level level, NegoState state) {
+                                log.log(level, state.toString());
+                        }
+                });
                 ArgumentCaptor<Listener> listener = ArgumentCaptor
                                 .forClass(Listener.class);
@@ -109 +112 @@
                 ProtocolToPartyConnFactory factory = mock(
                                 ProtocolToPartyConnFactory.class);
-                NegoRunner runner = spy(
-                                new NegoRunner(settings, factory, logger));
+                NegoRunner runner = spy(new NegoRunner(settings, factory, logger) {
+                        @Override
+                        protected void logFinal(Level level, NegoState state) {
+                                log.log(level, state.toString());
+                        }
+                });
                 ArgumentCaptor<Listener> listener = ArgumentCaptor
                                 .forClass(Listener.class);
@@ -120 +127 @@
                 verify(runner, times(1)).stop();
                 // check that the protocol error is logged properly
-                verify(logger, times(1)).log(eq(Level.WARNING), any(String.class),
-                                eq(PROTOCOL_EXC));
+                verify(logger, times(1)).log(eq(Level.WARNING), any(String.class));
         }