Changeset 2 for simplerunner

Timestamp:

08/28/19 11:35:52 (5 years ago)

Author:

bart

Message:

Added new parties : linear, hardliner, conceder, boulware

Location:

simplerunner/src/test

Files:

• java/geniusweb/simplerunner/SessionRunnerE2ETest.java (modified) (3 diffs)
• resources/jobs/jobs1partial.json (added)
• resources/settings2.json (added)

simplerunner/src/test/java/geniusweb/simplerunner/SessionRunnerE2ETest.java

@@ -5 +5 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collection;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import geniusweb.protocol.session.SessionSettings;
-import geniusweb.simplerunner.ClassPathConnectionFactory;
-import geniusweb.simplerunner.NegoRunner;
 import tudelft.utilities.logging.ReportToLogger;
 import tudelft.utilities.logging.Reporter;
@@ -22 +25 @@
  * this module.
  */
+@RunWith(Parameterized.class)
 public class SessionRunnerE2ETest {
-        private static final String SESSION_SETTINGS = "src/test/resources/settings.json";
         private final ObjectMapper jackson = new ObjectMapper();
         private NegoRunner runner;
         private Reporter logger = new ReportToLogger("test");
+        private String filename;
+
+        @Parameters
+        public static Collection<Object[]> data() {
+                return Arrays.asList(
+                                new Object[][] { { "src/test/resources/settings.json" }, { "src/test/resources/settings2.json" } });
+        }
+
+        public SessionRunnerE2ETest(String file) {
+                this.filename = file;
+        }
 
         @Before
         public void before() throws IOException {
-                String serialized = new String(
-                                Files.readAllBytes(Paths.get(SESSION_SETTINGS)),
-                                StandardCharsets.UTF_8);
-                SessionSettings settings = jackson.readValue(serialized,
-                                SessionSettings.class);
+                String serialized = new String(Files.readAllBytes(Paths.get(filename)), StandardCharsets.UTF_8);
+                SessionSettings settings = jackson.readValue(serialized, SessionSettings.class);
 
-                runner = new NegoRunner(settings, new ClassPathConnectionFactory(),
-                                logger);
+                runner = new NegoRunner(settings, new ClassPathConnectionFactory(), logger);
 
         }
@@ -52 +62 @@
         @Test
         public void runTestMainFunction() throws IOException {
-                NegoRunner.main(new String[] { SESSION_SETTINGS });
+                NegoRunner.main(new String[] { filename });
         }
 }