EMBJOPR SVN: r610 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app: war and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)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));
15 years, 5 months
EMBJOPR SVN: r609 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5: jmsDestinations and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-28 14:27:28 -0400 (Tue, 28 Jul 2009)
New Revision: 609
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java
Log:
* JMSOperationsTest updated.
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-07-28 18:21:40 UTC (rev 608)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-07-28 18:27:28 UTC (rev 609)
@@ -348,6 +348,9 @@
String xpath = ".//input[@value=\"" + operationName + "\"]";
HtmlButtonInput operationButton = (HtmlButtonInput)form.getFirstByXPath(xpath);
+ if( null == operationButton )
+ throw new HtmlElementNotFoundException( String.format("Button '%s' not found using xPath: "+ xpath, operationName));
+
operationButton.click();
if(takesParameters) {
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java 2009-07-28 18:21:40 UTC (rev 608)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java 2009-07-28 18:27:28 UTC (rev 609)
@@ -1872,6 +1872,7 @@
* FAILS: This got implemented as structured result; before, it was only a string.
* "Viewing/editing of lists ... not supported. Here's the list's toString() value for now: []"
* See: JOPR-141
+ * Affects: testTopicListAllSubscriptions*
*/
private void performListSubscriptionsAndCheckResults(String jndiName,
String operationName,
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java 2009-07-28 18:21:40 UTC (rev 608)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java 2009-07-28 18:27:28 UTC (rev 609)
@@ -125,8 +125,8 @@
public static final String LIST_ALL_SUB_AS_HTML = "List All Subscriptions As HTML";
public static final String LIST_DURABLE_SUB = "List Durable Subscriptions";
public static final String LIST_DURABLE_SUB_AS_HTML = "List Durable Subscriptions As HTML";
- public static final String LIST_NON_DURABLE_SUB = "List Non Durable Subscriptions";
- public static final String LIST_NON_DURABLE_SUB_AS_HTML = "List Non Durable Subscriptions As HTML";
+ public static final String LIST_NON_DURABLE_SUB = "List Non-Durable Subscriptions";
+ public static final String LIST_NON_DURABLE_SUB_AS_HTML = "List Non-Durable Subscriptions As HTML";
// Queue-specific operations
public static final String LIST_MSG_COUNTER_AS_HTML = "List Message Counter As HTML";
15 years, 5 months
EMBJOPR SVN: r608 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-28 14:21:40 -0400 (Tue, 28 Jul 2009)
New Revision: 608
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java
Log:
* JMSOperationsTest updated.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java 2009-07-28 17:58:46 UTC (rev 607)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java 2009-07-28 18:21:40 UTC (rev 608)
@@ -1868,6 +1868,10 @@
*
* @param isEmptyList - whether or not the list of subscriptions that
* gets displayed should be empty
+ *
+ * FAILS: This got implemented as structured result; before, it was only a string.
+ * "Viewing/editing of lists ... not supported. Here's the list's toString() value for now: []"
+ * See: JOPR-141
*/
private void performListSubscriptionsAndCheckResults(String jndiName,
String operationName,
@@ -1876,8 +1880,11 @@
jndiName, operationName, Boolean.FALSE);
String actualOperationResults = ((HtmlDivision)client.getElement(OPERATION_RESULTS)).getTextContent();
-
- String shortenedResult = actualOperationResults.substring(actualOperationResults.indexOf("Viewing"),
+
+ fail("Operation result used to be toString(), now it's a table. Need to fix the test method.");
+
+ /*
+ String shortenedResult = actualOperationResults.substring(actualOperationResults.indexOf("Viewing"),
actualOperationResults.indexOf("]") + 1);
log.info("Operation result was: " + shortenedResult);
@@ -1888,6 +1895,7 @@
assertTrue("Expected empty list but was: '" + shortenedResult + "'",
actualOperationResults.contains(EMPTY_LIST));
}
+ /**/
// Clean up
disconnect();
15 years, 5 months
EMBJOPR SVN: r607 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-28 13:58:46 -0400 (Tue, 28 Jul 2009)
New Revision: 607
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JBossASNodeTest.java
Log:
* JBossASNodeTest updated
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JBossASNodeTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JBossASNodeTest.java 2009-07-28 17:54:05 UTC (rev 606)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JBossASNodeTest.java 2009-07-28 17:58:46 UTC (rev 607)
@@ -31,7 +31,7 @@
String jbossConfig = ejtt.getJBossConfig();
// Go to the AS node.
- String nodeText = "JBoss AS 5 ("+jbossConfig+")";
+ String nodeText = String.format(AS_NODE_NAME_FORMAT, jbossConfig);
ejtt.getNavTree().getNodeByLabel(nodeText, true).click();
@@ -39,7 +39,7 @@
String pageText = client.getPageAsText();
// Whole page contains
- String pageHeaderText = "JBoss AS 5 ("+jbossConfig+")";
+ String pageHeaderText = String.format(AS_NODE_NAME_FORMAT, jbossConfig);
//assertTrue("Page doesn't contain the header: "+headerText, pageText.contains(headerText));
assertTrue("Content doesn't contain the header: "+pageHeaderText,
client.getElement("content").getTextContent().contains(pageHeaderText));
15 years, 5 months
EMBJOPR SVN: r606 - in trunk/jsfunit: src/test/java/org/jboss/jopr/jsfunit/as5/sbm and 3 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-28 13:54:05 -0400 (Tue, 28 Jul 2009)
New Revision: 606
Added:
trunk/jsfunit/testdata/hbn/
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/sbm/ServiceBindingManagerTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
trunk/jsfunit/testdata/ejb3/info.txt
Log:
* ServiceBindingManagerTest updated
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-07-28 17:31:09 UTC (rev 605)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-07-28 17:54:05 UTC (rev 606)
@@ -138,8 +138,8 @@
public static final String NAV_EMB_RAR = "Embedded RARs";
// Non-app resource types.
- public static final String NAV_SBMS = "Service Binding Managers";
- public static final String NAV_SBM = "ServiceBindingManager";
+ public static final String NAV_SBM = "Service Binding Manager";
+ public static final String NAV_SBM_SETS = "Service Binding Sets";
public static final String NAV_JBCACHE = "JBoss Cache";
public static final String NAV_JBCACHES = "JBoss Caches";
public static final String NAV_HBN = "Hibernate";
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/sbm/ServiceBindingManagerTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/sbm/ServiceBindingManagerTest.java 2009-07-28 17:31:09 UTC (rev 605)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/sbm/ServiceBindingManagerTest.java 2009-07-28 17:54:05 UTC (rev 606)
@@ -29,23 +29,23 @@
public void testServiceBindingManagerTest() throws IOException, EmbJoprTestException {
// Go to Service Binding Managers node.
- ejtt.navTree.getNodeByLabel(NAV_SBMS).click();
+ ejtt.navTree.getNodeByLabel(NAV_SBM).click();
// Check that SBM is UP.
- ContentTableRow row = ejtt.tabMenu.getTabContentBox().getFirstTable().getFirstRowContainingLink(NAV_SBM);
- assertEquals(NAV_SBM+" should be UP", "UP", row.getCellTextByColumnName("Status") );
+ ContentTableRow row = ejtt.tabMenu.getTabContentBox().getFirstTable().getFirstRowContainingLink(NAV_SBM_SETS);
+ assertEquals(NAV_SBM_SETS+" should be UP", "UP", row.getCellTextByColumnName("Status") );
// Go to SBM.
- row.getLinkByLabel(NAV_SBM).click();
+ row.getLinkByLabel(NAV_SBM_SETS).click();
// Summary tab
- ContentTable table = ejtt.tabMenu.getTabContentBox().getTableUnderHeader("General Properties");
+ ContentTable table = ejtt.tabMenu.getTabContentBox().getTableUnderHeader(LABEL_GENERAL_PROPERTIES);
ContentInfoTable infoTable = ejtt.getContentInfoTable(table.getElement());
Properties props = infoTable.getProperties();
// Name
- assertEquals("Name should be "+NAV_SBM, NAV_SBM, props.getProperty("Name"));
+ assertEquals("Name should be "+NAV_SBM_SETS, NAV_SBM_SETS, props.getProperty("Name"));
// Version is currently "--"
// Description: The Service Binding Manager manages the ports of the deployed services
@@ -64,7 +64,7 @@
// Go to Service Binding Managers node.
- ejtt.navTree.getNodeByLabel(NAV_SBM).click();
+ ejtt.navTree.getNodeByLabel(NAV_SBM_SETS).click();
// -- Update -- //
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-28 17:31:09 UTC (rev 605)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-28 17:54:05 UTC (rev 606)
@@ -1604,7 +1604,7 @@
private static final String ID_PAGINATION_TOTAL_ITEMS = "paginationTotalItems";
/** Returns the HTML element of the bar with "First | Prev | 1 2 | Next Last" controls. */
- public HtmlDivision getPageContols() throws HtmlElementNotFoundException {
+ public HtmlDivision findPageContols() throws HtmlElementNotFoundException {
//return (HtmlDivision) client.getElement(ID_PAGE_CONTROLS);
HtmlDivision div = (HtmlDivision) getTabMenu().getTabContentBox().getElement()
.getFirstByXPath(".//*[contains(@id, 'SummaryForm:dataTableScroller')]");
@@ -1622,6 +1622,13 @@
return div;
}
+ public HtmlDivision getPageContols() throws HtmlElementNotFoundException {
+ HtmlDivision div = findPageContols();
+ if( null == div)
+ throw new HtmlElementNotFoundException("Page controls not found.", currentTest);
+ return div;
+ }
+
/** Returns the HTML Select element of page size selection. */
public HtmlSelect getPageSizeSelect() throws HtmlElementNotFoundException {
//return (HtmlSelect) client.getElement(ID_PAGE_SIZE_SELECT);
@@ -1638,6 +1645,7 @@
{
Element e = client.getElement(ID_PAGINATION_TOTAL_ITEMS);
String textContent = e.getTextContent();
+ log.debug("Element #"+ID_PAGINATION_TOTAL_ITEMS+" content: "+textContent);
String[] parts = textContent.split(":");
if( parts.length < 2 )
throw new ActionNotAvailableException("Total pagination items count expected after 'Total:' or similar.");
Modified: trunk/jsfunit/testdata/ejb3/info.txt
===================================================================
--- trunk/jsfunit/testdata/ejb3/info.txt 2009-07-28 17:31:09 UTC (rev 605)
+++ trunk/jsfunit/testdata/ejb3/info.txt 2009-07-28 17:54:05 UTC (rev 606)
@@ -2,5 +2,8 @@
* entity-test.jar
* stateless-test.jar
-and some from the EJB3 tutorials: http://www.jboss.org/ejb3/docs.html :
+some from the EJB3 tutorials: http://www.jboss.org/ejb3/docs.html :
* jboss-ejb3-tutorial-mdb.jar
+
+and some from the JBoss Messaging project examples (http://labs.jboss.com/jbossmessaging/ , jbm-examples-1.4.3.zip):
+ * mdb-example.jar
\ No newline at end of file
15 years, 5 months
EMBJOPR SVN: r605 - trunk/jsfunit/testdata/ejb3.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-28 13:31:09 -0400 (Tue, 28 Jul 2009)
New Revision: 605
Added:
trunk/jsfunit/testdata/ejb3/BasicEJB3-bad.jar
Log:
* Added malformed EJB 3.0 jar
Added: trunk/jsfunit/testdata/ejb3/BasicEJB3-bad.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsfunit/testdata/ejb3/BasicEJB3-bad.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 5 months
EMBJOPR SVN: r604 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5: jmsDestinations and 1 other directory.
by embjopr-commits＠lists.jboss.org
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);
15 years, 5 months
EMBJOPR SVN: r603 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-28 13:03:39 -0400 (Tue, 28 Jul 2009)
New Revision: 603
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
Log:
* checkClientAndServerMessages() changed
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-07-28 16:45:23 UTC (rev 602)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-07-28 17:03:39 UTC (rev 603)
@@ -580,11 +580,12 @@
FacesMessage message = server.getFacesMessages().next();
- assertEquals("Incorrect message severity", expectedSeverity, message.getSeverity());
-
assertTrue("Expected message: " + expectedServerMsg + " Actual: "+ message.getDetail(),
message.getDetail().contains(expectedServerMsg));
+ assertEquals("Incorrect message severity. Message: "+message.getSummary(), expectedSeverity, message.getSeverity());
+
+
// Check that the expected message appears on the client side
assertTrue("This expected message was not found on the page: " + expectedClientMsg,
client.getPageAsText().contains(expectedClientMsg));
15 years, 5 months
EMBJOPR SVN: r602 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5/app/ear and 1 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-28 12:45:23 -0400 (Tue, 28 Jul 2009)
New Revision: 602
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java
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/war/WarTest.java
Log:
* EarTest updated - JMX names changed.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java 2009-07-28 16:23:01 UTC (rev 601)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java 2009-07-28 16:45:23 UTC (rev 602)
@@ -119,10 +119,16 @@
{
try {
//String mBeanName = "jboss.j2ee:module=\""+ejbJarName+"\",service=EjbModule";
- //String mBeanName = "jboss.j2ee:module=\""+ejbJarName+"\",*";
+
+ // jboss.j2ee:module="sessiona.jar",service=EjbModule
+ String mBeanName = "jboss.j2ee:module=\""+ejbJarName+"\",*";
+ // id="jboss.j2ee:module="sessiona.jar",service=EjbModule",type=Component
+ //String mBeanName = "jboss.deployment:id="jboss.j2ee:module="sessiona.jar",service=EjbModule",type=Component";
+ //
// rajesh: ozizka, seems to have changed between AS 5.1.Beta1 and CR1. so the test cases should be updated i guess.
// ear=BasicEJB3.jar,jar=BasicEJB3.jar,service=EJB3
- String mBeanName = "jboss.j2ee:ear="+ejbJarName+",jar="+ejbJarName+",service=EJB3";
+ //String mBeanName = "jboss.j2ee:ear="+ejbJarName+",jar="+ejbJarName+",service=EJB3";
+
return isMBeanStateDeployedByQuery(mBeanName);
}
catch (Exception e) {
@@ -151,6 +157,7 @@
/* EAR */
public boolean isEarDeployed(String earName) throws RuntimeException
{
+ //jboss.deployment:id="vfszip:/home/brq/.../jboss-5.0.0.Beta/server/all/deploy/JBossCacheTest-by-fdrabek.ear/",type=Deployment
try {
//String query = "jboss.deployment:id=\"vfszip:" +
// System.getProperty("jsfunit.deploy.dir") + "/" + earName + "/\",*";
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 16:23:01 UTC (rev 601)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-07-28 16:45:23 UTC (rev 602)
@@ -108,9 +108,13 @@
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
// Use JMX to assert that the EAR components really did deploy successfully.
- //id="vfszip:/home/brq/ozizka/JoprEmbedded/jboss-as-5.x/build/output/jboss-5.1.0.Beta1/server/default/deploy/eardeployment.ear/",type=Deployment
- //id="vfszip:/home/ondra/work/JOPRembedded/embjopr-svn-trunk/jsfunit/target/jboss5x/deploy/eardeployment.ear",* not found.
+
+ // id="vfszip:/home/brq/ozizka/JoprEmbedded/jboss-as-5.x/build/output/jboss-5.1.0.Beta1/server/default/deploy/eardeployment.ear/",type=Deployment
+ // id="vfszip:/home/ondra/work/JOPRembedded/embjopr-svn-trunk/jsfunit/target/jboss5x/deploy/eardeployment.ear",* not found.
assertTrue("JMX doesn't report EAR as deployed: eardeployment.ear", isEarDeployed(DEPLOYABLE_NAME));
+ //assertTrue("JMX doesn't report EAR as deployed: eardeployment.ear", ejtt.deployment.isDeployedAccordingToJMX(APP_TYPE, DEPLOYABLE_NAME) );
+
+ // id="jboss.j2ee:module="sessiona.jar",service=EjbModule",type=Component
assertTrue("JMX doesn't report EJB sessiona.jar as deployed.", isEJBDeployed("sessiona.jar"));
assertTrue("JMX doesn't report EJB sessionb.jar as deployed.", isEJBDeployed("sessionb.jar"));
}
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 16:23:01 UTC (rev 601)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-07-28 16:45:23 UTC (rev 602)
@@ -742,14 +742,12 @@
// Undeploy.
log.info("Undeploying "+DEPLOYABLE_NAME);
undeployWAR(DEPLOYABLE_NAME); // EMBJOPR-109 here
- DebugUtils.writeFile("target/DUD_RETRY-undeploy.html", client.getPageAsText());///
assertFalse( "Deployable "+DEPLOYABLE_NAME+" shouldn't be listed as deployed after undeployment.",
ejtt.deployment.isDeployedAccordingToEmbJopr(DeployableTypes.WAR, DEPLOYABLE_NAME, false) );
// Deploy the same war again.
log.info("Deploying "+DEPLOYABLE_NAME+" again.");
deployWarRepeatedly( appFilePath );
- DebugUtils.writeFile("target/DUD_RETRY-deploy.html", client.getPageAsText());///
assertTrue( "Deployable "+DEPLOYABLE_NAME+" should be listed as deployed after deployment.",
ejtt.deployment.isDeployedAccordingToEmbJopr(DeployableTypes.WAR, DEPLOYABLE_NAME, false) );
15 years, 5 months
EMBJOPR SVN: r601 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connectors.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-28 12:23:01 -0400 (Tue, 28 Jul 2009)
New Revision: 601
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connectors/ConnectorsTest.java
Log:
* Connector test - "manual" url parsing - java.net.URL can't handle generic URLs.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connectors/ConnectorsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connectors/ConnectorsTest.java 2009-07-28 16:14:40 UTC (rev 600)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connectors/ConnectorsTest.java 2009-07-28 16:23:01 UTC (rev 601)
@@ -8,6 +8,7 @@
import org.jboss.jopr.jsfunit.*;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.commons.lang.StringUtils;
import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.*;
@@ -63,8 +64,11 @@
Set<String> presentNodeNames = new HashSet(childNodes.size());
for (NavTreeNode navTreeNode : childNodes) {
String nodeLabel = navTreeNode.getLabelLink().getTextContent().trim();
- URL url = new URL(nodeLabel);
- presentNodeNames.add(url.getProtocol());
+ //URL url = new URL(nodeLabel);
+ //presentNodeNames.add(url.getProtocol());
+ // java.net.MalformedURLException: unknown protocol: ajp
+ String protocol = StringUtils.substringBefore( nodeLabel, "://" );
+ presentNodeNames.add( protocol );
}
assertTrue( "Connectors node should contain a subnode for AJP protocol.", presentNodeNames.contains("ajp") );
15 years, 5 months