perfsonar development work

Author: trzaszcz
Date: 2009-11-06 08:18:00 -0500 (Fri, 06 Nov 2009)
New Revision: 5343

Modified:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/DiscoveryRequestGenerator.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/actions/RegistrationActionTests.java
Log:
summarization format enhancement, unit tests improvement

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/DiscoveryRequestGenerator.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/DiscoveryRequestGenerator.java
   2009-11-06 13:14:12 UTC (rev 5342)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/DiscoveryRequestGenerator.java
   2009-11-06 13:18:00 UTC (rev 5343)
@@ -82,6 +82,8 @@
         
netmask.setNamespaceUri("http://ogf.org/schema/network/topology/l3/20070828/";);
         netmask.setText(subnetString);
         subnet.addChild(netmask);
+        
+        subject.addChild(network);
 
         return network;        
     }

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/actions/RegistrationActionTests.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/actions/RegistrationActionTests.java
  2009-11-06 13:14:12 UTC (rev 5342)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/actions/RegistrationActionTests.java
  2009-11-06 13:18:00 UTC (rev 5343)
@@ -115,6 +115,20 @@
                LSRegisterServiceEngine engine = new 
LSRegisterServiceEngine();
 
                ServiceMessage requestMessage = new ServiceMessage(
+                               getRegistrationRequest(true, false, 
true,"222", true));
+               ServiceMessage responseMessage = new ServiceMessage();
+               try {
+                       engine.takeAction(requestMessage, responseMessage);
+                       fail();
+               } catch (PerfSONARException ex) {
+
+               }
+       }
+       
+       public void testRegistrationWithoutServiceName() throws 
PerfSONARException {
+               LSRegisterServiceEngine engine = new 
LSRegisterServiceEngine();
+
+               ServiceMessage requestMessage = new ServiceMessage(
                                getRegistrationRequest(false, true, 
true,"222", true));
                ServiceMessage responseMessage = new ServiceMessage();
                try {