Changeset 18 for simplerunner/src

Timestamp:

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

Author:

bart

Message:

Update to version 1.41

Location:

simplerunner/src

Files:

• main/java/geniusweb/simplerunner/NegoRunner.java (modified) (6 diffs)
• test/java/geniusweb/simplerunner/SessionRunnerTest.java (modified) (6 diffs)
• test/resources/settings2.json (modified) (1 diff)
• test/resources/shaoptoursettings.json (modified) (1 diff)

simplerunner/src/main/java/geniusweb/simplerunner/NegoRunner.java

@@ -7 +7 @@
 import java.util.logging.Level;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -13 +14 @@
 import geniusweb.protocol.NegoProtocol;
 import geniusweb.protocol.NegoSettings;
+import geniusweb.protocol.NegoState;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
-import tudelft.utilities.logging.ReportToLogger;
 import tudelft.utilities.logging.Reporter;
 
@@ -27 +28 @@
         private final NegoProtocol protocol;
         private final ProtocolToPartyConnFactory connectionfactory;
-        private final Reporter log;
+        protected final Reporter log;
         private final static ObjectMapper jackson = new ObjectMapper();
 
@@ -55 +56 @@
 
         protected void stop() {
-                if (protocol.getState().getError() != null) {
-                        log.log(Level.WARNING, "protocol terminated abnormally",
-                                        protocol.getState().getError());
-                } else {
-                        log.log(Level.INFO,
-                                        "protocol ended normally: " + protocol.getState());
+                Level level = protocol.getState().getError() == null ? Level.INFO
+                                : Level.WARNING;
+                logFinal(level, protocol.getState());
+        }
+
+        /**
+         * Separate so that we can intercept this when mocking, as this will crash
+         * on mocks
+         * 
+         * @param level
+         * @param state
+         */
+        protected void logFinal(Level level, NegoState state) {
+                try {
+                        log.log(level, "protocol ended normally: "
+                                        + jackson.writeValueAsString(protocol.getState()));
+                } catch (JsonProcessingException e) {
+                        e.printStackTrace();
                 }
         }
@@ -75 +88 @@
 
                 NegoRunner runner = new NegoRunner(settings,
-                                new ClassPathConnectionFactory(),
-                                new ReportToLogger("sessionrunner"));
+                                new ClassPathConnectionFactory(), new StdOutReporter());
                 runner.run();
         }
@@ -90 +102 @@
         }
 }
+
+class StdOutReporter implements Reporter {
+
+        @Override
+        public void log(Level arg0, String arg1) {
+                System.out.println(arg0 + ":" + arg1);
+        }
+
+        @Override
+        public void log(Level arg0, String arg1, Throwable arg2) {
+                System.out.println(arg0 + ">" + arg1);
+        }
+
+}

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));
         }
 

simplerunner/src/test/resources/settings2.json

@@ -13 +13 @@
                         }
                 }
+                
         }
 }

simplerunner/src/test/resources/shaoptoursettings.json

@@ -59 +59 @@
                                 }
                         }
-                }
+                },
+                "numberTournaments":1
         }
 }