perfsonar development work

Author: pgerakios
Date: 2008-03-19 06:21:06 -0400 (Wed, 19 Mar 2008)
New Revision: 3535

Modified:
   trunk/functional-testing/LSsoapui/soapui_template/LS-soapui-project.xml
   
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/Util.java
Log:


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:15:43 UTC (rev 3534)
+++ trunk/functional-testing/LSsoapui/soapui_template/LS-soapui-project.xml   
  2008-03-19 10:21:06 UTC (rev 3535)
@@ -4920,27 +4920,14 @@
 
 
 // Load test steps
-TestStep[] wellformed = Util.newTestStepArray(testRunner,log,"Generic 
Request" , "2.1.2.1.1", "2.1.2.1.2" ,"2.1.2.1.3" );
-TestStep[] malformed = Util.newTestStepArray(testRunner,log, "2.1.2.2.1 --- 
a" ,"2.1.2.2.1 --- b",
-                                                            "2.1.2.2.2 --- 
a" , "2.1.2.2.1 --- b",
-                                                            "2.1.2.2.3 --- 
a" , "2.1.2.2.3 --- b",
-                                                    "2.1.2.2.4 --- a" , 
"2.1.2.2.4 --- b", "2.1.2.2.4 --- c","2.1.2.2.4 --- d",
-                                                    "2.1.2.2.5 --- a" , 
"2.1.2.2.5 --- b", "2.1.2.2.5 --- c","2.1.2.2.5 --- d",
-                                                    "2.1.2.2.6 --- a" , 
"2.1.2.2.6 --- b", "2.1.2.2.6 --- c","2.1.2.2.6 --- d",
-                                                    "2.1.2.2.7 --- a" 
,"2.1.2.2.7 --- b","2.1.2.2.8 --- a" ,"2.1.2.2.8 --- b",
-                                                    "2.1.2.2.9 --- a" 
,"2.1.2.2.9 --- b" );
-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",
-                                                            "2.1.2.3.5" 
,"2.1.2.3.6","2.1.2.3.7","2.1.2.3.8",
-                                                            "2.1.2.3.9" 
,"2.1.2.3.10","2.1.2.3.11","2.1.2.3.12",
-                                                            "2.1.2.3.13" 
,"2.1.2.3.14","2.1.2.3.7","2.1.2.3.15",
-                                                            "2.1.2.3.16" 
,"2.1.2.3.17 --- a","2.1.2.3.17 --- b","2.1.2.3.18"
-                                            );
 
 boolean failed=false;
 String errorString ="";
 
 
 // Well-formed requests
+TestStep[] wellformed = Util.newTestStepArray(testRunner,log,"Generic 
Request" , "2.1.2.1.1", "2.1.2.1.2" ,"2.1.2.1.3" );
+
 try{
 Util.runTestStepArray(wellformed,true,log);
 }
@@ -4949,9 +4936,17 @@
  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",
+                                                            "2.1.2.2.2 --- 
a" , "2.1.2.2.1 --- b",
+                                                            "2.1.2.2.3 --- 
a" , "2.1.2.2.3 --- b",
+                                                    "2.1.2.2.4 --- a" , 
"2.1.2.2.4 --- b", "2.1.2.2.4 --- c","2.1.2.2.4 --- d",
+                                                    "2.1.2.2.5 --- a" , 
"2.1.2.2.5 --- b", "2.1.2.2.5 --- c","2.1.2.2.5 --- d",
+                                                    "2.1.2.2.6 --- a" , 
"2.1.2.2.6 --- b", "2.1.2.2.6 --- c","2.1.2.2.6 --- d",
+                                                    "2.1.2.2.7 --- a" 
,"2.1.2.2.7 --- b","2.1.2.2.8 --- a" ,"2.1.2.2.8 --- b",
+                                                    "2.1.2.2.9 --- a" 
,"2.1.2.2.9 --- b" );
 
 try{
 Util.runTestStepArray(malformed,false,log);
@@ -4961,6 +4956,14 @@
 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",
+                                                            "2.1.2.3.5" 
,"2.1.2.3.6","2.1.2.3.7","2.1.2.3.8",
+                                                            "2.1.2.3.9" 
,"2.1.2.3.10","2.1.2.3.11","2.1.2.3.12",
+                                                            "2.1.2.3.13" 
,"2.1.2.3.14","2.1.2.3.7","2.1.2.3.15",
+                                                            "2.1.2.3.16" 
,"2.1.2.3.17 --- a","2.1.2.3.17 --- b","2.1.2.3.18"
+                                            );
+
+
 // Near valid
 try{
 Util.runTestStepArray(nearvalid,false,log);

Modified: 
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/Util.java
===================================================================
--- 
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/Util.java 
      2008-03-19 10:15:43 UTC (rev 3534)
+++ 
trunk/functional-testing/LSsoapui/src/org/perfsonar/service/testing/Util.java 
      2008-03-19 10:21:06 UTC (rev 3535)
@@ -51,7 +51,11 @@
      return ret;
   }
 
-  public static void runTestStepArray( TestStep[] ts , boolean isWellFormed 
, Logger log) throws Exception {
+  public static void runTestStepArray( TestStep[] ts , boolean isWellFormed 
, Logger log  ) throws Exception {
+       runTestStepArray(ts,isWellFormed,log,true);
+  }
+
+  public static void runTestStepArray( TestStep[] ts , boolean isWellFormed 
, Logger log, boolean bCont ) throws Exception {
     String name;
     
      if( isWellFormed ) 
@@ -63,9 +67,9 @@
           }
           catch( Exception e ){
             e.printStackTrace();
-            log.debug("Failed test step " + name ) ;
+            log.error("Failed test step " + name ) ;
             e.printStackTrace();
-         //   throw e;
+           if(!bCont) throw e;
           }
        }
     else 
@@ -78,7 +82,7 @@
           catch( Exception e ){
             log.error("Failed test step " + name ) ;
            e.printStackTrace();
-       //     throw e;
+            if(!bCont)  throw e;
           }
        }
   }