Author: ozizka(a)redhat.com Date: 2009-07-28 13:22:44 -0400 (Tue, 28 Jul 2009) New Revision: 604 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java Log: * EarTest updated * JMSMetricsTest - removed check of Time Last Update Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-07-28 17:03:39 UTC (rev 603) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-07-28 17:22:44 UTC (rev 604) @@ -266,7 +266,6 @@ { String headerText = "JBossAS Server"; - String jbossConfig = ejtt.getJBossConfig(); assertTrue("Page doesn't contain the header: "+headerText, client.getPageAsText().contains(headerText)); @@ -277,7 +276,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, ejtt.getJBossConfig() ) ); // Click the server link //HtmlAnchor link row.getLinkByLabel("JBAS (default)"); Node firstLink = row.getCellByColumnName("Name").getElementsByTagName("a").item(0); @@ -291,8 +290,7 @@ { String pageText = client.getPageAsText(); - String jbossConfig = ejtt.getJBossConfig(); - String headerText = "JBoss AS 5 ("+jbossConfig+")"; + String headerText = String.format(AS_NODE_NAME_FORMAT, ejtt.getJBossConfig() ); assertTrue("Page doesn't contain the header: "+headerText, pageText.contains(headerText)); @@ -407,7 +405,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(); @@ -419,7 +417,7 @@ // Resource Traits infoTable = ejtt.getContentInfoTable( - ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("Traits").getElement() ); + ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_TRAITS).getElement() ); props = infoTable.getProperties(); @@ -428,12 +426,6 @@ assertEquals("no", props.getProperty("Exploded?").trim()); - // Metrics Summary - HtmlTable summaryTable = ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("Numeric Metrics").getElement(); - infoTable = ejtt.getContentInfoTable(summaryTable); - // (nothing here yet) - - } finally { try { Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java 2009-07-28 17:03:39 UTC (rev 603) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java 2009-07-28 17:22:44 UTC (rev 604) @@ -347,7 +347,7 @@ expectedMetrics.put(COUNT_DELTA, "0"); expectedMetrics.put(DEPTH, "0"); expectedMetrics.put(DEPTH_DELTA, "0"); - expectedMetrics.put(TIME_LAST_UPDATE, "0"); + //expectedMetrics.put(TIME_LAST_UPDATE, "0"); checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(), DestinationType.QUEUE);