Changeset 1910


Ignore:
Timestamp:
03/11/15 16:26:00 (10 years ago)
Author:
pharms
Message:
  • update of service name map to also support client names specifying the receiver port only
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/eventcore/SOAPEventTypeTest.java

    r1906 r1910  
    112112        SOAPMessage dummyMessage = createDummySOAPMessage(); 
    113113        Properties properties = new Properties(); 
    114         properties.put("clientName.receiver.receiver", "replacedSender"); 
     114        properties.put("clientName.receiver.server.receiver", "replacedSender"); 
    115115         
    116116        SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties); 
    … …  
    127127        SOAPMessage dummyMessage = createDummySOAPMessage(); 
    128128        Properties properties = new Properties(); 
    129         properties.put("clientName.receiver.receiver:5678", "replacedSender"); 
     129        properties.put("clientName.receiver.server.receiver:5678", "replacedSender"); 
    130130         
    131131        SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties); 
    … …  
    142142        SOAPMessage dummyMessage = createDummySOAPMessage(); 
    143143        Properties properties = new Properties(); 
     144        properties.put("clientName.receiver.port.5678", "replacedSender"); 
     145         
     146        SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties); 
     147         
     148        assertEquals("replacedSender", fixture.getClientName()); 
     149    } 
     150 
     151    /** 
     152     *  
     153     */ 
     154    @Test 
     155    public void test_ClientName_08() throws Exception { 
     156        HttpExchange exchange = createDummyExchange(); 
     157        SOAPMessage dummyMessage = createDummySOAPMessage(); 
     158        Properties properties = new Properties(); 
    144159        properties.put("clientName.sender.othersender", "replacedSender"); 
    145160         
    … …  
    153168     */ 
    154169    @Test 
    155     public void test_ClientName_08() throws Exception { 
     170    public void test_ClientName_09() throws Exception { 
    156171        HttpExchange exchange = createDummyExchange(); 
    157172        SOAPMessage dummyMessage = createDummySOAPMessage(); 
    … …  
    168183     */ 
    169184    @Test 
    170     public void test_ClientName_09() throws Exception { 
    171         HttpExchange exchange = createDummyExchange(); 
    172         SOAPMessage dummyMessage = createDummySOAPMessage(); 
    173         Properties properties = new Properties(); 
    174         properties.put("clientName.receiver.otherreceiver", "replacedSender"); 
    175          
    176         SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties); 
    177          
    178         assertEquals("sender:1234", fixture.getClientName()); 
    179     } 
    180  
    181     /** 
    182      *  
    183      */ 
    184     @Test 
    185185    public void test_ClientName_10() throws Exception { 
    186186        HttpExchange exchange = createDummyExchange(); 
    187187        SOAPMessage dummyMessage = createDummySOAPMessage(); 
    188188        Properties properties = new Properties(); 
    189         properties.put("clientName.receiver.otherreceiver:5678", "replacedSender"); 
     189        properties.put("clientName.receiver.server.otherreceiver", "replacedSender"); 
     190         
     191        SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties); 
     192         
     193        assertEquals("sender:1234", fixture.getClientName()); 
     194    } 
     195 
     196    /** 
     197     *  
     198     */ 
     199    @Test 
     200    public void test_ClientName_11() throws Exception { 
     201        HttpExchange exchange = createDummyExchange(); 
     202        SOAPMessage dummyMessage = createDummySOAPMessage(); 
     203        Properties properties = new Properties(); 
     204        properties.put("clientName.receiver.server.otherreceiver:5678", "replacedSender"); 
     205         
     206        SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties); 
     207         
     208        assertEquals("sender:1234", fixture.getClientName()); 
     209    } 
     210 
     211    /** 
     212     *  
     213     */ 
     214    @Test 
     215    public void test_ClientName_12() throws Exception { 
     216        HttpExchange exchange = createDummyExchange(); 
     217        SOAPMessage dummyMessage = createDummySOAPMessage(); 
     218        Properties properties = new Properties(); 
     219        properties.put("clientName.receiver.port.5679", "replacedSender"); 
    190220         
    191221        SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties); 

  • trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SOAPEventType.java

    r1907 r1910  
    131131             
    132132            if (value == null) { 
    133                 key = "clientName.receiver." + exchange.getReceiver().getHost(); 
     133                key = "clientName.receiver.server." + exchange.getReceiver().getHost(); 
    134134                value = urlNameMap.getProperty(key); 
    135135            } 
    … …  
    137137            if (value == null) { 
    138138                key += ":" + exchange.getReceiver().getPort(); 
     139                value = urlNameMap.getProperty(key); 
     140            } 
     141             
     142            if (value == null) { 
     143                key = "clientName.receiver.port." + exchange.getReceiver().getPort(); 
    139144                value = urlNameMap.getProperty(key); 
    140145            } 
Note: See TracChangeset for help on using the changeset viewer.