[jboss-cvs] JBossAS SVN: r77663 - projects/cluster/ha-server-api/trunk/src/test/java/org/jboss/test/ha/framework/server.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2008-08-29 15:29:31 -0400 (Fri, 29 Aug 2008)
New Revision: 77663

Modified:
   projects/cluster/ha-server-api/trunk/src/test/java/org/jboss/test/ha/framework/server/HAServiceTestCase.java
Log:
Fixed assertions in test case to use JUnit's static methods.

Modified: projects/cluster/ha-server-api/trunk/src/test/java/org/jboss/test/ha/framework/server/HAServiceTestCase.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/test/java/org/jboss/test/ha/framework/server/HAServiceTestCase.java	2008-08-29 19:29:15 UTC (rev 77662)
+++ projects/cluster/ha-server-api/trunk/src/test/java/org/jboss/test/ha/framework/server/HAServiceTestCase.java	2008-08-29 19:29:31 UTC (rev 77663)
@@ -83,7 +83,7 @@
    {
       String key = this.service.getHAServiceKey();
       
-      assert key == SERVICE_HA_NAME;
+      assertSame(SERVICE_HA_NAME, key);
    }
    
    public void testStart() throws Exception
@@ -139,30 +139,30 @@
    {
       HAPartition partition = this.service.getHAPartition();
       
-      assert partition == this.partition;
+      assertSame(this.partition, partition);
       
       HAPartition partition2 = EasyMock.createMock(HAPartition.class);
       
       this.service.setHAPartition(partition2);
       
       partition = this.service.getHAPartition();
-      
-      assert partition == partition2;
+
+      assertSame(partition2, partition);
    }
    
    public void testHAServiceName()
    {
       String name = this.service.getServiceHAName();
       
-      assert name == SERVICE_HA_NAME : name;
+      assertSame(SERVICE_HA_NAME, name);
       
       final String newName = "new";
       
       this.service.setServiceHAName(newName);
       
       name = this.service.getServiceHAName();
-      
-      assert name == newName;
+
+      assertSame(newName, name);
    }
    
    public void testHandleEvent() throws Exception
@@ -183,13 +183,13 @@
    {
       boolean register = this.service.isRegisterThreadContextClassLoader();
       
-      assert !register;
+      assertFalse(register);
       
       this.service.setRegisterThreadContextClassLoader(true);
       
       register = this.service.isRegisterThreadContextClassLoader();
-      
-      assert register;
+
+      assertTrue(register);
    }
    
    @SuppressWarnings("unchecked")
@@ -210,7 +210,7 @@
       }
       catch (Exception e)
       {
-         assert false;
+         fail(e.toString());
       }
       
       EasyMock.replay(listener1, listener2);
@@ -230,7 +230,7 @@
       }
       catch (Exception e)
       {
-         assert false;
+         fail(e.toString());
       }
       
       EasyMock.replay(listener1, listener2);