perfsonar development work

Author: pgerakios
Date: 2008-03-19 08:20:53 -0400 (Wed, 19 Mar 2008)
New Revision: 3536

Modified:
   trunk/functional-testing/LSsoapui/rnc/Deregister/LSDeregisterResponse.rnc
   trunk/functional-testing/LSsoapui/rnc/Echo/LSEchoResponse.rnc
   trunk/functional-testing/LSsoapui/rnc/Keepalive/LSKeepaliveResponse.rnc
   trunk/functional-testing/LSsoapui/rnc/Query/LSQueryResponse.rnc
   trunk/functional-testing/LSsoapui/rnc/Register/LSRegisterResponse.rnc
   trunk/functional-testing/LSsoapui/soapui_template/LS-soapui-project.xml
   
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/LSRegister.java
   
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/XMLU.java
Log:


Modified: 
trunk/functional-testing/LSsoapui/rnc/Deregister/LSDeregisterResponse.rnc
===================================================================
--- trunk/functional-testing/LSsoapui/rnc/Deregister/LSDeregisterResponse.rnc 
  2008-03-19 10:21:06 UTC (rev 3535)
+++ trunk/functional-testing/LSsoapui/rnc/Deregister/LSDeregisterResponse.rnc 
  2008-03-19 12:20:53 UTC (rev 3536)
@@ -18,7 +18,7 @@
         attribute messageIdRef { xsd:string }
 
 Type =
-        attribute type { "LSDeregisterResponse" }
+        attribute type { "LSDeregisterResponse"  | "ErrorResponse" }
 
 Metadata =
         element nmwg:metadata {
@@ -41,4 +41,4 @@
         }
 
 ResultCodeDatum =
-        element nmwgr:datum { xsd:string }
\ No newline at end of file
+        element nmwgr:datum { xsd:string }

Modified: trunk/functional-testing/LSsoapui/rnc/Echo/LSEchoResponse.rnc
===================================================================
--- trunk/functional-testing/LSsoapui/rnc/Echo/LSEchoResponse.rnc       
2008-03-19 10:21:06 UTC (rev 3535)
+++ trunk/functional-testing/LSsoapui/rnc/Echo/LSEchoResponse.rnc       
2008-03-19 12:20:53 UTC (rev 3536)
@@ -18,7 +18,7 @@
         attribute messageIdRef { xsd:string }
 
 Type =
-        attribute type { "EchoResponse" }
+        attribute type { "EchoResponse"  | "ErrorResponse" }
 
 Metadata =
         element nmwg:metadata {
@@ -41,4 +41,4 @@
         }
 
 ResultCodeDatum =
-        element nmwgr:datum { xsd:string }
\ No newline at end of file
+        element nmwgr:datum { xsd:string }

Modified: 
trunk/functional-testing/LSsoapui/rnc/Keepalive/LSKeepaliveResponse.rnc
===================================================================
--- trunk/functional-testing/LSsoapui/rnc/Keepalive/LSKeepaliveResponse.rnc   
  2008-03-19 10:21:06 UTC (rev 3535)
+++ trunk/functional-testing/LSsoapui/rnc/Keepalive/LSKeepaliveResponse.rnc   
  2008-03-19 12:20:53 UTC (rev 3536)
@@ -18,7 +18,7 @@
         attribute messageIdRef { xsd:string }
 
 Type =
-        attribute type { "LSKeepaliveResponse" }
+        attribute type { "LSKeepaliveResponse"  | "ErrorResponse" }
 
 Metadata =
         element nmwg:metadata {
@@ -41,4 +41,4 @@
         }
 
 ResultCodeDatum =
-        element nmwgr:datum { xsd:string }
\ No newline at end of file
+        element nmwgr:datum { xsd:string }

Modified: trunk/functional-testing/LSsoapui/rnc/Query/LSQueryResponse.rnc
===================================================================
--- trunk/functional-testing/LSsoapui/rnc/Query/LSQueryResponse.rnc     
2008-03-19 10:21:06 UTC (rev 3535)
+++ trunk/functional-testing/LSsoapui/rnc/Query/LSQueryResponse.rnc     
2008-03-19 12:20:53 UTC (rev 3536)
@@ -18,7 +18,7 @@
         attribute messageIdRef { xsd:string }
 
 Type =
