[embjopr-commits] EMBJOPR SVN: r386 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5.

[embjopr-commits at lists.jboss.org]

Author: charles.crouch at jboss.com
Date: 2009-05-06 10:40:22 -0400 (Wed, 06 May 2009)
New Revision: 386

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
Log:
fix to use new operations page

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java	2009-05-06 14:11:22 UTC (rev 385)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java	2009-05-06 14:40:22 UTC (rev 386)
@@ -304,9 +304,9 @@
 
         // Make sure the operation completed successfully
         String status = getLatestOperationStatus();
-        String actualOperationResults = getOperationResults();        
+        String actualOperationResults = ((HtmlDivision)client.getElement(OPERATION_RESULTS)).getTextContent();       
         String shortenedResult = actualOperationResults.substring(actualOperationResults.indexOf("Viewing"), 
-                                                                  actualOperationResults.indexOf("]") + 1);
+                actualOperationResults.indexOf("]") + 1);
         assertTrue("The operation was not successful, result was [" + shortenedResult +"].", status.contains(SUCCESSFUL));
     }
     
@@ -466,16 +466,4 @@
         String cellValueAsHtml = TABLE_CELL_DELIM + cellValue + TABLE_CELL_END_DELIM;
         return cellValueAsHtml;
     }
-
-	protected String getOperationResults() {
-		// Make sure the operation parameters and results are displayed
-		// correctly
-		HtmlAnchor detailsLink = getLinkInsideForm(OPERATION_HISTORY_FORM,
-				OPERATION_DETAILS);
-		detailsLink.click();
-	
-		String actualOperationResults = ((HtmlSpan) client
-				.getElement(OPERATION_RESULTS)).getTextContent();
-		return actualOperationResults;
-	}
 }