Author: dims
Date: Tue Aug 23 21:02:02 2005
New Revision: 239520
URL: http://svn.apache.org/viewcvs?rev=239520&view=rev
Log:
Make the tests pass
Modified:
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round1/Round1InteropTest.java
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/complex/WhitemesaR4ComplexTest.java
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/simple/WhitemesaR4SimpleTest.java
Modified:
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round1/Round1InteropTest.java
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round1/Round1InteropTest.java?rev=239520&r1=239519&r2=239520&view=diff
==============================================================================
---
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round1/Round1InteropTest.java
(original)
+++
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round1/Round1InteropTest.java
Tue Aug 23 21:02:02 2005
@@ -50,7 +50,7 @@
File file = null;
String url = "http://soapinterop.java.sun.com:80/round2/base";;
String soapAction = "http://soapinterop.org/";;
- String resFilePath = "/interopt/whitemesa/round1/";
+ String resFilePath = "itest-resources/interopt/whitemesa/round1/";
String tempPath = "";
Round1ClientUtil util;
Round1Client client = null;
@@ -167,25 +167,14 @@
SOAPBody body = retEnv.getBody();
if (!body.hasFault()) {
- Class clazz = Object.class;
- InputStream stream = clazz.getResourceAsStream(filePath);
-
-// File file = new File(filePath);
-// FileInputStream fin = new FileInputStream(file);
+ File file = new File(filePath);
+ FileInputStream stream = new FileInputStream(file);
OMElement firstChild = body.getFirstElement();
-
-// OMOutputImpl out = new OMOutputImpl(System.out, false);
-// firstChild.serialize(out);
-// out.flush();
-
XMLStreamReader parser =
XMLInputFactory.newInstance().createXMLStreamReader(stream);
OMXMLParserWrapper builder = new
StAXSOAPModelBuilder(parser, null);
SOAPEnvelope refEnv = (SOAPEnvelope)
builder.getDocumentElement();
OMElement refNode = refEnv.getBody().getFirstElement();
-// out = new OMOutputImpl(System.out, false);
-// refNode.serialize(out);
-// out.flush();
XMLComparator comparator = new XMLComparator();
ok = comparator.compare(firstChild, refNode);
} else
@@ -195,6 +184,8 @@
} catch (XMLStreamException e) {
throw new AxisFault(e);
} catch (XMLComparisonException e) {
+ throw new AxisFault(e);
+ } catch (FileNotFoundException e) {
throw new AxisFault(e);
}
Modified:
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/complex/WhitemesaR4ComplexTest.java
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/complex/WhitemesaR4ComplexTest.java?rev=239520&r1=239519&r2=239520&view=diff
==============================================================================
---
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/complex/WhitemesaR4ComplexTest.java
(original)
+++
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/complex/WhitemesaR4ComplexTest.java
Tue Aug 23 21:02:02 2005
@@ -50,11 +50,10 @@
}
private boolean Compare(OMElement retEle,String filepath) throws
XMLStreamException,
- XMLComparisonException {
+ XMLComparisonException, java.io.FileNotFoundException {
boolean compare=false;
if(retEle!=null){
- Class cls = Object.class;
- InputStream stream = cls.getResourceAsStream(filepath);
+ InputStream stream = new
java.io.FileInputStream("itest-resources/" + filepath);
javax.xml.stream.XMLStreamReader parser =
XMLInputFactory.newInstance().createXMLStreamReader(stream);
OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser,
null);
SOAPEnvelope resEnv = (SOAPEnvelope) builder.getDocumentElement();
Modified:
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/simple/WhitemesaR4SimpleTest.java
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/simple/WhitemesaR4SimpleTest.java?rev=239520&r1=239519&r2=239520&view=diff
==============================================================================
---
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/simple/WhitemesaR4SimpleTest.java
(original)
+++
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/simple/WhitemesaR4SimpleTest.java
Tue Aug 23 21:02:02 2005
@@ -55,11 +55,10 @@
}
private boolean compare(OMElement retEle,String filePath) throws
XMLStreamException,
- XMLComparisonException {
+ XMLComparisonException, java.io.FileNotFoundException {
boolean compare = false;
if(retEle!=null) {
- Class cls = Object.class;
- InputStream stream = cls.getResourceAsStream(filePath);
+ InputStream stream = new
java.io.FileInputStream("itest-resources/" + filePath);
javax.xml.stream.XMLStreamReader parser =
XMLInputFactory.newInstance().createXMLStreamReader(stream);
OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser,
null);
SOAPEnvelope resEnv = (SOAPEnvelope) builder.getDocumentElement();
