[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Thu Mar 13 19:06:48 EDT 2008
Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/services/util/test
In directory dev.open-bio.org:/tmp/cvs-serv31771/src/main/ca/ucalgary/services/util/test

Modified Files:
	XHTMLFormTestCase.java 
Log Message:
Changes made to reflect refactoring for XHTMLForm/MobySpecWrapper
moby-live/Java/src/main/ca/ucalgary/services/util/test XHTMLFormTestCase.java,1.5,1.6
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/services/util/test/XHTMLFormTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/services/util/test/XHTMLFormTestCase.java	2008/02/27 15:26:12	1.5
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/services/util/test/XHTMLFormTestCase.java	2008/03/13 23:06:48	1.6
@@ -120,10 +120,10 @@
 		   ") was not as expected (" + NUM_SECONDARY_INPUTS + ")",
 		   NUM_SECONDARY_INPUTS == secondaryInputs.size());
 
-	String[] outputs = form.getPrimaryOutputs();
-	assertTrue("The number of primary output parameters defined (" + outputs.length +
+	Map<String,String> outputs = form.getPrimaryOutputs();
+	assertTrue("The number of primary output parameters defined (" + outputs.size() +
 		   ") was not as expected (" + NUM_OUTPUTS + ")",
-		   NUM_OUTPUTS == outputs.length);
+		   NUM_OUTPUTS == outputs.size());
 	
 	// Check the HTML-specific specs
 	Map<String,String> fixedParams = form.getFixedParams();
@@ -156,9 +156,9 @@
 		   inseqFormat + "'",
 		   inseqFormat.equals(primaryInputFormats.get(inputHTMLParamName)));
 	assertTrue("The value of the output parameter 'primers' (" +
-		   outputs[0] + ") was not the expected value '" + 
+		   outputs.get("primers") + ") was not the expected value '" + 
 		   primers + "'",
-		   primers.equals(outputs[0]));
+		   primers.equals(outputs.get("primers")));
      
 	assertTrue("The value of the secondary parameter 'bias' (" + 
 		   secondaryInputs.get("bias") + ") was not the expected value '" + bias + "'",