Changeset 10 for simplerunner

Timestamp:

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

Author:

bart

Message:

Update 28 jan 2020

Location:

simplerunner

Files:

• pom.xml (modified) (1 diff)
• src/main/java/geniusweb/simplerunner/NegoRunner.java (modified) (2 diffs)
• src/test/java/geniusweb/simplerunner/SessionRunnerE2ETest.java (modified) (3 diffs)
• src/test/resources/shaoptoursettings.json (added)

simplerunner/pom.xml

@@ -42 +42 @@
                         <artifactId>randomparty</artifactId>
                         <version>1.1.0</version>
+                        <scope>test</scope>
+                </dependency>
+                <dependency>
+                        <groupId>geniusweb.exampleparties</groupId>
+                        <artifactId>comparebids</artifactId>
+                        <version>1.0.0</version>
+                        <scope>test</scope>
+                </dependency>
+                <dependency>
+                        <groupId>geniusweb.exampleparties</groupId>
+                        <artifactId>simpleshaop</artifactId>
+                        <version>1.0.0</version>
                         <scope>test</scope>
                 </dependency>

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

@@ -14 +14 @@
 import geniusweb.protocol.NegoSettings;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
-import geniusweb.protocol.session.SessionSettings;
 import tudelft.utilities.logging.ReportToLogger;
 import tudelft.utilities.logging.Reporter;
@@ -72 +71 @@
                 String serialized = new String(Files.readAllBytes(Paths.get(args[0])),
                                 StandardCharsets.UTF_8);
-                SessionSettings settings = jackson.readValue(serialized,
-                                SessionSettings.class);
+                NegoSettings settings = jackson.readValue(serialized,
+                                NegoSettings.class);
 
                 NegoRunner runner = new NegoRunner(settings,

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

@@ -16 +16 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import geniusweb.protocol.session.SessionSettings;
+import geniusweb.protocol.NegoSettings;
 import tudelft.utilities.logging.ReportToLogger;
 import tudelft.utilities.logging.Reporter;
@@ -34 +34 @@
         @Parameters
         public static Collection<Object[]> data() {
-                return Arrays.asList(
-                                new Object[][] { { "src/test/resources/settings.json" }, { "src/test/resources/settings2.json" } });
+                return Arrays
+                                .asList(new Object[][] { { "src/test/resources/settings.json" },
+                                                { "src/test/resources/settings2.json" },
+                                                { "src/test/resources/shaoptoursettings.json" } });
         }
 
@@ -44 +46 @@
         @Before
         public void before() throws IOException {
-                String serialized = new String(Files.readAllBytes(Paths.get(filename)), StandardCharsets.UTF_8);
-                SessionSettings settings = jackson.readValue(serialized, SessionSettings.class);
+                System.out.println("Running from file " + filename);
+                String serialized = new String(Files.readAllBytes(Paths.get(filename)),
+                                StandardCharsets.UTF_8);
+                NegoSettings settings = jackson.readValue(serialized,
+                                NegoSettings.class);
 
-                runner = new NegoRunner(settings, new ClassPathConnectionFactory(), logger);
+                runner = new NegoRunner(settings, new ClassPathConnectionFactory(),
+                                logger);
 
         }