[jboss-cvs] JBossAS SVN: r106668 - in branches/Branch_No_Multicast/varia/src: tests/org/jboss/test/services/binding/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 13 23:20:43 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-07-13 23:20:42 -0400 (Tue, 13 Jul 2010)
New Revision: 106668
Modified:
branches/Branch_No_Multicast/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java
branches/Branch_No_Multicast/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingMetadataTestCase.java
branches/Branch_No_Multicast/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingUnitTestCase.java
Log:
[JBPAPP-4634] Don't default fixedHostName to false when hostName is set
Modified: branches/Branch_No_Multicast/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java
===================================================================
--- branches/Branch_No_Multicast/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java 2010-07-13 22:32:06 UTC (rev 106667)
+++ branches/Branch_No_Multicast/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java 2010-07-14 03:20:42 UTC (rev 106668)
@@ -336,7 +336,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: branches/Branch_No_Multicast/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingMetadataTestCase.java
===================================================================
--- branches/Branch_No_Multicast/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingMetadataTestCase.java 2010-07-13 22:32:06 UTC (rev 106667)
+++ branches/Branch_No_Multicast/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingMetadataTestCase.java 2010-07-14 03:20:42 UTC (rev 106668)
@@ -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: branches/Branch_No_Multicast/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingUnitTestCase.java
===================================================================
--- branches/Branch_No_Multicast/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingUnitTestCase.java 2010-07-13 22:32:06 UTC (rev 106667)
+++ branches/Branch_No_Multicast/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingUnitTestCase.java 2010-07-14 03:20:42 UTC (rev 106668)
@@ -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)}.
More information about the jboss-cvs-commits
mailing list