svn commit: r640921 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java

[dkulp]

Author: dkulp
Date: Tue Mar 25 11:09:34 2008
New Revision: 640921

URL: http://svn.apache.org/viewvc?rev=640921&view=rev
Log:
Merged revisions 640394 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r640394 | bharath | 2008-03-24 08:11:01 -0400 (Mon, 24 Mar 2008) | 3 lines
  
  Changes to test after fixing [JIRA  CXF-1487]
  http://www.nabble.com/WS-RM-BaseRetransmissionInterval-td13383409.html#a133834
  While merging RM policy assertions no min/max logic has to be applied.
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java?rev=640921&r1=640920&r2=640921&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
 Tue Mar 25 11:09:34 2008
@@ -100,7 +100,7 @@
         
         c = PolicyUtils.intersect(a, b);
         assertEquals(7200000L, 
c.getInactivityTimeout().getMilliseconds().longValue());
-        assertEquals(10000L, 
c.getBaseRetransmissionInterval().getMilliseconds().longValue());
+        assertEquals(20000L, 
c.getBaseRetransmissionInterval().getMilliseconds().longValue());
         assertNull(c.getAcknowledgementInterval());
         assertNull(c.getExponentialBackoff());
        
@@ -110,14 +110,14 @@
         
         c = PolicyUtils.intersect(a, b);
         assertEquals(7200000L, 
c.getInactivityTimeout().getMilliseconds().longValue());
-        assertEquals(10000L, 
c.getBaseRetransmissionInterval().getMilliseconds().longValue());
+        assertEquals(20000L, 
c.getBaseRetransmissionInterval().getMilliseconds().longValue());
         assertEquals(2000L, 
c.getAcknowledgementInterval().getMilliseconds().longValue());
         assertNull(c.getExponentialBackoff());
         
         b.setExponentialBackoff(new RMAssertion.ExponentialBackoff());
         c = PolicyUtils.intersect(a, b);
         assertEquals(7200000L, 
c.getInactivityTimeout().getMilliseconds().longValue());
-        assertEquals(10000L, 
c.getBaseRetransmissionInterval().getMilliseconds().longValue());
+        assertEquals(20000L, 
c.getBaseRetransmissionInterval().getMilliseconds().longValue());
         assertEquals(2000L, 
c.getAcknowledgementInterval().getMilliseconds().longValue());
         assertNotNull(c.getExponentialBackoff());    
     }