[embjopr-commits] EMBJOPR SVN: r610 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app: war and 1 other directory.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-07-28 14:43:52 -0400 (Tue, 28 Jul 2009)
New Revision: 610

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java
Log:
 * RAR and WAR tests updated.

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java	2009-07-28 18:27:28 UTC (rev 609)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java	2009-07-28 18:43:52 UTC (rev 610)
@@ -143,7 +143,7 @@
 			// Check whether the server is listed. If not, Exception is thrown.
 			ContentTableRow row =
 							ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("JBoss Application Server")
-							.getFirstRowContainingLink("JBoss AS 5 ("+jbossConfig+")");
+							.getFirstRowContainingLink( String.format(AS_NODE_NAME_FORMAT, jbossConfig) );
 			// Click the server link
 			//HtmlAnchor link row.getLinkByLabel("JBAS (default)");
 			Node firstLink = row.getCellByColumnName("Name").getElementsByTagName("a").item(0);
@@ -158,7 +158,7 @@
 			String pageText = client.getPageAsText();
 
 			String jbossConfig = ejtt.getJBossConfig();
-			String headerText = "JBoss AS 5 ("+jbossConfig+")";
+			String headerText = String.format(AS_NODE_NAME_FORMAT, jbossConfig);
 			assertTrue("Page doesn't contain the header: "+headerText,
 							pageText.contains(headerText));
 
@@ -205,7 +205,7 @@
 			// Go to the summary through listed item.
 			rarRow.getLinkByLabel(BASIC_RAR).click();
 			// Check that we have the summary tab for the selected RAR.
-			assertTrue( "RAR name ("+BASIC_RAR+" not found in the content box.",
+			assertTrue( "RAR name ("+BASIC_RAR+") not found in the content box.",
 				ejtt.getTabMenu().getTabContentBox().getElement().getTextContent().contains(BASIC_RAR) );
 
 			// Go to the summary through nav tree node.
@@ -285,7 +285,7 @@
 			// Check the values in info table(s)
 
 			// General Properties
-			HtmlTable genpropTable = ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("General Properties").getElement();
+			HtmlTable genpropTable = ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_GENERAL_PROPERTIES).getElement();
 			ContentInfoTable infoTable = ejtt.getContentInfoTable( genpropTable );
 			Properties props = infoTable.getProperties();
 
@@ -293,7 +293,7 @@
 
 			// Resource Traits
 			infoTable = ejtt.getContentInfoTable(
-			ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("Resource Traits").getElement() );
+			ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_TRAITS).getElement() );
 			props = infoTable.getProperties();
 
 
@@ -302,12 +302,6 @@
 
 			assertEquals("no", props.getProperty("Exploded?").trim());
 
-			// Metrics Summary
-			HtmlTable summaryTable = ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("Metrics Summary").getElement();
-			infoTable = ejtt.getContentInfoTable(summaryTable);
-			// (nothing here yet)
-
-
 		}
 		finally {
 			try {

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java	2009-07-28 18:27:28 UTC (rev 609)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java	2009-07-28 18:43:52 UTC (rev 610)
@@ -307,7 +307,7 @@
 			String pageText = client.getPageAsText();
 
 			String jbossConfig = ejtt.getJBossConfig();
-			String headerText = "JBoss AS 5 ("+jbossConfig+")";
+			String headerText = String.format(AS_NODE_NAME_FORMAT, jbossConfig);
 			assertTrue("Page doesn't contain the header: "+headerText,
 							pageText.contains(headerText));