[jboss-cvs] JBossAS SVN: r106921 - in projects/service-binding/trunk/management/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-20 10:50:32 -0400 (Tue, 20 Jul 2010)
New Revision: 106921

Modified:
   projects/service-binding/trunk/management/src/main/java/org/jboss/services/binding/managed/ServiceBindingMetadataMapper.java
   projects/service-binding/trunk/management/src/test/java/org/jboss/test/services/binding/test/ServiceBindingMetadataMapperUnitTestCase.java
Log:
[SVCBIND-4] Fix reversed parameter ordering bug

Modified: projects/service-binding/trunk/management/src/main/java/org/jboss/services/binding/managed/ServiceBindingMetadataMapper.java
===================================================================
--- projects/service-binding/trunk/management/src/main/java/org/jboss/services/binding/managed/ServiceBindingMetadataMapper.java	2010-07-20 14:39:52 UTC (rev 106920)
+++ projects/service-binding/trunk/management/src/main/java/org/jboss/services/binding/managed/ServiceBindingMetadataMapper.java	2010-07-20 14:50:32 UTC (rev 106921)
@@ -193,8 +193,8 @@
 //         String serviceBindingValueSourceClassName = getValueFromComposite(compValue, "serviceBindingValueSourceClassName", String.class);
          ServiceBindingMetadata sbm = 
             new ServiceBindingMetadata(serviceName, bindingName, hostName, port.intValue(), 
-                  fixedHostName == null ? false : fixedHostName.booleanValue(), 
-                        fixedPort == null ? false : fixedPort.booleanValue());
+                  fixedPort == null ? false : fixedPort.booleanValue(),
+                  fixedHostName == null ? false : fixedHostName.booleanValue());
          sbm.setDescription(description);
 //         sbm.setServiceBindingValueSourceClassName(serviceBindingValueSourceClassName);
          result.add(sbm);

Modified: projects/service-binding/trunk/management/src/test/java/org/jboss/test/services/binding/test/ServiceBindingMetadataMapperUnitTestCase.java
===================================================================
--- projects/service-binding/trunk/management/src/test/java/org/jboss/test/services/binding/test/ServiceBindingMetadataMapperUnitTestCase.java	2010-07-20 14:39:52 UTC (rev 106920)
+++ projects/service-binding/trunk/management/src/test/java/org/jboss/test/services/binding/test/ServiceBindingMetadataMapperUnitTestCase.java	2010-07-20 14:50:32 UTC (rev 106921)
@@ -64,6 +64,12 @@
       ServiceBindingMetadata nulls = new ServiceBindingMetadata("nulls", null, null, 20);
       input.add(nulls);
       
+      ServiceBindingMetadata fixedPort = new ServiceBindingMetadata("fixedPort", "binding", "host", 10, true, false);
+      fixedPort.setDescription("desc");
+      fixedPort.setServiceBindingValueSource(new StringReplacementServiceBindingValueSourceImpl());
+      fixedPort.setServiceBindingValueSourceConfig(new StringReplacementServiceBindingValueSourceConfig());
+      input.add(fixedPort);
+      
       ServiceBindingMetadataMapper mapper = new ServiceBindingMetadataMapper();
       MetaValue wrapped = mapper.createMetaValue(null, input);
       Set<ServiceBindingMetadata> output = mapper.unwrapMetaValue(wrapped);
@@ -84,6 +90,19 @@
             assertNull(md.getServiceBindingValueSourceClassName());
             assertNull(md.getServiceBindingValueSourceConfig());
          }
+         else if ("fixedPort".equals(md.getServiceName()))
+         {
+            assertEquals(fixedPort.getFullyQualifiedName(), md.getFullyQualifiedName());
+            assertEquals(fixedPort.getBindingName(), md.getBindingName());
+            assertEquals(fixedPort.getDescription(), md.getDescription());
+            assertEquals(fixedPort.getHostName(), md.getHostName());
+            assertEquals(fixedPort.getPort(), md.getPort());
+            assertEquals(fixedPort.isFixedHostName(), md.isFixedHostName());
+            assertEquals(fixedPort.isFixedPort(), md.isFixedPort());
+            // We expect null for the following, but if the impl changes these can change
+            assertNull(md.getServiceBindingValueSourceClassName());
+            assertNull(md.getServiceBindingValueSourceConfig());
+         }
          else if ("nulls".equals(md.getServiceName()))
          {
             assertEquals(nulls.getFullyQualifiedName(), md.getFullyQualifiedName());