-        attribute type { "LSQueryResponse" }
+        attribute type { "LSQueryResponse" | "ErrorResponse" }
 
 Metadata =
         element nmwg:metadata {

Modified: 
trunk/functional-testing/LSsoapui/rnc/Register/LSRegisterResponse.rnc
===================================================================
--- trunk/functional-testing/LSsoapui/rnc/Register/LSRegisterResponse.rnc     
  2008-03-19 10:21:06 UTC (rev 3535)
+++ trunk/functional-testing/LSsoapui/rnc/Register/LSRegisterResponse.rnc     
  2008-03-19 12:20:53 UTC (rev 3536)
@@ -17,7 +17,7 @@
         attribute messageIdRef { xsd:string }
 
 Type =
-        attribute type { "LSRegisterResponse" }
+        attribute type { "LSRegisterResponse"  | "ErrorResponse" }
 
 Metadata =
         element nmwg:metadata {

Modified: 
trunk/functional-testing/LSsoapui/soapui_template/LS-soapui-project.xml
===================================================================
--- trunk/functional-testing/LSsoapui/soapui_template/LS-soapui-project.xml   
  2008-03-19 10:21:06 UTC (rev 3535)
+++ trunk/functional-testing/LSsoapui/soapui_template/LS-soapui-project.xml   
  2008-03-19 12:20:53 UTC (rev 3536)
@@ -4918,6 +4918,7 @@
 
)</path><content>true</content><allowWildcards>false</allowWildcards></con:configuration></con:assertion><con:assertion
 type="GroovyScriptAssertion" name="Request/Response Schema/RNG 
Assertion"><con:configuration><scriptText>import 
org.perfsonar.service.testing.XMLU;
 XMLU.validate( 
XMLU.OperationType.REGISTER,context,messageExchange,log);</scriptText></con:configuration></con:assertion></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase
 failOnError="true" failTestCaseOnErrors="true" keepSession="false" 
name="testRunner" searchProperties="true"><con:settings/><con:testStep 
type="groovy" name="testRunner"><con:settings/><con:config><script>import 
org.perfsonar.service.testing.*;
 
+ log.setLevel(org.apache.log4j.Level.ERROR);
 
 // Load test steps
 
@@ -4936,7 +4937,6 @@
  errorString += e.getMessage() + "\n";
 }
 
-return;
 
 // Malformed requests
 TestStep[] malformed = Util.newTestStepArray(testRunner,log, "2.1.2.2.1 --- 
a" ,"2.1.2.2.1 --- b",
@@ -4953,7 +4953,6 @@
 }
 catch( Exception e ){ failed = true;  errorString += e.getMessage() + "\n"; }
 
-return;
 
 
 TestStep[] nearvalid = Util.newTestStepArray(testRunner,log, "2.1.2.3.1" 
,"2.1.2.3.2","2.1.2.3.3","2.1.2.3.4",

Modified: 
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/LSRegister.java
===================================================================
--- 
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/LSRegister.java
 2008-03-19 10:21:06 UTC (rev 3535)
+++ 
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/LSRegister.java
 2008-03-19 12:20:53 UTC (rev 3536)
@@ -53,7 +53,7 @@
 
  public void validateMalformed() throws Exception{
    debug("LSRegister validate ...");
-    
checkConsistency(Operator.NEQ,"success.ls.register",Operator.EQ,"LSRegisterResponse");
+    
checkConsistency(Operator.NEQ,"success.ls.register",Operator.EQ,"ErrorResponse");
 //"LSRegisterResponse");
    debug("LSRegister validate: Stage1 Completed ");
  }
 

Modified: 
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/XMLU.java
===================================================================
--- 
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/XMLU.java 
      2008-03-19 10:21:06 UTC (rev 3535)
+++ 
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/XMLU.java 
      2008-03-19 12:20:53 UTC (rev 3536)
@@ -149,7 +149,7 @@
 
 public static void validate_request(OperationType ot, TestRunContext context 
, WsdlResponseMessageExchange messageExchange, Logger log ) 
   throws Exception {
-        log.setLevel(org.apache.log4j.Level.ALL);
+     /*   log.setLevel(org.apache.log4j.Level.ALL);*/
         log.debug("Starting validation");
         validate( newValidator(ot,SchemaType.RNG,MessageType.REQUEST,log),
                   newValidator(ot,SchemaType.XSD,MessageType.REQUEST,log),
@@ -158,7 +158,7 @@
 
 public static void validate(OperationType ot,MessageType mt,org.w3c.dom.Node 
node, Logger log ) 
   throws Exception {
-        log.setLevel(org.apache.log4j.Level.ALL);
+     /*   log.setLevel(org.apache.log4j.Level.ALL);*/
         log.debug("Starting validation");
         validate( newValidator(ot,SchemaType.RNG,mt,log),
                   newValidator(ot,SchemaType.XSD,mt,log),
@@ -167,7 +167,7 @@
 
 public static void validate_response(OperationType ot, TestRunContext 
context , WsdlResponseMessageExchange messageExchange, Logger log ) 
   throws Exception {
-        log.setLevel(org.apache.log4j.Level.ALL);
+     /*   log.setLevel(org.apache.log4j.Level.ALL);*/
         log.debug("Starting validation");
         validate( newValidator(ot,SchemaType.RNG,MessageType.RESPONSE,log),
         newValidator(ot,SchemaType.XSD,MessageType.RESPONSE,log),