EMBJOPR SVN: r144 - in trunk/jsfunit: src/test/java/org/jboss/jopr/jsfunit and 3 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-02-11 16:27:13 -0500 (Wed, 11 Feb 2009)
New Revision: 144
Added:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ServerNodeSummaryTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/ActionOutOfSyncException.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/EmbJoprTestException.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/HtmlElementNotFoundException.java
Removed:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AssertException.java
Modified:
trunk/jsfunit/
trunk/jsfunit/pom.xml
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/DatasourceTest.java
Log:
ServerNodeSummaryTest
Property changes on: trunk/jsfunit
___________________________________________________________________
Name: svn:ignore
- target
+ nb-configuration.xml
target
nbactions.xml
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-02-06 21:23:36 UTC (rev 143)
+++ trunk/jsfunit/pom.xml 2009-02-11 21:27:13 UTC (rev 144)
@@ -321,7 +321,11 @@
<include>**/as5/*Test.java</include>
<include>**/jsfunit/*Test.java</include>
</includes>
- <excludes><exclude>**/as4/**</exclude></excludes>
+ <excludes>
+ <exclude>**/as4/**</exclude>
+ <!-- Temporarily disable as it fails now -->
+ <exclude>**/*ServerNodeSummaryTest*</exclude>
+ </excludes>
<systemProperties>
<property>
<name>cactus.contextURL</name>
Deleted: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AssertException.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AssertException.java 2009-02-06 21:23:36 UTC (rev 143)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AssertException.java 2009-02-11 21:27:13 UTC (rev 144)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.jopr.jsfunit;
-
-
-/**
- *
- * @author ondra
- */
-public class AssertException extends Exception {
-
- public AssertException(Throwable cause) {
- super(cause);
- }
-
- public AssertException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public AssertException(String message) {
- super(message);
- }
-
- public AssertException() {
- }
-
-}
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-02-06 21:23:36 UTC (rev 143)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-02-11 21:27:13 UTC (rev 144)
@@ -22,6 +22,7 @@
package org.jboss.jopr.jsfunit;
+import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
import com.gargoylesoftware.htmlunit.html.*;
import java.io.IOException;
import junit.framework.Test;
@@ -185,7 +186,7 @@
/**
* Delete the datasource given by datasourceName.
*/
- protected abstract void deleteDatasource(String datasourceName) throws IOException, AssertException;
+ protected abstract void deleteDatasource(String datasourceName) throws IOException, EmbJoprTestException;
/**
* Use JMX to check if the datasource given by datasourceName is deployed.
@@ -394,7 +395,7 @@
* Create a new datasource. Leave some property values, that aren't
* required, unset.
*/
- public void testCreateDatasource() throws IOException, AssertException {
+ public void testCreateDatasource() throws IOException, EmbJoprTestException {
// The properties we want to configure
@@ -635,7 +636,7 @@
/**
* Check that the metrics are correct after creating a new datasource.
*/
- public void testMetricsAfterDatasourceCreation() throws IOException, AssertException {
+ public void testMetricsAfterDatasourceCreation() throws IOException, EmbJoprTestException {
// Min pool size will be 5, max pool size will be 20
Map<String, String> propertiesMap = createLocalTXDatasource("MetricsCreateDS");
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-02-06 21:23:36 UTC (rev 143)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-02-11 21:27:13 UTC (rev 144)
@@ -22,6 +22,7 @@
package org.jboss.jopr.jsfunit;
+import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
import com.gargoylesoftware.htmlunit.BrowserVersion;
import com.gargoylesoftware.htmlunit.html.*;
import java.io.IOException;
@@ -386,13 +387,13 @@
* @param name
* @return
*/
- public String getDetailsRowValue(String name) throws AssertException {
+ public String getDetailsRowValue(String name) throws EmbJoprTestException {
HtmlDivision contentDiv = (HtmlDivision) client.getElement("content");
List<?> valueTDs = contentDiv.getByXPath(
".//div[@class='tabmenubox']//td[contains(text(),'"+name+"']/following-sibling::td[1]");
//assertTrue( name + " row not found.", valueTDs.size() == 1 );
if( valueTDs.size() == 1 )
- throw new AssertException( name + " row not found." );
+ throw new EmbJoprTestException( name + " row not found." );
String value = ((HtmlTableCell) valueTDs).getTextContent();
return value;
}
@@ -403,11 +404,11 @@
* Assertion fails if the element is not found.
* @return
*/
- public HtmlElement getContentElement() throws AssertException {
+ public HtmlElement getContentElement() throws EmbJoprTestException {
HtmlElement contentElement = (HtmlElement)client.getElement("content");
//assertNotNull("Content <div> not found.", contentElement);
if( null == contentElement )
- throw new AssertException( "Content <div> not found." );
+ throw new EmbJoprTestException( "Content <div> not found." );
return contentElement;
}
@@ -416,7 +417,7 @@
* @param sXPath
* @return
*/
- public List<? extends HtmlElement> getElementsByXPath(String sXPath ) throws AssertException {
+ public List<? extends HtmlElement> getElementsByXPath(String sXPath ) throws EmbJoprTestException {
//return (List<? extends HtmlElement>) getContentElement().getByXPath(sXPath);
return getElementsByXPath( getContentElement(), sXPath );
}
@@ -429,10 +430,10 @@
*/
public List<? extends HtmlElement> getElementsByXPath(
HtmlElement xPathContextElement, String sXPath )
- throws AssertException
+ throws EmbJoprTestException
{
if( null == xPathContextElement ){
- throw new AssertException("Given XPath context element is null.");
+ throw new EmbJoprTestException("Given XPath context element is null.");
}
return (List<? extends HtmlElement>) xPathContextElement.getByXPath(sXPath);
@@ -443,7 +444,7 @@
* @param sXPath
* @returns The first of elements found, or null when XPath expr. found none.
*/
- public HtmlElement findFirstElementByXPath( HtmlElement xPathContext, String sXPath ) throws AssertException {
+ public HtmlElement findFirstElementByXPath( HtmlElement xPathContext, String sXPath ) throws EmbJoprTestException {
List<? extends HtmlElement> elementsByXPath = getElementsByXPath(xPathContext, sXPath);
if( elementsByXPath.size() == 0 ){
@@ -463,11 +464,11 @@
* @throws XPathException when the expression found no elements.
*/
public HtmlElement getFirstElementByXPath( HtmlElement xPathContext, String sXPath )
- throws AssertException
+ throws EmbJoprTestException
{
HtmlElement e = findFirstElementByXPath(xPathContext, sXPath);
if( null == e ){
- throw new AssertException("XPath expression found no elements: "+sXPath);
+ throw new EmbJoprTestException("XPath expression found no elements: "+sXPath);
}
return e;
}
@@ -477,7 +478,7 @@
* @param sXPath
* @return
*/
- public HtmlElement getFirstElementByXPath( String sXPath ) throws AssertException{
+ public HtmlElement getFirstElementByXPath( String sXPath ) throws EmbJoprTestException{
return getFirstElementByXPath( getContentElement(), sXPath );
}
@@ -488,18 +489,18 @@
* @return
* @throws org.jboss.jopr.jsfunit.AssertException
*/
- public HtmlInput getFormInputByRowName(String sRowName) throws AssertException {
+ public HtmlInput getFormInputByRowName(String sRowName) throws EmbJoprTestException {
try {
HtmlInput input = (HtmlInput) getFirstElementByXPath(
getTabMenuBoxElement(),
".//td[contains(text(),'"+sRowName+"')]/following-sibling::td[@class='property-value-cell']//input"
);
if( null == input ){
- throw new AssertException("Input for value "+sRowName+" not found.");
+ throw new EmbJoprTestException("Input for value "+sRowName+" not found.");
}
return input;
}
- catch(AssertException ex){
+ catch(EmbJoprTestException ex){
//throw new AssertException("Row with name \""+sRowName+"\" not found.", ex);
throw ex;
}
@@ -514,14 +515,14 @@
* @return
* @throws org.jboss.jopr.jsfunit.AssertException
*/
- public HtmlTableRow getRowByName(String sRowName) throws AssertException {
+ public HtmlTableRow getRowByName(String sRowName) throws EmbJoprTestException {
HtmlTableRow row = (HtmlTableRow) getFirstElementByXPath(
getTabMenuBoxElement(),
".//td[contains(string(),'"+sRowName+"')]/ancestor::tr" );
if( null == row ){
- throw new AssertException("Row with label "+sRowName+" not found.");
+ throw new EmbJoprTestException("Row with label "+sRowName+" not found.");
}
return row;
}
@@ -534,7 +535,7 @@
* @return
* @throws org.jboss.jopr.jsfunit.AssertException
*/
- public HtmlElement getTabMenuBoxElement() throws AssertException {
+ public HtmlElement getTabMenuBoxElement() throws EmbJoprTestException {
return getFirstElementByXPath(".//div[@class='tabmenubox' or @class='notabmenubox']");
}
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/DatasourceTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/DatasourceTest.java 2009-02-06 21:23:36 UTC (rev 143)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/DatasourceTest.java 2009-02-11 21:27:13 UTC (rev 144)
@@ -22,6 +22,7 @@
package org.jboss.jopr.jsfunit.as4;
+import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.jboss.jopr.jsfunit.*;
@@ -121,7 +122,7 @@
/**
* Delete the datasource given by datasourceName.
*/
- protected void deleteDatasource(String datasourceName) throws IOException, AssertException {
+ protected void deleteDatasource(String datasourceName) throws IOException, EmbJoprTestException {
HtmlAnchor datasourceLink = getNavTreeLink("Datasources");
datasourceLink.click();
//HtmlButtonInput deleteButton = getDeleteButton("resourceSummaryForm", datasourceName); /*categorySummaryForm*/
@@ -129,7 +130,7 @@
try {
((HtmlInput) getFirstElementByXPath(getRowByName(datasourceName),
".//input[ @value = 'Delete' ]")).click();
- } catch (AssertException ex) {
+ } catch (EmbJoprTestException ex) {
Logger.getLogger(DatasourceTest.class.getName()).log(Level.SEVERE, null, ex);
throw ex;
}
@@ -175,7 +176,7 @@
* required unset.
*/
@Override
- public void testCreateDatasource() throws IOException, AssertException {
+ public void testCreateDatasource() throws IOException, EmbJoprTestException {
/* // Works
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ServerNodeSummaryTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ServerNodeSummaryTest.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ServerNodeSummaryTest.java 2009-02-11 21:27:13 UTC (rev 144)
@@ -0,0 +1,346 @@
+package org.jboss.jopr.jsfunit.as5;
+
+import org.jboss.jopr.jsfunit.exceptions.HtmlElementNotFoundException;
+import org.jboss.jopr.jsfunit.exceptions.ActionOutOfSyncException;
+import com.gargoylesoftware.htmlunit.html.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.URL;
+import java.net.UnknownHostException;
+import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
+import org.jboss.jopr.jsfunit.EmbjoprTestCase;
+
+
+/**
+ * Tests the initial screen - the root node's Summary, Metrics and Control tab.
+ *
+ * @author ondra
+ */
+public class ServerNodeSummaryTest extends EmbjoprTestCase {
+
+ /**
+ * Checks the summary tab contents.
+ */
+ public void testSummary() throws EmbJoprTestException {
+
+ try{
+
+ new NavTree().clickRootNode();
+
+ //if( !tabMenu.isTabActive("Summary")) // we can click either
+ tabMenu.clickTab("Summary");
+
+
+ //HtmlElement box = tabMenu.getTabContentBox().getElement();
+
+ helpers.checkSummaryValue( "Name", helpers.getLocalHostName() );
+ helpers.checkSummaryValue( "OS Name", System.getProperty("os.name") );
+ helpers.checkSummaryValue( "OS Version", System.getProperty("os.version") );
+ helpers.checkSummaryValue( "OS Architecture", System.getProperty("os.arch") );
+
+
+ // $ cat /proc/version
+ // Linux version 2.6.18-92.1.18.el5xen (brewbuilder(a)hs20-bc2-4.build.redhat.com) (gcc version 4.1.2 20071124 (Red Hat 4.1.2-42)) #1 SMP Wed Nov 5 09:15:48 EST 2008
+
+
+ // $ cat /etc/redhat-release
+ // Red Hat Enterprise Linux Server release 5.2 (Tikanga)
+ try{
+ String rhRelease = executeProcessAndGetOutput("cat /etc/redhat-release");
+ String distName = helpers.getSummaryValue("Distribution Name").trim();
+ String distVersion = helpers.getSummaryValue("Distribution Version").trim();
+ assertEquals( rhRelease, distName + " " + distVersion );
+ }
+ catch( IOException ex ){
+ // cat not found or similar.
+ // When file not found, just returns emty string.
+ }
+
+ }
+ catch( IOException ex ){
+ throw new EmbJoprTestException(ex);
+ }
+
+ }// testSummary()
+
+
+
+ /**
+ * Checks the Metrics tab contents.
+ * Not much to do here - same values as in Summary.
+ */
+ /*public void testMetrics() throws AssertException {
+
+ }/**/
+
+
+
+ /**
+ * Checks the Manual Autorediscovery feature of the Control tab.
+ */
+ public void testControlManualAutodiscovery() throws EmbJoprTestException {
+
+ try{
+
+ navTree.clickRootNode();
+ tabMenu.clickTab("Control");
+ TabContentBox box = tabMenu.getTabContentBox();
+
+ HtmlButton button = box.getButtonByLabel("Manual Autodiscovery");
+ button.click();
+
+ // TODO: check the result.
+
+ }
+ catch( IOException ex ){
+ throw new EmbJoprTestException(ex);
+ }
+
+ }
+
+
+
+
+ /**
+ * Checks the Manual Autorediscovery feature of the Control tab.
+ */
+ public void testControlViewProcessList() throws EmbJoprTestException {
+
+ try{
+
+ navTree.clickRootNode();
+ tabMenu.clickTab("Control");
+ TabContentBox box = tabMenu.getTabContentBox();
+
+ HtmlButton button = box.getButtonByLabel("View Process List");
+ button.click();
+
+ // TODO: check the result.
+
+ }
+ catch( IOException ex ){
+ throw new EmbJoprTestException(ex);
+ }
+
+ }
+
+
+
+
+
+
+
+
+
+ Helpers helpers = new Helpers();
+
+ /**
+ * Helper mathods for this test.
+ */
+ class Helpers {
+
+
+ /**
+ * Gets the string value from the summary table.
+ * @param name
+ * @return
+ * @throws org.jboss.jopr.jsfunit.AssertException
+ */
+ private String getSummaryValue(String name) throws EmbJoprTestException{
+ HtmlElement box = tabMenu.getTabContentBox().getElement();
+ String xPath = "//td/span/strong[contains(string(), '"+name+":')]/ancestor::td[1]";
+ HtmlElement tableCell = (HtmlElement) box.getFirstByXPath(xPath);
+ if( null == tableCell )
+ throw new EmbJoprTestException("Value for '"+name+"' not found using XPath: "+xPath);
+
+ String actualValue = tableCell.getTextContent();
+ return actualValue;
+
+ }
+
+ private void checkSummaryValue(String name, String expectedValue ) throws EmbJoprTestException {
+ String actualValue = getSummaryValue(name);
+ assertTrue( actualValue.trim().endsWith(expectedValue) );
+ }
+
+
+ private String getLocalHostName() throws UnknownHostException {
+ InetAddress addr = InetAddress.getLocalHost();
+ return addr.getHostName();
+ }
+
+ }
+
+
+
+ /**
+ * Intended to read files like "cat /proc/version" etc.
+ * Returns the content of whole file.
+ *
+ * @returns the content of whole file.
+ */
+ private static String executeProcessAndGetOutput( String command ) throws IOException {
+
+ Process exec = Runtime.getRuntime().exec( command );
+ InputStream inputStream = exec.getInputStream();
+ BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+ StringBuilder sb = new StringBuilder();
+
+ do{
+ String s = bufferedReader.readLine();
+ if( null == s )
+ break;
+ sb.append(s);
+ } while( false );
+
+ return sb.toString();
+
+ }
+
+
+
+
+
+
+
+
+ // TODO: Move to EmbJopr base class? Or make some order there?
+
+
+ private NavTree navTree = new NavTree();
+
+ /**
+ * Inner class to encapsulate navigation tree operations.
+ */
+ class NavTree {
+
+ private void clickRootNode() throws IOException {
+ DomElement element = (DomElement)client.getElement("navTreeForm");
+ HtmlAnchor rootNodeLink = element.getFirstByXPath("//a[@id='navTreeForm:navTree:2::homeLink']");
+ rootNodeLink.click();
+ }
+
+ }
+
+
+
+
+
+ private final TabMenu tabMenu = new TabMenu();
+
+ /**
+ * Inner class to encapsulate tab menu operations.
+ */
+ class TabMenu {
+
+ public TabContentBox getTabContentBox() throws EmbJoprTestException {
+
+ HtmlElement contentElement = (HtmlElement) client.getElement("content");
+ HtmlElement tabContentBox = (HtmlElement) contentElement.getByXPath("div[@class='tabmenubox']");
+ if( null == tabContentBox )
+ throw new EmbJoprTestException("Tab content box not found using div[@class='tabmenubox'] XPath");
+
+ return new TabContentBox(tabContentBox);
+ }
+
+ public StyledElement getTab( String label ) throws EmbJoprTestException {
+
+ DomElement element = (DomElement)client.getElement("tabmenu");
+ StyledElement tabContent = element.getFirstByXPath(
+ "ul/li/span[string()='"+label+"'] | ul/li/a[string()='"+label+"']");
+
+ if( null == tabContent )
+ throw new EmbJoprTestException("No such tab: "+label);
+
+ return tabContent;
+
+ }
+
+ public boolean isTabActive( String label ) throws IOException, EmbJoprTestException {
+
+ StyledElement tabContent = getTab(label);
+ return "span".equals( tabContent.getTagName() )
+ && tabContent.getClassAttribute().contains("active");
+ }
+
+
+ public boolean isTabDisabled( String label ) throws EmbJoprTestException {
+ StyledElement tabContent = getTab(label);
+ return "span".equals( tabContent.getTagName() )
+ && tabContent.getClassAttribute().contains("disabled");
+ }
+
+ public void clickTab( String label ) throws IOException, EmbJoprTestException {
+
+ StyledElement tabContent = getTab(label);
+
+ //if( !"a".equals( tabContent.getTagName() ) )
+ //if( !( tabContent instanceof HtmlAnchor ) )
+ // throw new AssertException("Tab is not an anchor: "+label);
+
+ if( !( tabContent instanceof ClickableElement ) )
+ throw new EmbJoprTestException("Tab element <"+tabContent.getTagName()+"> is not clickable: "+label);
+
+ ((ClickableElement)tabContent).click();
+
+ }
+
+ }
+
+
+ /**
+ * Inner class for manipulation with tab content box.
+ */
+ class TabContentBox {
+
+ private HtmlElement box;
+ private URL validForURL;
+ private String validForDate;
+
+ public HtmlElement getElement() { return box; }
+
+
+
+ public TabContentBox(HtmlElement box) {
+ this.box = box;
+
+ // TODO: Check whether the page changed;
+ this.validForDate = client.getContentPage().getWebResponse().getResponseHeaderValue("Date");
+ this.validForURL = client.getContentPage().getWebResponse().getUrl();
+ }
+
+
+ public void checkIfStillValid() throws ActionOutOfSyncException {
+
+ String validForDate = client.getContentPage().getWebResponse().getResponseHeaderValue("Date");
+ URL validForURL = client.getContentPage().getWebResponse().getUrl();
+
+ if( !validForDate.equals(this.validForDate) ||
+ !validForURL.equals(this.validForURL) )
+ {
+ throw new ActionOutOfSyncException(
+ "This tab content box was created from another page and is not valid now.");
+ }
+ }
+
+ public HtmlButton getButtonByLabel( String label )
+ throws HtmlElementNotFoundException, ActionOutOfSyncException {
+
+ checkIfStillValid();
+
+ HtmlButton button = this.box.getFirstByXPath("//input[@value='"+label+"']");
+ if( null == button )
+ throw new HtmlElementNotFoundException("Button labelled '"+label+"' not found.");
+
+ return button;
+
+ }
+
+ }
+
+
+
+}
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/ActionOutOfSyncException.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/ActionOutOfSyncException.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/ActionOutOfSyncException.java 2009-02-11 21:27:13 UTC (rev 144)
@@ -0,0 +1,30 @@
+package org.jboss.jopr.jsfunit.exceptions;
+
+/**
+ * Signalizes that there was an action performed
+ * that was out of context - e.g. clicking on a button
+ * that was a part of a HTML page that's already gone.
+ *
+ *
+ * @author ondra
+ */
+public class ActionOutOfSyncException extends EmbJoprTestException {
+
+ public ActionOutOfSyncException() {
+ }
+
+ public ActionOutOfSyncException(String message) {
+ super(message);
+ }
+
+ public ActionOutOfSyncException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public ActionOutOfSyncException(Throwable cause) {
+ super(cause);
+ }
+
+
+
+}
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/EmbJoprTestException.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/EmbJoprTestException.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/EmbJoprTestException.java 2009-02-11 21:27:13 UTC (rev 144)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jopr.jsfunit.exceptions;
+
+
+/**
+ * Root Exception for Exceptions thrown in Embedded Jopr tests.
+ * Used to distinguish "expected" exceptions from those unhandled / unexpected.
+ *
+ * @author ondra
+ */
+public class EmbJoprTestException extends Exception {
+
+ public EmbJoprTestException(Throwable cause) {
+ super(cause);
+ }
+
+ public EmbJoprTestException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public EmbJoprTestException(String message) {
+ super(message);
+ }
+
+ public EmbJoprTestException() {
+ }
+
+}
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/HtmlElementNotFoundException.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/HtmlElementNotFoundException.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/HtmlElementNotFoundException.java 2009-02-11 21:27:13 UTC (rev 144)
@@ -0,0 +1,27 @@
+package org.jboss.jopr.jsfunit.exceptions;
+
+import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
+
+/**
+ *
+ * @author ondra
+ */
+public class HtmlElementNotFoundException extends EmbJoprTestException {
+
+ public HtmlElementNotFoundException() {
+ }
+
+ public HtmlElementNotFoundException(String message) {
+ super(message);
+ }
+
+ public HtmlElementNotFoundException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public HtmlElementNotFoundException(Throwable cause) {
+ super(cause);
+ }
+
+
+}
15 years, 4 months
- 1
- 0
EMBJOPR SVN: r143 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as4 and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-02-06 16:23:36 -0500 (Fri, 06 Feb 2009)
New Revision: 143
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/
Log:
Added conversion of possibly double values from decimal coma to decimal dot.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-02-06 20:18:26 UTC (rev 142)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-02-06 21:23:36 UTC (rev 143)
@@ -971,6 +971,7 @@
String metricName = (String)i.next();
String expected = metricsMap.get(metricName);
String actual = getMetricValueFromTable(metricName, "dataTable");
+ actual = normalizeIfDoubleExpected(expected, actual); // Some LOCALEs encode doubles with coma.
assertEquals("Incorrect metric value for '"+metricName+"'='"+actual+"'," +
" expected '"+expected+"'", expected, actual);
}
@@ -987,6 +988,7 @@
String metricName = (String)i.next();
String expected = metricsMap.get(metricName);
String actual = getMetricValueFromTable(metricName, "dataTable");
+ actual = normalizeIfDoubleExpected(expected, actual); // Some LOCALEs encode doubles with coma.
assertEquals("Incorrect summary metric value for '"+metricName+"'='"+actual+"'," +
" expected '"+expected+"'", expected, actual);
}
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-02-06 20:18:26 UTC (rev 142)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-02-06 21:23:36 UTC (rev 143)
@@ -564,6 +564,40 @@
}
}
+
+
+ /**
+ * Checks whether given string looks like a double in terms of Java's Double,
+ * i.e. /<digit>+(\.<digit>+)?/
+ * @param value The string to check.
+ * @returns true if the
+ */
+ protected boolean looksLikeDouble(String value) {
+ try{
+ Double.parseDouble(value);
+ }catch(NumberFormatException ex){
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * If both expected and actual string look like a double,
+ * returns normalized double (with a decimal dot);
+ * Otherwise, returns original actual value.
+ * @param expected
+ * @param actual
+ */
+ protected String normalizeIfDoubleExpected(String expected, String actual) {
+ //return looksLikeDouble(expected) ? actual.replace(',', '.') : actual;
+
+ if( !looksLikeDouble(expected) )
+ return actual;
+
+ String converted = actual.replace(',', '.');
+ return looksLikeDouble(converted) ? converted : actual;
+ }
+
}
Property changes on: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4
___________________________________________________________________
Name: svn:ignore
+ HelloJoprTest.java
ManipulationTest.java
ClientUtil.java
15 years, 4 months
- 1
- 0
EMBJOPR SVN: r142 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-02-06 15:18:26 -0500 (Fri, 06 Feb 2009)
New Revision: 142
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
Log:
Added: Java version, vendor and home dir logged in setUp()
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-02-06 20:14:29 UTC (rev 141)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-02-06 20:18:26 UTC (rev 142)
@@ -66,7 +66,13 @@
*/
public void setUp() throws IOException
{
- // JBoss as version
+
+ // JVM version
+ log.info("Java version: "+System.getProperty("java.version") + "," +
+ " vendor: " +System.getProperty("java.vendor"));
+ log.info("Java home: " +System.getProperty("java.home"));
+
+ // JBoss AS version
String version = Package.getPackage("org.jboss.system.server")
.getImplementationVersion();
log.info("Detected AS version: " + version);
@@ -173,13 +179,12 @@
String[] idElements = id.split(":");
String rowNum = idElements[idElements.length - 2];
return ((HtmlTableCell)client.getElement(rowNum
- + ":measurementValue")).asText();
+ + ":measurementValue")).asText();
}
}
- throw new IllegalStateException("Value of '" + metricName
- + "' not found.");
+ throw new IllegalStateException("Value of '"+metricName+"' not found.");
}
/**
15 years, 4 months
- 1
- 0
EMBJOPR SVN: r141 - trunk/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-02-06 15:14:29 -0500 (Fri, 06 Feb 2009)
New Revision: 141
Modified:
trunk/jsfunit/pom.xml
Log:
Correcting typo in AS 4's config home
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-02-06 20:12:35 UTC (rev 140)
+++ trunk/jsfunit/pom.xml 2009-02-06 20:14:29 UTC (rev 141)
@@ -144,7 +144,7 @@
<configuration>
<!-- Set where the configuration dir will be. -->
<type>standalone</type>
- <home>target/jboss5x</home>
+ <home>target/jboss4.2</home>
<properties>
<cargo.java.home>${JAVA_HOME}</cargo.java.home>
</properties>
15 years, 4 months
- 1
- 0
EMBJOPR SVN: r140 - trunk/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-02-06 15:12:35 -0500 (Fri, 06 Feb 2009)
New Revision: 140
Modified:
trunk/jsfunit/pom.xml
Log:
Added to AS configuration:
* server.xml - HTTP logging enabled
* jboss-log4j.xml - logging limited
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-02-06 19:45:05 UTC (rev 139)
+++ trunk/jsfunit/pom.xml 2009-02-06 20:12:35 UTC (rev 140)
@@ -130,21 +130,30 @@
<container>
<containerId>jboss42x</containerId>
<home>${JBOSS_HOME}</home>
- <!-- JVM location; currently doesn't work and isn't documented.
- I even don't know whether it should be here or on the other place. -->
- <!--<cargo.java.home>${JAVA_HOME}</cargo.java.home>-->
<log>${basedir}/target/jboss4.2.logs/cargo.log</log>
<timeout>300000</timeout> <!-- 5 minutes -->
<systemProperties>
- <!-- snoops request and response from client side
- result is in server.log
+ <!-- snoops request and response from client side result is in server.log
<jsfunit.htmlunitsnooper>enabled</jsfunit.htmlunitsnooper> -->
<jsfunit.testdata>${basedir}/testdata</jsfunit.testdata>
<jsfunit.deploy.dir>${basedir}/target/jboss42x/deploy</jsfunit.deploy.dir>
- <!-- JVM location; see above. -->
- <!--<cargo.java.home>${JAVA_HOME}</cargo.java.home>-->
</systemProperties>
</container>
+
+ <!-- Container configuration -->
+ <configuration>
+ <!-- Set where the configuration dir will be. -->
+ <type>standalone</type>
+ <home>target/jboss5x</home>
+ <properties>
+ <cargo.java.home>${JAVA_HOME}</cargo.java.home>
+ </properties>
+ <!-- Override Cargo's default files (some taken from cargo's .jar, some from 'default') -->
+ <configfiles>
+ </configfiles>
+ </configuration>
+ <!-- /Container configuration -->
+
</configuration>
<executions>
<execution>
@@ -249,17 +258,26 @@
<!-- TODO: Prepend ${basedir}/ and test; Copy to AS 4 and test.-->
<type>standalone</type>
<home>target/jboss5x</home>
- <!-- Raise permgen size, allow classes unloading and permgen sweep -->
<properties>
- <cargo.jvmargs>-XX:PermSize=512m -XX:MaxPermSize=1024 -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled</cargo.jvmargs>
+ <cargo.java.home>${JAVA_HOME}</cargo.java.home>
+ <!-- Raise permgen size, allow classes unloading and permgen sweep -->
+ <cargo.jvmargs>-XX:PermSize=128m -XX:MaxPermSize=128</cargo.jvmargs>
+ <!-- -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled -->
+ <!-- <com.sun.management.jmxremote></com.sun.management.jmxremote> -->
</properties>
- <!-- Override Cargo's default jboss-log4j.xml -->
+ <!-- Override Cargo's default files (some taken from cargo's .jar, some from 'default') -->
<configfiles>
+ <!-- Limit logging -->
<configfile>
- <file>${JBOSS_HOME}/server/default/conf/jboss-log4j.xml</file>
+ <file>${basedir}/testdata/jboss-configuration/conf/jboss-log4j.xml</file>
<tofile>conf/jboss-log4j.xml</tofile>
</configfile>
+ <!-- Open Tomcat's HTTP logging valve -->
<configfile>
+ <file>${basedir}/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml</file>
+ <tofile>deploy/jbossweb.sar/server.xml</tofile>
+ </configfile>
+ <configfile>
<file>${basedir}/testdata/datasources/MultipleDatasources-ds.xml</file>
<toFile>deploy/MultipleDatasources-ds.xml</toFile>
</configfile>
@@ -323,6 +341,17 @@
</build>
</profile>
+ <!-- Hudson profile (commented - hesitating to hard-code version dir to pom.xml)
+ <profile>
+ <id>running-in-hudson</id>
+ <activation>
+ <property><name>user.name</name><value>hudson</value></property>
+ </activation>
+ <properties>
+ <JBOSS_HOME>${basedir}/jbossas-5.x/build/output/jboss-5.1.0.Beta1</JBOSS_HOME>
+ </properties>
+ </profile>-->
+
</profiles>
15 years, 4 months
- 1
- 0
EMBJOPR SVN: r139 - in trunk/jsfunit/testdata: jboss-configuration and 3 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-02-06 14:45:05 -0500 (Fri, 06 Feb 2009)
New Revision: 139
Added:
trunk/jsfunit/testdata/jboss-configuration/
trunk/jsfunit/testdata/jboss-configuration/conf/
trunk/jsfunit/testdata/jboss-configuration/conf/jboss-log4j.xml
trunk/jsfunit/testdata/jboss-configuration/deploy/
trunk/jsfunit/testdata/jboss-configuration/deploy/jbossweb.sar/
trunk/jsfunit/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml
Log:
listSystemProperties() - removing Properties.stringPropertyNames() call - avail. in JDK 1.6
Added: trunk/jsfunit/testdata/jboss-configuration/conf/jboss-log4j.xml
===================================================================
--- trunk/jsfunit/testdata/jboss-configuration/conf/jboss-log4j.xml (rev 0)
+++ trunk/jsfunit/testdata/jboss-configuration/conf/jboss-log4j.xml 2009-02-06 19:45:05 UTC (rev 139)
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 64096 2007-07-17 14:36:23Z stan.silvert(a)jboss.com $ -->
+
+<!--
+ | For more configuration information and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="false"/>
+ <!--
+ Set the threshold via a system property. Note this is parsed by log4j,
+ so the full JBoss system property format is not supported; e.g.
+ setting a default via ${jboss.server.log.threshold:WARN} will not work.
+ -->
+ <param name="Threshold" value="${jboss.server.log.threshold}"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] (Thread) Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- A size based file rolling appender
+ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ====================== -->
+ <!-- More Appender examples -->
+ <!-- ====================== -->
+
+ <!-- Buffer events and log them asynchronously
+ <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <appender-ref ref="FILE"/>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="SMTP"/>
+ </appender>
+ -->
+
+ <!-- EMail events to an administrator
+ <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="To" value="admin(a)myhost.domain.com"/>
+ <param name="From" value="nobody(a)myhost.domain.com"/>
+ <param name="Subject" value="JBoss Sever Errors"/>
+ <param name="SMTPHost" value="localhost"/>
+ <param name="BufferSize" value="10"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Syslog events
+ <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Facility" value="LOCAL7"/>
+ <param name="FacilityPrinting" value="true"/>
+ <param name="SyslogHost" value="localhost"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Log events to JMS (requires a topic to be created)
+ <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+ <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+ </appender>
+ -->
+
+ <!-- Log events through SNMP
+ <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
+ <param name="ManagementHost" value="127.0.0.1"/>
+ <param name="ManagementHostTrapListenPort" value="162"/>
+ <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
+ <param name="LocalIPAddress" value="127.0.0.1"/>
+ <param name="LocalTrapSendPort" value="161"/>
+ <param name="GenericTrapType" value="6"/>
+ <param name="SpecificTrapType" value="12345678"/>
+ <param name="CommunityString" value="public"/>
+ <param name="ForwardStackTraceWithTrap" value="true"/>
+ <param name="Threshold" value="DEBUG"/>
+ <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Emit events as JMX notifications
+ <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+
+ <param name="Threshold" value="WARN"/>
+ <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Security AUDIT Appender
+ <appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/audit.log"/>
+ <param name="Append" value="true"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+
+
+ <!-- === Embedded Jopr related === -->
+
+ <!-- We don't care about CSS errors, do we? This cluttered log with CSS warning. -->
+ <category name="com.gargoylesoftware.htmlunit.DefaultCssErrorHandler">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- We care much about JOPR and JSFUnit tests. -->
+ <category name="org.jboss.jopr.jsfunit">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.jboss.on.embedded">
+ <priority value="DEBUG"/>
+ </category>
+
+
+
+
+
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit JSF logging to DEBUG. FINER and FINEST will not be logged -->
+ <category name="javax.enterprise.resource.webcontainer.jsf">
+ <priority value="INFO" />
+ </category>
+
+ <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+ <category name="jacorb">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Set the logging level of the JSF implementation -->
+ <category name="javax.enterprise.resource.webcontainer.jsf">
+ <priority value="INFO" />
+ </category>
+
+ <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
+ <category name="org.quartz">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit JBoss categories
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+ -->
+
+ <!-- Limit the JSR77 categories -->
+ <category name="org.jboss.management">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
+ <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!-- Category specifically for Security Audit Provider
+ <category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false">
+ <priority value="TRACE"/>
+ <appender-ref ref="AUDIT"/>
+ </category>
+ -->
+
+ <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
+ <category name="org.jboss.serial">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Decrease the priority threshold for the org.jboss.varia category
+ <category name="org.jboss.varia">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <!-- Enable JBossWS message tracing
+ <category name="org.jboss.ws.core.MessageTrace">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!--
+ | An example of enabling the custom TRACE level priority that is used
+ | by the JBoss internals to diagnose low level details. This example
+ | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+ | subpackages. This will produce A LOT of logging output.
+ |
+ | Note: since jboss AS 4.2.x, the trace level is supported natively by
+ | log4j, so although the custom org.jboss.logging.XLevel priority will
+ | still work, there is no need to use it. The two examples that follow
+ | will both enable trace logging.
+ <category name="org.jboss.system">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ <category name="org.jboss.ejb.plugins">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!--
+ | Logs these events to SNMP:
+ - server starts/stops
+ - cluster evolution (node death/startup)
+ - When an EJB archive is deployed (and associated verified messages)
+ - When an EAR archive is deployed
+
+ <category name="org.jboss.system.server.Server">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.deployment.MainDeployer">
+ <priority value="ERROR" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.ejb.EJBDeployer">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.deployment.EARDeployer">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+ -->
+
+ <!-- Clustering logging -->
+ <!-- Uncomment the following to redirect the org.jgroups and
+ org.jboss.ha categories to a cluster.log file.
+
+ <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ <category name="org.jgroups">
+ <priority value="DEBUG" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+ <category name="org.jboss.ha">
+ <priority value="DEBUG" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Added: trunk/jsfunit/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml
===================================================================
--- trunk/jsfunit/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml (rev 0)
+++ trunk/jsfunit/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml 2009-02-06 19:45:05 UTC (rev 139)
@@ -0,0 +1,167 @@
+<Server>
+
+ <!-- Optional listener which ensures correct init and shutdown of APR,
+ and provides information if it is not installed -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+ <Listener className="org.apache.catalina.core.JasperListener" />
+
+ <Service name="jboss.web">
+
+ <!-- A HTTP/1.1 Connector on port 8080 -->
+ <Connector protocol="HTTP/1.1" port="8080" address="${jboss.bind.address}"
+ connectionTimeout="20000" redirectPort="8443" />
+
+ <!-- Add this option to the connector to avoid problems with
+ .NET clients that don't implement HTTP/1.1 correctly
+ restrictedUserAgents="^.*MS Web Services Client Protocol 1.1.4322.*$"
+ -->
+
+ <!-- A AJP 1.3 Connector on port 8009 -->
+ <Connector protocol="AJP/1.3" port="8009" address="${jboss.bind.address}"
+ redirectPort="8443" />
+
+ <!-- SSL/TLS Connector configuration using the admin devl guide keystore
+ <Connector protocol="HTTP/1.1" SSLEnabled="true"
+ port="8443" address="${jboss.bind.address}"
+ scheme="https" secure="true" clientAuth="false"
+ keystoreFile="${jboss.server.home.dir}/conf/chap8.keystore"
+ keystorePass="rmi+ssl" sslProtocol = "TLS" />
+ -->
+
+ <Engine name="jboss.web" defaultHost="localhost">
+
+ <!-- The JAAS based authentication and authorization realm implementation
+ that is compatible with the jboss 3.2.x realm implementation.
+ - certificatePrincipal : the class name of the
+ org.jboss.security.auth.certs.CertificatePrincipal impl
+ used for mapping X509[] cert chains to a Princpal.
+ - allRolesMode : how to handle an auth-constraint with a role-name=*,
+ one of strict, authOnly, strictAuthOnly
+ + strict = Use the strict servlet spec interpretation which requires
+ that the user have one of the web-app/security-role/role-name
+ + authOnly = Allow any authenticated user
+ + strictAuthOnly = Allow any authenticated user only if there are no
+ web-app/security-roles
+ -->
+ <Realm className="org.jboss.web.tomcat.security.JBossWebRealm"
+ certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+ allRolesMode="authOnly"
+ />
+ <!-- A subclass of JBossSecurityMgrRealm that uses the authentication
+ behavior of JBossSecurityMgrRealm, but overrides the authorization
+ checks to use JACC permissions with the current java.security.Policy
+ to determine authorized access.
+ - allRolesMode : how to handle an auth-constraint with a role-name=*,
+ one of strict, authOnly, strictAuthOnly
+ + strict = Use the strict servlet spec interpretation which requires
+ that the user have one of the web-app/security-role/role-name
+ + authOnly = Allow any authenticated user
+ + strictAuthOnly = Allow any authenticated user only if there are no
+ web-app/security-roles
+ <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"
+ certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+ allRolesMode="authOnly"
+ />
+ -->
+
+ <Host name="localhost">
+
+ <!-- Uncomment to enable request dumper. This Valve "logs interesting
+ contents from the specified Request (before processing) and the
+ corresponding Response (after processing). It is especially useful
+ in debugging problems related to headers and cookies."
+ -->
+ <!--
+ <Valve className="org.apache.catalina.valves.RequestDumperValve" />
+ -->
+
+ <!-- Access logger -->
+ <Valve className="org.apache.catalina.valves.AccessLogValve"
+ prefix="localhost_access_log." suffix=".log"
+ pattern="common" directory="${jboss.server.log.dir}"
+ resolveHosts="false" />
+
+ <!-- Uncomment to enable single sign-on across web apps
+ deployed to this host. Does not provide SSO across a cluster.
+
+ If this valve is used, do not use the JBoss ClusteredSingleSignOn
+ valve shown below.
+
+ A new configuration attribute is available beginning with
+ release 4.0.4:
+
+ cookieDomain configures the domain to which the SSO cookie
+ will be scoped (i.e. the set of hosts to
+ which the cookie will be presented). By default
+ the cookie is scoped to "/", meaning the host
+ that presented it. Set cookieDomain to a
+ wider domain (e.g. "xyz.com") to allow an SSO
+ to span more than one hostname.
+ -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Uncomment to enable single sign-on across web apps
+ deployed to this host AND to all other hosts in the cluster.
+
+ If this valve is used, do not use the standard Tomcat SingleSignOn
+ valve shown above.
+
+ Valve uses a JBossCache instance to support SSO credential
+ caching and replication across the cluster. The JBossCache
+ instance must be configured separately. See the
+ "jboss-web-clusteredsso-beans.xml" file in the
+ server/all/deploy directory for cache configuration details.
+
+ Besides the attributes supported by the standard Tomcat
+ SingleSignOn valve (see the Tomcat docs), this version also
+ supports the following attributes:
+
+ cookieDomain see non-clustered valve above
+
+ cacheConfig Name of the CacheManager service configuration
+ to use for the clustered SSO cache. See
+ deploy/cluster/jboss-cache-manager.sar/META-INF/jboss-cache-manager-jboss-beans.xml
+ Default is "clustered-sso".
+
+ treeCacheName Deprecated. Use "cacheConfig".
+ JMX ObjectName of the JBoss Cache MBean used to
+ support credential caching and replication across
+ the cluster. Only used if no cache can be located
+ from the CacheManager service using the "cacheConfig"
+ attribute (or its default value). If not set, the
+ default is "jboss.cache:service=TomcatClusteringCache"
+
+ maxEmptyLife The maximum number of seconds an SSO with no
+ active sessions will be usable by a request
+
+ processExpiresInterval The minimum number of seconds between
+ efforts by the valve to find and invalidate
+ SSO's that have exceeded their 'maxEmptyLife'.
+ Does not imply effort will be spent on such
+ cleanup every 'processExpiresInterval'.
+ -->
+ <!--
+ <Valve className="org.jboss.web.tomcat.service.sso.ClusteredSingleSignOn" />
+ -->
+
+ <!-- Check for unclosed connections and transaction terminated checks
+ in servlets/jsps.
+
+ Important: The dependency on the CachedConnectionManager
+ in META-INF/jboss-service.xml must be uncommented, too
+ -->
+
+ <Valve className="org.jboss.web.tomcat.service.jca.CachedConnectionValve"
+ cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager"
+ transactionManagerObjectName="jboss:service=TransactionManager" />
+
+ </Host>
+
+ </Engine>
+
+ </Service>
+
+</Server>
15 years, 4 months
- 1
- 0
EMBJOPR SVN: r138 - in trunk/jsfunit: src/test/java/org/jboss/jopr/jsfunit and 3 other directories.
by embjopr-commits＠lists.jboss.org
Author: fjuma
Date: 2009-02-06 13:42:55 -0500 (Fri, 06 Feb 2009)
New Revision: 138
Added:
trunk/jsfunit/testdata/datasources/
trunk/jsfunit/testdata/datasources/ExpectedMultipleDatasourcesAfterDeletion-ds.xml
trunk/jsfunit/testdata/datasources/MultipleDatasources-ds.xml
Modified:
trunk/jsfunit/pom.xml
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java
Log:
Added a datasource deletion test that is related to JBAS-6227 and added another test for the "Flush" operation.
Made some code style changes.
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-02-04 20:55:30 UTC (rev 137)
+++ trunk/jsfunit/pom.xml 2009-02-06 18:42:55 UTC (rev 138)
@@ -259,6 +259,10 @@
<file>${JBOSS_HOME}/server/default/conf/jboss-log4j.xml</file>
<tofile>conf/jboss-log4j.xml</tofile>
</configfile>
+ <configfile>
+ <file>${basedir}/testdata/datasources/MultipleDatasources-ds.xml</file>
+ <toFile>deploy/MultipleDatasources-ds.xml</toFile>
+ </configfile>
</configfiles>
</configuration>
<!-- /Container configuration -->
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-02-04 20:55:30 UTC (rev 137)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-02-06 18:42:55 UTC (rev 138)
@@ -31,6 +31,8 @@
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
import java.io.File;
+import java.io.BufferedReader;
+import java.io.FileReader;
import java.util.Map;
import java.util.HashMap;
import javax.naming.InitialContext;
@@ -70,7 +72,7 @@
protected final String xmlElementName;
public String getXmlElementName() { return xmlElementName; }
- // Also server as value for HTML Radio for Datasource type selection.
+ // Also serves as value for HTML Radio for Datasource type selection.
public String getHtmlRadioValue() { return xmlElementName; }
@@ -122,23 +124,15 @@
/** AS 4 */
AS4_ORACLE_LOCAL_TX("Oracle Local TX__Datasource"),
- /** AS 4 */
AS4_ORACLE_XA("Oracle XA__Datasource"),
- /** AS 4 */
AS4_DEFAULT("default__Datasource"),
-
/** AS 5 */
AS5_ORACLE_LOCAL_TX("Oracle Local TX__Local TX Datasource"),
- /** AS 5 */
AS5_DEFAULT_LOCAL_TX("default__Local TX Datasource"),
- /** AS 5 */
AS5_ORACLE_NO_TX("Oracle No TX__No TX Datasource"),
- /** AS 5 */
AS5_DEFAULT_NO_TX("default__No TX Datasource"),
- /** AS 5 */
AS5_ORACLE_XA("Oracle XA__XA Datasource"),
- /** AS 5 */
AS5_DEFAULT_XA("default__XA Datasource");
@@ -185,8 +179,8 @@
* appears in the left nav (eg. "Local TX Datasources")
*/
protected abstract void createDatasource(DatasourceType datasourceType,
- String datasourceTemplate,
- Map<String, String> propertiesMap) throws IOException;
+ String datasourceTemplate,
+ Map<String, String> propertiesMap) throws IOException;
/**
* Delete the datasource given by datasourceName.
@@ -359,6 +353,27 @@
}
/**
+ * compareFiles is used to check if the two given files are identical.
+ */
+ public void compareFiles(String actualFile, String expectedFile) throws Exception {
+ BufferedReader actual = new BufferedReader(new FileReader(actualFile));
+ BufferedReader expected = new BufferedReader(new FileReader(expectedFile));
+ String expectedLine;
+ String actualLine;
+
+ // Compare the two files
+ while((actualLine = actual.readLine()) != null) {
+ expectedLine = expected.readLine();
+ assertTrue("Extra line in -ds.xml file: " + actualLine, expectedLine != null);
+ assertEquals("Incorrect line in -ds.xml file: '" + actualLine + "' - ",
+ expectedLine, actualLine);
+ }
+
+ expectedLine = expected.readLine();
+ assertTrue("Missing line in -ds.xml file: " + expectedLine, expectedLine == null);
+ }
+
+ /**
* @return the suite of tests being tested
* @throws UnsupportedOperationException - you have to override this.
* Can't be abstract, must be static.
@@ -386,9 +401,8 @@
Map<String, String> propertiesMap = this.getDatasourceProperties();
createDatasource(DatasourceType.LOCAL_TX_DATASOURCE,
- //was: "default__Local TX Datasource",
- DatasourceType.LOCAL_TX_DATASOURCE.getTemplateHtmlSelectValue(), // TODO: Redundant - remove.
- propertiesMap);
+ DatasourceType.LOCAL_TX_DATASOURCE.getTemplateHtmlSelectValue(), // TODO: Redundant - remove.
+ propertiesMap);
client.click("resourceConfigurationForm:saveButton");
// Check for the appropriate success messages
@@ -396,7 +410,7 @@
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
assertTrue("Datasource is not deployed (isDatasourceDeployed() returned false).",
- isDatasourceDeployed(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE));
+ isDatasourceDeployed(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE));
assertTrue(checkProperties(propertiesMap.get("jndi-name"),
DatasourceType.LOCAL_TX_DATASOURCE,
propertiesMap));
@@ -421,25 +435,23 @@
propertiesMap.put("user-name", "testUser");
propertiesMap.put("max-pool-size", "10");
propertiesMap.put("idle-timeout-minutes", "20");
- if( !isJBoss4 ){
- propertiesMap.put("prefill", "true");
- propertiesMap.put("set-tx-query-timeout", "true");
- propertiesMap.put("query-timeout", "1800");
- }
+ if(!isJBoss4){
+ propertiesMap.put("prefill", "true");
+ propertiesMap.put("set-tx-query-timeout", "true");
+ propertiesMap.put("query-timeout", "1800");
+ }
createDatasource(DatasourceType.NO_TX_DATASOURCE,
- //"default__No TX Datasource",
- isJBoss4 ?
- DatasourceTemplate.AS4_DEFAULT.getTemplateHtmlSelectValue() :
- DatasourceTemplate.AS5_DEFAULT_NO_TX.getTemplateHtmlSelectValue(),
+ //"default__No TX Datasource",
+ isJBoss4 ?
+ DatasourceTemplate.AS4_DEFAULT.getTemplateHtmlSelectValue() :
+ DatasourceTemplate.AS5_DEFAULT_NO_TX.getTemplateHtmlSelectValue(),
propertiesMap);
client.click("resourceConfigurationForm:saveButton");
// Check for the appropriate error messages
- checkClientAndServerMessages(
- "An invalid value was specified for one or more properties",
- "Value is required", true);
-
+ checkClientAndServerMessages("An invalid value was specified for one or more properties",
+ "Value is required", true);
}
@@ -461,7 +473,7 @@
propertiesMap.put("max-pool-size", "100000000000000");
createDatasource(DatasourceType.XA_DATASOURCE,
- DatasourceTemplate.AS5_DEFAULT_XA.getTemplateHtmlSelectValue(),
+ DatasourceTemplate.AS5_DEFAULT_XA.getTemplateHtmlSelectValue(),
propertiesMap);
client.click("resourceConfigurationForm:saveButton");
@@ -516,7 +528,7 @@
propertiesMap.put("max-pool-size", "-25");
createDatasource(DatasourceType.NO_TX_DATASOURCE,
- DatasourceType.NO_TX_DATASOURCE.getTemplateHtmlSelectValue(), //"default__No TX Datasource",
+ DatasourceType.NO_TX_DATASOURCE.getTemplateHtmlSelectValue(), //"default__No TX Datasource",
propertiesMap);
client.click("resourceConfigurationForm:saveButton");
@@ -538,7 +550,7 @@
propertiesMap.put("connection-url", "jdbc:hsqldb:.");
createDatasource(DatasourceType.LOCAL_TX_DATASOURCE,
- DatasourceType.LOCAL_TX_DATASOURCE.getTemplateHtmlSelectValue(), //"default__Local TX Datasource",
+ DatasourceType.LOCAL_TX_DATASOURCE.getTemplateHtmlSelectValue(), //"default__Local TX Datasource",
propertiesMap);
client.click("resourceConfigurationForm:saveButton");
@@ -566,14 +578,12 @@
+ propertiesMap.get("jndi-name") + "'";
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
- assertFalse(isDatasourceDeployed(
- propertiesMap.get("jndi-name"),
- DatasourceType.LOCAL_TX_DATASOURCE));
+ assertFalse(isDatasourceDeployed(propertiesMap.get("jndi-name"),
+ DatasourceType.LOCAL_TX_DATASOURCE));
- // Make sure the entry was removed from the -ds.xml file
- assertFalse(containsElement(
- propertiesMap.get("jndi-name"),
- DatasourceType.LOCAL_TX_DATASOURCE.getXmlElementName() )); //"local-tx-datasource"
+ // Make sure the entry was removed from the -ds.xml file (See JOPR-44)
+ assertFalse(containsElement(propertiesMap.get("jndi-name"),
+ DatasourceType.LOCAL_TX_DATASOURCE.getXmlElementName()));
}
/**
@@ -592,7 +602,7 @@
assertFalse(isDatasourceDeployed(propertiesMap.get("jndi-name"),
DatasourceType.NO_TX_DATASOURCE));
- // Make sure the entry was removed from the -ds.xml file
+ // Make sure the entry was removed from the -ds.xml file (See JOPR-44)
assertFalse(containsElement(propertiesMap.get("jndi-name"),
"no-tx-datasource"));
}
@@ -613,11 +623,11 @@
assertFalse(isDatasourceDeployed(propertiesMap.get("jndi-name"),
DatasourceType.XA_DATASOURCE));
- // Make sure the entry was removed from the -ds.xml file
+ // Make sure the entry was removed from the -ds.xml file (See JOPR-44)
assertFalse(containsElement(propertiesMap.get("jndi-name"),
"xa-datasource"));
}
-
+
/*
* METRICS TESTS
*/
@@ -641,7 +651,7 @@
expectedMetrics.put("Max Size", "20.0");
expectedMetrics.put("Min Size", "5.0");
- checkMetrics( propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE, expectedMetrics );
+ checkMetrics(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE, expectedMetrics);
// Clean up
deleteDatasource(propertiesMap.get("jndi-name"));
@@ -673,7 +683,7 @@
expectedMetrics.put("Max Size", "20.0");
expectedMetrics.put("Min Size", "5.0");
- checkMetrics( propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE, expectedMetrics );
+ checkMetrics(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE, expectedMetrics);
// Clean up
disconnectDB(con);
@@ -690,14 +700,9 @@
Map<String, String> propertiesMap = createNoTXDatasource("MetricsMultipleConnectionDS");
// Establish multiple connections
- ArrayList<Connection> connections = new ArrayList<Connection>();
- for(int i = 0; i <= 5; i++) {
- Connection con = connectDB(propertiesMap.get("jndi-name"),
- propertiesMap.get("user-name"),
- propertiesMap.get("password"));
- assertNotNull(con);
- connections.add(con);
- }
+ ArrayList<Connection> connections = createConnections(6, propertiesMap.get("jndi-name"),
+ propertiesMap.get("user-name"),
+ propertiesMap.get("password"));
// Set up the expected values
Map<String, String> expectedMetrics = new HashMap<String, String>();
@@ -710,13 +715,10 @@
expectedMetrics.put("Max Size", "20.0");
expectedMetrics.put("Min Size", "5.0");
- checkMetrics( propertiesMap.get("jndi-name"), DatasourceType.NO_TX_DATASOURCE, expectedMetrics );
+ checkMetrics(propertiesMap.get("jndi-name"), DatasourceType.NO_TX_DATASOURCE, expectedMetrics);
// Clean up
- for(int i = 0; i <= 5; i++) {
- disconnectDB(connections.get(i));
- }
-
+ closeConnections(connections);
deleteDatasource(propertiesMap.get("jndi-name"));
}
@@ -730,14 +732,9 @@
Map<String, String> propertiesMap = createNoTXDatasource("MetricsCloseConnectionsDS");
// Establish some connections
- ArrayList<Connection> connections = new ArrayList<Connection>();
- for(int i = 0; i <= 4; i++) {
- Connection con = connectDB(propertiesMap.get("jndi-name"),
- propertiesMap.get("user-name"),
- propertiesMap.get("password"));
- assertNotNull(con);
- connections.add(con);
- }
+ ArrayList<Connection> connections = createConnections(5, propertiesMap.get("jndi-name"),
+ propertiesMap.get("user-name"),
+ propertiesMap.get("password"));
// Close some connections
disconnectDB(connections.get(0));
@@ -972,10 +969,10 @@
for(Iterator i = metricsMap.keySet().iterator(); i.hasNext();) {
String metricName = (String)i.next();
- String expected = metricsMap.get(metricName);
- String actual = getMetricValueFromTable(metricName, "dataTable");
- assertEquals("Incorrect metric value for '"+metricName+"'='"+actual+"'," +
- " expected '"+expected+"'", actual, expected);
+ String expected = metricsMap.get(metricName);
+ String actual = getMetricValueFromTable(metricName, "dataTable");
+ assertEquals("Incorrect metric value for '"+metricName+"'='"+actual+"'," +
+ " expected '"+expected+"'", expected, actual);
}
// Check values under the "Summary" tab
@@ -988,11 +985,10 @@
for(Iterator i = summaryMetrics.iterator(); i.hasNext(); ) {
String metricName = (String)i.next();
-
- String expected = metricsMap.get(metricName);
- String actual = getMetricValueFromTable(metricName, "dataTable");
+ String expected = metricsMap.get(metricName);
+ String actual = getMetricValueFromTable(metricName, "dataTable");
assertEquals("Incorrect summary metric value for '"+metricName+"'='"+actual+"'," +
- " expected '"+expected+"'", actual, expected);
+ " expected '"+expected+"'", expected, actual);
}
}
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java 2009-02-04 20:55:30 UTC (rev 137)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java 2009-02-06 18:42:55 UTC (rev 138)
@@ -207,6 +207,34 @@
}
/*
+ * DELETION TESTS
+ */
+
+ /**
+ * Test the case in which the -ds.xml file that contains the datasource
+ * to be deleted contains more than one datasource. Make sure the entire
+ * -ds.xml file does not get deleted. (See JBAS-6227.)
+ */
+ public void testDeleteDatasourceComplexDSDotXmlFile() throws Exception {
+
+ // MultipleDatasources-ds.xml contains two Local TX Datasources and
+ // a No TX Datasource. We will delete the No TX Datasource (NoTX-ds.xml).
+ deleteDatasource("NoTX");
+
+ // Check for the appropriate success messages
+ String expectedMessage = "Successfully deleted No TX Datasource 'NoTX'";
+ checkClientAndServerMessages(expectedMessage, expectedMessage, false);
+
+ // Make sure only the No TX Datasource entry was removed
+ // from the -ds.xml file
+ String actualDSFile = System.getProperty("jsfunit.deploy.dir")
+ + "/MultipleDatasources-ds.xml";
+ String expectedDSFile = System.getProperty("jsfunit.testdata")
+ + "/datasources/ExpectedMultipleDatasourcesAfterDeletion-ds.xml";
+ compareFiles(actualDSFile, expectedDSFile);
+ }
+
+ /*
* CONFIGURATION TESTS
*/
@@ -227,6 +255,8 @@
navigateToPage(propertiesMap.get("jndi-name"),
DatasourceType.XA_DATASOURCE,
"configurationTab");
+
+ // See EMBJOPR-58
assertFalse("The configuration page could not be displayed",
client.getPageAsText().contains("There was an error retrieving the configuration for this resource"));
@@ -270,6 +300,8 @@
navigateToPage(propertiesMap.get("jndi-name"),
DatasourceType.LOCAL_TX_DATASOURCE,
"configurationTab");
+
+ // See EMBJOPR-58
assertFalse("The configuration page could not be displayed",
client.getPageAsText().contains("There was an error retrieving the configuration for this resource"));
@@ -306,6 +338,8 @@
navigateToPage(propertiesMap.get("jndi-name"),
DatasourceType.NO_TX_DATASOURCE,
"configurationTab");
+
+ // See EMBJOPR-58
assertFalse("The configuration page could not be displayed",
client.getPageAsText().contains("There was an error retrieving the configuration for this resource"));
@@ -334,13 +368,17 @@
deleteDatasource(propertiesMap.get("jndi-name"));
}
+ /*
+ * OPERATIONS TESTS
+ */
+
/**
- * Test the "Flush" operation.
+ * Test the "Flush" operation after creating a new datasource.
*/
- public void testFlushOperation() throws IOException {
+ public void testFlushOperationAfterDatasourceCreation() throws IOException {
// Min pool size will be 6, max pool size will be 15
- Map<String, String> propertiesMap = createXADatasource("FlushDS");
+ Map<String, String> propertiesMap = createXADatasource("FlushAfterDatasourceCreationDS");
performDatasourceOperation(propertiesMap.get("jndi-name"), DatasourceType.XA_DATASOURCE, "Flush");
@@ -359,9 +397,45 @@
// Clean up
deleteDatasource(propertiesMap.get("jndi-name"));
- }
+ }
/**
+ * Test the "Flush" operation after multiple connections to a database
+ * have been created.
+ */
+ public void testFlushOperationAfterMultipleConnections() throws Exception {
+
+ // Min pool size will be 5, max pool size will be 20
+ Map<String, String> propertiesMap = createLocalTXDatasource("FlushAfterMultipleConnectionsDS");
+
+ // Create some connections and then close them. This will
+ // result in non-zero values for "Connection Created Count" and
+ // "Max Connections In Use Count".
+ ArrayList<Connection> connections = createConnections(5, propertiesMap.get("jndi-name"),
+ propertiesMap.get("user-name"),
+ propertiesMap.get("password"));
+ closeConnections(connections);
+
+ performDatasourceOperation(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE, "Flush");
+
+ // Make sure the metrics are updated appropriately
+ Map<String, String> expectedMetrics = new HashMap<String, String>();
+ expectedMetrics.put("Available Connection Count", "20.0");
+ expectedMetrics.put("Connection Count", "0.0");
+ expectedMetrics.put("Connection Created Count", "0.0");
+ expectedMetrics.put("Connection Destroyed Count", "0.0");
+ expectedMetrics.put("In Use Connection Count", "0.0");
+ expectedMetrics.put("Max Connections In Use Count", "0.0");
+ expectedMetrics.put("Max Size", "20.0");
+ expectedMetrics.put("Min Size", "5.0");
+
+ checkMetrics(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE, expectedMetrics);
+
+ // Clean up
+ deleteDatasource(propertiesMap.get("jndi-name"));
+ }
+
+ /**
* Test the "List Formatted Sub Pool Statistics" after creating a new
* datasource.
*/
Added: trunk/jsfunit/testdata/datasources/ExpectedMultipleDatasourcesAfterDeletion-ds.xml
===================================================================
--- trunk/jsfunit/testdata/datasources/ExpectedMultipleDatasourcesAfterDeletion-ds.xml (rev 0)
+++ trunk/jsfunit/testdata/datasources/ExpectedMultipleDatasourcesAfterDeletion-ds.xml 2009-02-06 18:42:55 UTC (rev 138)
@@ -0,0 +1,40 @@
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>LocalTX1</jndi-name>
+ <connection-url>jdbc:hsqldb:.</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <min-pool-size>5</min-pool-size>
+ <max-pool-size>20</max-pool-size>
+ <idle-timeout-minutes>10</idle-timeout-minutes>
+ <track-statements/>
+ <security-domain>HsqlDbRealm</security-domain>
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ <metadata>
+ <type-mapping>FirstSQL/J</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+ <local-tx-datasource>
+ <jndi-name>LocalTX2</jndi-name>
+ <use-java-context>false</use-java-context>
+ <min-pool-size>5</min-pool-size>
+ <max-pool-size>10</max-pool-size>
+ <idle-timeout-minutes>15</idle-timeout-minutes>
+ <background-validation>false</background-validation>
+ <background-validation-millis>10000</background-validation-millis>
+ <validate-on-match>false</validate-on-match>
+ <metadata>
+ <type-mapping>FirstSQL/J</type-mapping>
+ </metadata>
+ <user-name>sa</user-name>
+ <password></password>
+ <prepared-statement-cache-size>10</prepared-statement-cache-size>
+ <share-prepared-statements>false</share-prepared-statements>
+ <set-tx-query-timeout>false</set-tx-query-timeout>
+ <query-timeout>36000</query-timeout>
+ <use-try-lock>60000</use-try-lock>
+ <connection-url>jdbc:hsqldb:.</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ </local-tx-datasource>
+</datasources>
Added: trunk/jsfunit/testdata/datasources/MultipleDatasources-ds.xml
===================================================================
--- trunk/jsfunit/testdata/datasources/MultipleDatasources-ds.xml (rev 0)
+++ trunk/jsfunit/testdata/datasources/MultipleDatasources-ds.xml 2009-02-06 18:42:55 UTC (rev 138)
@@ -0,0 +1,56 @@
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>LocalTX1</jndi-name>
+ <connection-url>jdbc:hsqldb:.</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <min-pool-size>5</min-pool-size>
+ <max-pool-size>20</max-pool-size>
+ <idle-timeout-minutes>10</idle-timeout-minutes>
+ <track-statements/>
+ <security-domain>HsqlDbRealm</security-domain>
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ <metadata>
+ <type-mapping>FirstSQL/J</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+ <no-tx-datasource>
+ <jndi-name>NoTX</jndi-name>
+ <connection-url>jdbc:hsqldb:.</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <min-pool-size>10</min-pool-size>
+ <max-pool-size>30</max-pool-size>
+ <idle-timeout-minutes>5</idle-timeout-minutes>
+ <track-statements/>
+ <security-domain>HsqlDbRealm</security-domain>
+ <prepared-statement-cache-size>20</prepared-statement-cache-size>
+ <metadata>
+ <type-mapping>FirstSQL/J</type-mapping>
+ </metadata>
+ </no-tx-datasource>
+ <local-tx-datasource>
+ <jndi-name>LocalTX2</jndi-name>
+ <use-java-context>false</use-java-context>
+ <min-pool-size>5</min-pool-size>
+ <max-pool-size>10</max-pool-size>
+ <idle-timeout-minutes>15</idle-timeout-minutes>
+ <background-validation>false</background-validation>
+ <background-validation-millis>10000</background-validation-millis>
+ <validate-on-match>false</validate-on-match>
+ <metadata>
+ <type-mapping>FirstSQL/J</type-mapping>
+ </metadata>
+ <user-name>sa</user-name>
+ <password></password>
+ <prepared-statement-cache-size>10</prepared-statement-cache-size>
+ <share-prepared-statements>false</share-prepared-statements>
+ <set-tx-query-timeout>false</set-tx-query-timeout>
+ <query-timeout>36000</query-timeout>
+ <use-try-lock>60000</use-try-lock>
+ <connection-url>jdbc:hsqldb:.</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ </local-tx-datasource>
+</datasources>
15 years, 4 months
- 1
- 0
EMBJOPR SVN: r137 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-02-04 15:55:30 -0500 (Wed, 04 Feb 2009)
New Revision: 137
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java
Log:
listSystemProperties() - removing Properties.stringPropertyNames() call - avail. in JDK 1.6
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java 2009-02-04 20:27:47 UTC (rev 136)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java 2009-02-04 20:55:30 UTC (rev 137)
@@ -48,8 +48,9 @@
Properties properties = System.getProperties();
SortedMap<String, String> map = new TreeMap<String, String>();
- for ( String property : properties.stringPropertyNames()) {
- map.put( (String)property, properties.getProperty(property) );
+ // properties.stringPropertyNames() since 1.6
+ for ( Object property : properties.keySet()) {
+ map.put( (String)property, properties.getProperty((String)property) );
}
for ( String property : map.keySet() ) {
15 years, 4 months
- 1
- 0
EMBJOPR SVN: r136 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-02-04 15:27:47 -0500 (Wed, 04 Feb 2009)
New Revision: 136
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java
Log:
Adding listSystemProperties to DebugUtils.java - to see what properties Hudson passes through Maven plugin
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java 2009-02-04 17:53:45 UTC (rev 135)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java 2009-02-04 20:27:47 UTC (rev 136)
@@ -6,6 +6,9 @@
import java.io.FileWriter;
import java.io.IOException;
import java.nio.channels.FileChannel;
+import java.util.Properties;
+import java.util.SortedMap;
+import java.util.TreeMap;
/**
*
@@ -20,10 +23,6 @@
}
-
-
-
-
public static void copyFile( String sFromPath, String sToPath ) throws IOException {
FileChannel in = new FileInputStream(sFromPath).getChannel();
@@ -40,21 +39,25 @@
}
-}
+ /**
+ * Lists system properties.
+ */
+ public static void listSystemProperties(){
+ Properties properties = System.getProperties();
-/*
+ SortedMap<String, String> map = new TreeMap<String, String>();
+ for ( String property : properties.stringPropertyNames()) {
+ map.put( (String)property, properties.getProperty(property) );
+ }
+ for ( String property : map.keySet() ) {
+ System.out.println(property + ": '"+properties.getProperty(property)+"'");
+ }
+ }
- DebugUtils.copyFile("/home/ondra/work/JOPRembedded/emb-ds.xml", file.getAbsolutePath());///
-
-
-
-
-
-
- */
+}
15 years, 4 months
- 1
- 0
EMBJOPR SVN: r135 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-02-04 12:53:45 -0500 (Wed, 04 Feb 2009)
New Revision: 135
Added:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java
Log:
Adding DebugUtils.java - few methods for debugging...
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DebugUtils.java 2009-02-04 17:53:45 UTC (rev 135)
@@ -0,0 +1,60 @@
+package org.jboss.jopr.jsfunit;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+
+/**
+ *
+ * @author Ondrej Zizka
+ */
+public class DebugUtils {
+
+ protected static String workDir = System.getProperty("user.dir");
+
+ public static void setWorkDir(String workDir) {
+ DebugUtils.workDir = workDir;
+ }
+
+
+
+
+
+
+ public static void copyFile( String sFromPath, String sToPath ) throws IOException {
+
+ FileChannel in = new FileInputStream(sFromPath).getChannel();
+
+ new FileOutputStream(sToPath).getChannel().transferFrom( in, 0, in.size() );
+
+ }
+
+
+ public static void writeFile( String sFilePath, String content ) throws FileNotFoundException, IOException{
+
+ new FileWriter(sFilePath).write(content);
+
+ }
+
+
+}
+
+
+
+/*
+
+
+
+ DebugUtils.copyFile("/home/ondra/work/JOPRembedded/emb-ds.xml", file.getAbsolutePath());///
+
+
+
+
+
+
+
+
+ */
15 years, 4 months
- 1
- 0