[jboss-cvs] JBossAS SVN: r91405 - trunk/testsuite/src/main/org/jboss/test/profileservice/test.

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

Author: bstansberry at jboss.com
Date: 2009-07-18 18:51:22 -0400 (Sat, 18 Jul 2009)
New Revision: 91405

Modified:
   trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServiceBindingManagedObjectsTestCase.java
Log:
[JBAS-7055] Ignore data from the override test

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServiceBindingManagedObjectsTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServiceBindingManagedObjectsTestCase.java	2009-07-18 22:33:43 UTC (rev 91404)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServiceBindingManagedObjectsTestCase.java	2009-07-18 22:51:22 UTC (rev 91405)
@@ -299,28 +299,34 @@
       String name = (String) simpleVal;
       
       val =  bindingSet.get("defaultHostName");
-      assertNotNull("property defaultHostName has no value", val);
-      assertEquals("type of defaultHostName value isn't String", String.class.getName(), val.getMetaType().getClassName());
-      assertTrue("property defaultHostName value is SimpleValue", val instanceof SimpleValue);
-      assertEquals(InetAddress.getByName(getServerHost()), InetAddress.getByName((String) ((SimpleValue) val).getValue()));
-      
+      assertNotNull(name + " -- property defaultHostName has no value", val);
+      assertEquals(name + " -- type of defaultHostName value isn't String", String.class.getName(), val.getMetaType().getClassName());
+      assertTrue(name + " -- property defaultHostName value is SimpleValue", val instanceof SimpleValue);
+      // Only do further validation of the binding sets that the AS normally ships; 
+      // ignore any earlier ones that other tests may have added since we don't
+      // know the correct assertions
+      if ("ports-default".equals(name) || "ports-01".equals(name) || "ports-02".equals(name) || "ports-03".equals(name))
+      { 
+         assertEquals(name + " -- correct defaultHostName value", InetAddress.getByName(getServerHost()), InetAddress.getByName((String) ((SimpleValue) val).getValue()));
+      }
+         
       val =  bindingSet.get("portOffset");
-      assertNotNull("property portOffset has no value", val);
-      assertTrue("property portOffset value is SimpleValue", val instanceof SimpleValue);
+      assertNotNull(name + " -- property portOffset has no value", val);
+      assertTrue(name + " -- property portOffset value is SimpleValue", val instanceof SimpleValue);
       simpleVal = ((SimpleValue) val).getValue();
       assertTrue(simpleVal instanceof Integer);
       assertTrue(((Integer) simpleVal).intValue() > -1);
       offsets.put(name, (Integer) simpleVal);
       
       val =  bindingSet.get("overrideBindings");
-      assertNotNull("property overrideBindings has no value", val);
-      assertTrue("property overrideBindings value is CollectionValue", val instanceof CollectionValue);
+      assertNotNull(name + " -- property overrideBindings has no value", val);
+      assertTrue(name + " -- property overrideBindings value is CollectionValue", val instanceof CollectionValue);
       MetaValue[] elements = ((CollectionValue) val).getElements();
       getLog().info(elements);
       for (MetaValue element : elements)
       {
          serviceBindingMetadataTest(element);
-      }
+      } 
       
    }