[jboss-cvs] JBossAS SVN: r106669 - in projects/service-binding/trunk/core/src: test/java/org/jboss/test/services/binding/test and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2010-07-13 23:34:56 -0400 (Tue, 13 Jul 2010)
New Revision: 106669

Modified:
   projects/service-binding/trunk/core/src/main/java/org/jboss/services/binding/ServiceBindingMetadata.java
   projects/service-binding/trunk/core/src/test/java/org/jboss/test/services/binding/test/ServiceBindingMetadataUnitTestCase.java
   projects/service-binding/trunk/core/src/test/java/org/jboss/test/services/binding/test/ServiceBindingUnitTestCase.java
Log:
[SVCBIND-3] Set fixedHostName to true when hostName is set

Modified: projects/service-binding/trunk/core/src/main/java/org/jboss/services/binding/ServiceBindingMetadata.java
===================================================================
--- projects/service-binding/trunk/core/src/main/java/org/jboss/services/binding/ServiceBindingMetadata.java	2010-07-14 03:20:42 UTC (rev 106668)
+++ projects/service-binding/trunk/core/src/main/java/org/jboss/services/binding/ServiceBindingMetadata.java	2010-07-14 03:34:56 UTC (rev 106669)
@@ -333,7 +333,7 @@
       // Assume that setting a host name means it's meant to be fixed
       if (this.fixedHostName == null)
       {
-         setFixedHostName(hostName == null);
+         setFixedHostName(hostName != null);
       }
    }
 

Modified: projects/service-binding/trunk/core/src/test/java/org/jboss/test/services/binding/test/ServiceBindingMetadataUnitTestCase.java
===================================================================
--- projects/service-binding/trunk/core/src/test/java/org/jboss/test/services/binding/test/ServiceBindingMetadataUnitTestCase.java	2010-07-14 03:20:42 UTC (rev 106668)
+++ projects/service-binding/trunk/core/src/test/java/org/jboss/test/services/binding/test/ServiceBindingMetadataUnitTestCase.java	2010-07-14 03:34:56 UTC (rev 106669)
@@ -265,6 +265,19 @@
       md.setFixedHostName(true);
       assertTrue(md.isFixedHostName());
    }
+   
+   /**
+    * Tests combination of setting hostName and fixedHostName properties
+    */
+   public void testFixedHostName()
+   {
+      ServiceBindingMetadata md = new ServiceBindingMetadata();
+      assertFalse(md.isFixedHostName());
+      md.setHostName("192.168.0.1");
+      assertTrue(md.isFixedHostName());
+      md.setFixedHostName(false);
+      assertFalse(md.isFixedHostName());
+   }
 
    /**
     * Test method for {@link org.jboss.services.binding.ServiceBindingMetadata#equals(java.lang.Object)}.

Modified: projects/service-binding/trunk/core/src/test/java/org/jboss/test/services/binding/test/ServiceBindingUnitTestCase.java
===================================================================
--- projects/service-binding/trunk/core/src/test/java/org/jboss/test/services/binding/test/ServiceBindingUnitTestCase.java	2010-07-14 03:20:42 UTC (rev 106668)
+++ projects/service-binding/trunk/core/src/test/java/org/jboss/test/services/binding/test/ServiceBindingUnitTestCase.java	2010-07-14 03:34:56 UTC (rev 106669)
@@ -135,6 +135,25 @@
       assertEquals(1, metadata.getPort());
       assertEquals(11, binding.getPort());
    }
+   
+   /**
+    * Tests that the rules for using the default host name vs the metadata's host
+    * name are respected
+    */
+   public void testHostName()  throws Exception
+   {
+      ServiceBindingMetadata metadata = new ServiceBindingMetadata("A", "A");
+      ServiceBinding binding = new ServiceBinding(metadata, "192.168.0.2", 1);
+      assertEquals("192.168.0.2", binding.getHostName());
+      metadata = new ServiceBindingMetadata();
+      metadata.setServiceName("A");
+      metadata.setHostName("127.0.0.1");
+      binding = new ServiceBinding(metadata, "192.168.0.2", 1);
+      assertEquals("127.0.0.1", binding.getHostName());
+      metadata.setFixedHostName(false);
+      binding = new ServiceBinding(metadata, "192.168.0.2", 1);
+      assertEquals("192.168.0.2", binding.getHostName());
+   }
 
    /**
     * Test method for {@link org.jboss.services.binding.ServiceBinding#equals(java.lang.Object)}.