Changeset 10 for simplerunner/src


Ignore:
Timestamp:
01/28/20 10:19:54 (5 years ago)
Author:
bart
Message:

Update 28 jan 2020

Location:
simplerunner/src
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • simplerunner/src/main/java/geniusweb/simplerunner/NegoRunner.java

    r9 r10  
    1414import geniusweb.protocol.NegoSettings;
    1515import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
    16 import geniusweb.protocol.session.SessionSettings;
    1716import tudelft.utilities.logging.ReportToLogger;
    1817import tudelft.utilities.logging.Reporter;
     
    7271                String serialized = new String(Files.readAllBytes(Paths.get(args[0])),
    7372                                StandardCharsets.UTF_8);
    74                 SessionSettings settings = jackson.readValue(serialized,
    75                                 SessionSettings.class);
     73                NegoSettings settings = jackson.readValue(serialized,
     74                                NegoSettings.class);
    7675
    7776                NegoRunner runner = new NegoRunner(settings,
  • simplerunner/src/test/java/geniusweb/simplerunner/SessionRunnerE2ETest.java

    r2 r10  
    1616import com.fasterxml.jackson.databind.ObjectMapper;
    1717
    18 import geniusweb.protocol.session.SessionSettings;
     18import geniusweb.protocol.NegoSettings;
    1919import tudelft.utilities.logging.ReportToLogger;
    2020import tudelft.utilities.logging.Reporter;
     
    3434        @Parameters
    3535        public static Collection<Object[]> data() {
    36                 return Arrays.asList(
    37                                 new Object[][] { { "src/test/resources/settings.json" }, { "src/test/resources/settings2.json" } });
     36                return Arrays
     37                                .asList(new Object[][] { { "src/test/resources/settings.json" },
     38                                                { "src/test/resources/settings2.json" },
     39                                                { "src/test/resources/shaoptoursettings.json" } });
    3840        }
    3941
     
    4446        @Before
    4547        public void before() throws IOException {
    46                 String serialized = new String(Files.readAllBytes(Paths.get(filename)), StandardCharsets.UTF_8);
    47                 SessionSettings settings = jackson.readValue(serialized, SessionSettings.class);
     48                System.out.println("Running from file " + filename);
     49                String serialized = new String(Files.readAllBytes(Paths.get(filename)),
     50                                StandardCharsets.UTF_8);
     51                NegoSettings settings = jackson.readValue(serialized,
     52                                NegoSettings.class);
    4853
    49                 runner = new NegoRunner(settings, new ClassPathConnectionFactory(), logger);
     54                runner = new NegoRunner(settings, new ClassPathConnectionFactory(),
     55                                logger);
    5056
    5157        }
Note: See TracChangeset for help on using the changeset viewer.