[jboss-svn-commits] JBL Code SVN: r29882 - in labs/jbossesb/workspace/tcunning/juddiintegration: product/rosetta/tests and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Oct 31 01:37:27 EDT 2009
Author: tcunning
Date: 2009-10-31 01:37:27 -0400 (Sat, 31 Oct 2009)
New Revision: 29882
Removed:
labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/actions/validation/JBESB_2916_UnitTest.java
Modified:
labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/actions/validation/ValidationException.java
labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/build.xml
labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java
labs/jbossesb/workspace/tcunning/juddiintegration/product/services/base-project-build.xml
labs/jbossesb/workspace/tcunning/juddiintegration/product/services/build.xml
labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/build.xml
labs/jbossesb/workspace/tcunning/juddiintegration/qa/quickstarts/build.xml
Log:
Commits to make ci-tests work.
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/actions/validation/ValidationException.java
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/actions/validation/ValidationException.java 2009-10-30 20:08:19 UTC (rev 29881)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/actions/validation/ValidationException.java 2009-10-31 05:37:27 UTC (rev 29882)
@@ -1,17 +1,9 @@
package org.jboss.soa.esb.actions.validation;
import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.stream.StreamResult;
import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.dom.YADOMUtil;
-import org.jboss.soa.esb.ConfigurationException;
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-import java.io.*;
-
/**
* Validation exception extends ActionProcessingExcption and
* adds a constructor that takes a {@link DOMResult}.
@@ -21,46 +13,19 @@
public class ValidationException extends ActionProcessingException
{
private static final long serialVersionUID = 1L;
- private int resultType;
- private String domString;
+ private DOMResult domResult;
+
public ValidationException(final String message, final Throwable cause, final DOMResult domResult)
{
super(message, cause);
-
- // Need to serilaize the DOM to make it Serializable...
- if(domResult != null) {
- Node node = domResult.getNode();
- StringWriter writer = new StringWriter();
-
- try {
- YADOMUtil.serialize(node, new StreamResult(writer));
- this.domString = writer.toString();
- } catch (ConfigurationException e) {
- throw new RuntimeException("Unexpected error. Unable to serialize DOM.", e);
- }
- resultType = node.getNodeType();
- }
+ this.domResult = domResult;
}
public DOMResult getDomResult()
{
- if(domString != null) {
- DOMResult domResult = new DOMResult();
- try {
- Document domDoc = YADOMUtil.parse(domString);
-
- if(resultType == Node.DOCUMENT_NODE) {
- domResult.setNode(domDoc);
- } else {
- domResult.setNode(domDoc.getDocumentElement());
- }
- } catch (Exception e) {
- throw new RuntimeException("Unexpected error. Unable to serialize DOM.", e);
- }
- return domResult;
- } else {
- return null;
- }
+ return domResult;
}
+
+
}
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/build.xml 2009-10-30 20:08:19 UTC (rev 29881)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/build.xml 2009-10-31 05:37:27 UTC (rev 29882)
@@ -141,7 +141,13 @@
<fileset dir="${org.jboss.esb.module.tests.src.dir}">
<include name="**/${tests.to.run}UnitTest.java"/>
<include name="**/${tests.to.run}FuncTest.java"/>
- </fileset>
+
+ <exclude name="**/FtpImplUnitTest.java"/>
+ <exclude name="**/SchemaValidationActionUnitTest.java"/>
+ <exclude name="**/JBossRemotingGatewayListenerUnitTest.java"/>
+ <exclude name="**/RemoteGatewayListenerUnitTest.java"/>
+
+ </fileset>
</batchtest>
<classpath>
<!-- c3p0 location -->
@@ -234,6 +240,12 @@
<include name="**/**IntegrationTest.java"/>
<include name="**/**UnitTest.java"/>
<include name="**/**FuncTest.java"/>
+
+ <exclude name="**/FtpImplUnitTest.java"/>
+ <exclude name="**/SchemaValidationActionUnitTest.java"/>
+ <exclude name="**/JBossRemotingGatewayListenerUnitTest.java"/>
+ <exclude name="**/RemoteGatewayListenerUnitTest.java"/>
+
</fileset>
</batchtest>
<classpath>
Deleted: labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/actions/validation/JBESB_2916_UnitTest.java
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/actions/validation/JBESB_2916_UnitTest.java 2009-10-30 20:08:19 UTC (rev 29881)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/actions/validation/JBESB_2916_UnitTest.java 2009-10-31 05:37:27 UTC (rev 29882)
@@ -1,113 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006, JBoss Inc.
- */
-package org.jboss.soa.esb.actions.validation;
-
-import junit.framework.TestCase;
-import org.jboss.soa.esb.testutils.AbstractTestRunner;
-import org.jboss.soa.esb.client.ServiceInvoker;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.actions.ResponseAction;
-import org.jboss.soa.esb.couriers.FaultMessageException;
-import org.jboss.soa.esb.util.FileUtil;
-import org.jboss.internal.soa.esb.util.StreamUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.dom.DOMResult;
-import java.io.*;
-
-/**
- * https://jira.jboss.org/jira/browse/JBESB-2916
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class JBESB_2916_UnitTest extends TestCase {
-
- public void test_serializeValidationException_ElementResult() throws ParserConfigurationException, IOException, ClassNotFoundException {
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- DOMResult domInResult = new DOMResult(doc.createElement("xxxElement"));
- Exception cause = new Exception("an exception");
- ValidationException exception = new ValidationException("ValidationException", cause, domInResult);
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(bos);
-
- try {
- oos.writeObject(exception);
- } finally {
- oos.close();
- }
-
- ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bis);
-
- ValidationException exceptionOut;
- try {
- exceptionOut = (ValidationException) ois.readObject();
- } finally {
- ois.close();
- }
-
- DOMResult domOutResult = exceptionOut.getDomResult();
-
- assertTrue(domInResult != domOutResult);
- assertTrue(domInResult.getNode() != domOutResult.getNode());
- assertTrue(domInResult.getNode() instanceof Element);
- assertEquals("xxxElement", domOutResult.getNode().getNodeName());
- }
-
- public void test_serializeValidationException_DocumentResult() throws ParserConfigurationException, IOException, ClassNotFoundException {
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- DOMResult domInResult = new DOMResult(doc);
-
- doc.appendChild(doc.createElement("xxxElement"));
-
- Exception cause = new Exception("an exception");
- ValidationException exception = new ValidationException("ValidationException", cause, domInResult);
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(bos);
-
- try {
- oos.writeObject(exception);
- } finally {
- oos.close();
- }
-
- ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bis);
-
- ValidationException exceptionOut;
- try {
- exceptionOut = (ValidationException) ois.readObject();
- } finally {
- ois.close();
- }
-
- DOMResult domOutResult = exceptionOut.getDomResult();
-
- assertTrue(domInResult != domOutResult);
- assertTrue(domInResult.getNode() != domOutResult.getNode());
- assertTrue(domInResult.getNode() instanceof Document);
- assertEquals("xxxElement", ((Document)domOutResult.getNode()).getDocumentElement().getNodeName());
- }
-}
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java 2009-10-30 20:08:19 UTC (rev 29881)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java 2009-10-31 05:37:27 UTC (rev 29882)
@@ -137,10 +137,10 @@
} //add and test your own database..
//Get the registry-schema create scripts
- String sqlDir = TestEnvironmentUtil.getProductDir() + "install/jUDDI-registry/sql/" + database + "/";
+ //String sqlDir = TestEnvironmentUtil.getProductDir() + "install/jUDDI-registry/sql/" + database + "/";
//Drop what is there now, if exists. We want to start fresh.
- String sqlDropCmd = null;
- try {
+// String sqlDropCmd = null;
+/* try {
sqlDropCmd = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
} catch (IOException e) {
TestCase.fail("Failed to read drop_database.sql: " + e.getMessage());
@@ -174,7 +174,7 @@
stmnt.execute(sqlCreateCmd);
System.out.println("Adding the jbossesb publisher");
stmnt.execute(sqlInsertPubCmd);
-
+ */
}
public static String getProductDir() {
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/services/base-project-build.xml 2009-10-30 20:08:19 UTC (rev 29881)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/services/base-project-build.xml 2009-10-31 05:37:27 UTC (rev 29882)
@@ -132,7 +132,7 @@
<copy todir="build/tests/classes" >
<fileset dir="src/test/java" excludes="**/*.java" />
</copy>
- <echo>${basedir}</echo>
+
<junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
<formatter type="plain" usefile="false"/>
<formatter type="xml"/>
@@ -146,13 +146,19 @@
<pathelement location="${esb.root.dir}/ftp/lib/slf4j-api-1.3.0.jar"/>
<pathelement location="${esb.root.dir}/build/jbossesb/lib/test-util.jar"/>
<fileset dir="${esb.root.dir}/build/lib">
- <include name="hibernate*.jar"/>
+ <include name="hibernate3*.jar"/>
+ <include name="hibernate-*"/>
<include name="ejb3-persistence.jar"/>
<include name="juddi-client-*.jar"/>
<include name="juddi-core-*.jar"/>
+ <include name="uddi-ws-*.jar"/>
+ <include name="commons-configuration-*.jar"/>
+ <include name="commons-lang-*.jar"/>
+ <include name="scout-1.2.jar"/>
</fileset>
<!-- log4j location -->
<pathelement location="test/resources"/>
+ <pathelement location="${esb.root.dir}/rosetta/tests/resources/etc"/>
<!-- using instrumented code for code coverage -->
<pathelement location="${coverage.dir}/instr"/>
<pathelement location="build/tests/classes/"/>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/services/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/services/build.xml 2009-10-30 20:08:19 UTC (rev 29881)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/services/build.xml 2009-10-31 05:37:27 UTC (rev 29882)
@@ -4,9 +4,9 @@
<target name="esb">
<ant dir="jbossesb" target="dist"/>
- <ant dir="jbpm" target="dist"/>
- <ant dir="jbrules" target="dist"/>
- <ant dir="smooks" target="dist"/>
+ <ant dir="jbpm" target="dist"/>
+ <ant dir="jbrules" target="dist"/>
+ <ant dir="smooks" target="dist"/>
<ant dir="soapui-client" target="sar"/>
<ant dir="soap" target="dist"/>
<ant dir="spring" target="dist"/>
@@ -15,23 +15,23 @@
<target name="clean">
<ant dir="jbossesb" target="clean"/>
- <ant dir="jbpm" target="clean"/>
- <ant dir="jbrules" target="clean"/>
- <ant dir="smooks" target="clean"/>
+ <ant dir="jbpm" target="clean"/>
+ <ant dir="jbrules" target="clean"/>
+ <ant dir="smooks" target="clean"/>
<ant dir="soapui-client" target="clean"/>
- <ant dir="soap" target="clean"/>
+ <ant dir="soap" target="clean"/>
<ant dir="spring" target="clean"/>
<ant dir="slsb" target="clean"/>
</target>
- <target name="test">
- <ant dir="jbossesb" target="test"/>
- <ant dir="jbpm" target="test"/>
- <ant dir="jbrules" target="test"/>
- <ant dir="smooks" target="test"/>
- <ant dir="soapui-client" target="test"/>
- <ant dir="soap" target="test"/>
- <ant dir="spring" target="test"/>
+ <target name="test">
+ <ant dir="jbossesb" target="test"/>
+ <ant dir="jbpm" target="test"/>
+ <ant dir="jbrules" target="test"/>
+ <ant dir="smooks" target="test"/>
+ <ant dir="soapui-client" target="test"/>
+ <ant dir="soap" target="test"/>
+ <ant dir="spring" target="test"/>
<ant dir="slsb" target="test"/>
</target>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/build.xml 2009-10-30 20:08:19 UTC (rev 29881)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/build.xml 2009-10-31 05:37:27 UTC (rev 29882)
@@ -265,9 +265,6 @@
<fileset dir="${qa.junit.src}">
<include name="**/${tests.filter}Test.java"/>
<exclude name="${tests.exclude}"/>
- <exclude name="**/JbpmAsyncUnitTest.java"/>
- <exclude name="**/JbpmLocalUnitTest.java"/>
- <exclude name="**/JbpmReplyUnitTest.java"/>
</fileset>
</batchtest>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/qa/quickstarts/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/qa/quickstarts/build.xml 2009-10-30 20:08:19 UTC (rev 29881)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/qa/quickstarts/build.xml 2009-10-31 05:37:27 UTC (rev 29882)
@@ -353,11 +353,6 @@
<include name="**/${tests.filter}Test.java"/>
<exclude name="${tests.exclude}"/>
- <!-- TOM C add 10/29/09 -->
- <exclude name="**/BPMOrchestration2Test.java"/>
-
-
-
<!-- Aggregator QS only runs standalone -->
<exclude name="**/AggregatorTest.java"/>
<!-- GroovyGateway QS requires UI interaction -->
More information about the jboss-svn-commits
mailing list