Changeset 9 for src/test


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

Update 28 jan 2020

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/test/java/geniusweb/partiesserver/websocket/GeneralPartyInfoTest.java

    r1 r9  
    1818import geniusweb.partiesserver.repository.GeneralPartyInfo;
    1919import geniusweb.party.Capabilities;
    20 import geniusweb.references.ProtocolRef;
    2120import tudelft.utilities.junit.GeneralTests;
    2221
     
    2524        private URI iri1;
    2625        private URI iri2;
    27         private HashSet protocols1;
    28         private HashSet protocols2;
     26        private HashSet<String> protocols1;
     27        private HashSet<String> protocols2;
    2928        private Capabilities caps1;
    3029        private Capabilities caps2;
     
    3635        private GeneralPartyInfo info3;
    3736        private GeneralPartyInfo info4;
    38         private String text1 = "GeneralPartyInfo.*iri1,Capabilities.*Protocols=.*ProtocolRef.*protocol1.*,description 1.*";
    39         private String text2 = "GeneralPartyInfo.*iri2,Capabilities.*Protocols=.*ProtocolRef.*protocol1.*,description 1.*";
    40         private String text3 = "GeneralPartyInfo.*iri1,Capabilities.*Protocols=.*ProtocolRef.*protocol2.*,description 1.*";
    41         private String text4 = "GeneralPartyInfo.*iri1,Capabilities.*Protocols=.*ProtocolRef.*protocol1.*,description 2.*";
     37        private String text1 = "GeneralPartyInfo.*iri1,Capabilities.*Behaviours=.*SAOP.*description 1.*";
     38        private String text2 = "GeneralPartyInfo.*iri2,Capabilities.*Behaviours=.*SAOP.*,description 1.*";
     39        private String text3 = "GeneralPartyInfo.*iri1,Capabilities.*Behaviours=.*SEB.*,description 1.*";
     40        private String text4 = "GeneralPartyInfo.*iri1,Capabilities.*Behaviours=.*SAOP.*,description 2.*";
    4241
    4342        private final ObjectMapper jackson = new ObjectMapper();
    44         private String serialized = "{\"uri\":\"http://iri1\",\"capabilities\":{\"protocols\":[\"http://protocol1\"]},\"description\":\"description 1\"}";
     43        private String serialized = "{\"uri\":\"http://iri1\",\"capabilities\":{\"behaviours\":[\"SAOP\"]},\"description\":\"description 1\"}";
    4544
    4645        @Before
     
    4847                iri1 = new URI("http://iri1");
    4948                iri2 = new URI("http://iri2");
    50                 protocols1 = new HashSet<>(
    51                                 Arrays.asList(new ProtocolRef("http://protocol1")));
    52                 protocols2 = new HashSet<>(
    53                                 Arrays.asList(new ProtocolRef("http://protocol2")));
     49                protocols1 = new HashSet<>(Arrays.asList("SAOP"));
     50                protocols2 = new HashSet<>(Arrays.asList("SEB"));
    5451                caps1 = new Capabilities(protocols1);
    5552                caps2 = new Capabilities(protocols2);
Note: See TracChangeset for help on using the changeset viewer.