You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/11/16 18:00:39 UTC

svn commit: r1410472 - /cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java

Author: dkulp
Date: Fri Nov 16 17:00:38 2012
New Revision: 1410472

URL: http://svn.apache.org/viewvc?rev=1410472&view=rev
Log:
Merged revisions 1410440 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1410440 | dkulp | 2012-11-16 11:32:09 -0500 (Fri, 16 Nov 2012) | 2 lines

  Fix potential test failure if bus.hashCode() < 0

........

Modified:
    cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java

Modified: cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java?rev=1410472&r1=1410471&r2=1410472&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java (original)
+++ cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java Fri Nov 16 17:00:38 2012
@@ -94,9 +94,9 @@ public class CXFBusImplTest extends Asse
     public void testBusID() {
         CXFBusImpl bus = new CXFBusImpl();
         String id = bus.getId();
-        assertEquals("The bus id should be cxf", id, Bus.DEFAULT_BUS_ID + bus.hashCode());
+        assertEquals("The bus id should be cxf", id, Bus.DEFAULT_BUS_ID + Math.abs(bus.hashCode()));
         bus.setId("test");
-        assertEquals("The bus id should be changed", bus.getId(), "test");
+        assertEquals("The bus id should be changed", "test", bus.getId());
     }
     
     @Test