Author: veithen
Date: Sat Jan 22 11:03:49 2011
New Revision: 1062140
URL: http://svn.apache.org/viewvc?rev=1062140&view=rev
Log:
Replaced some instances of assertTrue by more specific assertions such as
assertEquals, assertNull and assertNotNull.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCode.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetail.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReason.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRole.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetCode.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetDetail.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetReason.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetRole.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNodeWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
Sat Jan 22 11:03:49 2011
@@ -32,12 +32,12 @@ public class TestGetFault extends SOAPTe
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
SOAPBody body = soapFactory.createSOAPBody(envelope);
- assertTrue(
+ assertNull(
"Body Test:- After creating a soap body it has a fault",
- body.getFault() == null);
+ body.getFault());
body.addFault(new Exception("This an exception for testing"));
- assertFalse(
+ assertNotNull(
"Body Test:- After calling addFault method, getFault method
returns null",
- body.getFault() == null);
+ body.getFault());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
Sat Jan 22 11:03:49 2011
@@ -31,12 +31,11 @@ public class TestGetFaultWithParser exte
protected void runTest() throws Throwable {
SOAPBody body = getTestMessage(MESSAGE).getBody();
- assertFalse(
+ assertNotNull(
"Body Test With parser :- getFault method returns null",
- body.getFault() == null);
- assertTrue(
+ body.getFault());
+ assertEquals(
"Body Test With parser : - SOAP fault name mismatch",
- body.getFault().getLocalName().equals(
- SOAPConstants.SOAPFAULT_LOCAL_NAME));
+ SOAPConstants.SOAPFAULT_LOCAL_NAME,
body.getFault().getLocalName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
Sat Jan 22 11:03:49 2011
@@ -33,10 +33,9 @@ public class TestGetBody extends SOAPTes
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
SOAPBody body = envelope.getBody();
- assertTrue("Body Test : - Body local name mismatch",
- body.getLocalName().equals(SOAPConstants.BODY_LOCAL_NAME));
- assertTrue("Body Test : - Body namespace mismatch",
- body.getNamespace().getNamespaceURI().equals(
- spec.getEnvelopeNamespaceURI()));
+ assertEquals("Body Test : - Body local name mismatch",
+ SOAPConstants.BODY_LOCAL_NAME, body.getLocalName());
+ assertEquals("Body Test : - Body namespace mismatch",
+ spec.getEnvelopeNamespaceURI(),
body.getNamespace().getNamespaceURI());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
Sat Jan 22 11:03:49 2011
@@ -33,10 +33,9 @@ public class TestGetBodyWithParser exten
protected void runTest() throws Throwable {
SOAPEnvelope envelope = getTestMessage(MESSAGE);
SOAPBody body = envelope.getBody();
- assertTrue("Body Test : - Body local name mismatch",
- body.getLocalName().equals(SOAPConstants.BODY_LOCAL_NAME));
- assertTrue("Body Test : - Body namespace mismatch",
- body.getNamespace().getNamespaceURI().equals(
- spec.getEnvelopeNamespaceURI()));
+ assertEquals("Body Test : - Body local name mismatch",
+ SOAPConstants.BODY_LOCAL_NAME, body.getLocalName());
+ assertEquals("Body Test : - Body namespace mismatch",
+ spec.getEnvelopeNamespaceURI(),
body.getNamespace().getNamespaceURI());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
Sat Jan 22 11:03:49 2011
@@ -33,10 +33,9 @@ public class TestGetHeader extends SOAPT
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
SOAPHeader header = envelope.getHeader();
- assertTrue("Header Test : - Header local name mismatch",
-
header.getLocalName().equals(SOAPConstants.HEADER_LOCAL_NAME));
- assertTrue("Header Test : - Header namespace mismatch",
- header.getNamespace().getNamespaceURI().equals(
- spec.getEnvelopeNamespaceURI()));
+ assertEquals("Header Test : - Header local name mismatch",
+ SOAPConstants.HEADER_LOCAL_NAME, header.getLocalName());
+ assertEquals("Header Test : - Header namespace mismatch",
+ spec.getEnvelopeNamespaceURI(),
header.getNamespace().getNamespaceURI());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
Sat Jan 22 11:03:49 2011
@@ -33,10 +33,9 @@ public class TestGetHeaderWithParser ext
protected void runTest() throws Throwable {
SOAPEnvelope envelope = getTestMessage(MESSAGE);
SOAPHeader header = envelope.getHeader();
- assertTrue("Header Test : - Header local name mismatch",
-
header.getLocalName().equals(SOAPConstants.HEADER_LOCAL_NAME));
- assertTrue("Header Test : - Header namespace mismatch",
- header.getNamespace().getNamespaceURI().equals(
- spec.getEnvelopeNamespaceURI()));
+ assertEquals("Header Test : - Header local name mismatch",
+ SOAPConstants.HEADER_LOCAL_NAME, header.getLocalName());
+ assertEquals("Header Test : - Header namespace mismatch",
+ spec.getEnvelopeNamespaceURI(),
header.getNamespace().getNamespaceURI());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCode.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCode.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCode.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCode.java
Sat Jan 22 11:03:49 2011
@@ -30,15 +30,14 @@ public class TestGetCode extends SOAPTes
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
- assertTrue(
+ assertNull(
"Fault Test:- After creating a SOAPFault, it has a code",
- soapFault.getCode() == null);
+ soapFault.getCode());
soapFault.setCode(soapFactory.createSOAPFaultCode(soapFault));
- assertFalse(
+ assertNotNull(
"Fault Test:- After calling setCode method, Fault has no code",
- soapFault.getCode() == null);
- assertTrue("Fault Test:- Fault code local name mismatch",
- soapFault.getCode().getLocalName().equals(
- spec.getFaultCodeLocalName()));
+ soapFault.getCode());
+ assertEquals("Fault Test:- Fault code local name mismatch",
+ spec.getFaultCodeLocalName(),
soapFault.getCode().getLocalName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
Sat Jan 22 11:03:49 2011
@@ -33,9 +33,8 @@ public class TestGetCodeWithParser exten
assertNotNull(
"Fault Test with parser: - getCode method returns null",
soapFaultWithParser.getCode());
- assertTrue(
+ assertEquals(
"Fault Test with parser: - Fault code local name mismatch",
- soapFaultWithParser.getCode().getLocalName().equals(
- spec.getFaultCodeLocalName()));
+ spec.getFaultCodeLocalName(),
soapFaultWithParser.getCode().getLocalName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetail.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetail.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetail.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetail.java
Sat Jan 22 11:03:49 2011
@@ -30,15 +30,14 @@ public class TestGetDetail extends SOAPT
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
- assertTrue(
+ assertNull(
"Fault Test:- After creating a SOAPFault, it has a detail",
- soapFault.getDetail() == null);
+ soapFault.getDetail());
soapFault.setDetail(soapFactory.createSOAPFaultDetail(soapFault));
- assertFalse(
+ assertNotNull(
"Fault Test:- After calling setDetail method, Fault has no
detail",
- soapFault.getDetail() == null);
- assertTrue("Fault Test:- Fault detail local name mismatch",
- soapFault.getDetail().getLocalName().equals(
- spec.getFaultDetailLocalName()));
+ soapFault.getDetail());
+ assertEquals("Fault Test:- Fault detail local name mismatch",
+ spec.getFaultDetailLocalName(),
soapFault.getDetail().getLocalName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
Sat Jan 22 11:03:49 2011
@@ -33,9 +33,8 @@ public class TestGetDetailWithParser ext
assertNotNull(
"Fault Test with parser: - getDetail method returns null",
soapFaultWithParser.getDetail());
- assertTrue(
+ assertEquals(
"Fault Test with parser: - Fault detail local name mismatch",
- soapFaultWithParser.getDetail().getLocalName().equals(
- spec.getFaultDetailLocalName()));
+ spec.getFaultDetailLocalName(),
soapFaultWithParser.getDetail().getLocalName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReason.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReason.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReason.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReason.java
Sat Jan 22 11:03:49 2011
@@ -30,15 +30,14 @@ public class TestGetReason extends SOAPT
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
- assertTrue(
+ assertNull(
"Fault Test:- After creating a SOAPFault, it has a reason",
- soapFault.getReason() == null);
+ soapFault.getReason());
soapFault.setReason(soapFactory.createSOAPFaultReason(soapFault));
- assertFalse(
+ assertNotNull(
"Fault Test:- After calling setReason method, Fault has no
reason",
- soapFault.getReason() == null);
- assertTrue("Fault Test:- Fault reason local name mismatch",
- soapFault.getReason().getLocalName().equals(
- spec.getFaultReasonLocalName()));
+ soapFault.getReason());
+ assertEquals("Fault Test:- Fault reason local name mismatch",
+ spec.getFaultReasonLocalName(),
soapFault.getReason().getLocalName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
Sat Jan 22 11:03:49 2011
@@ -30,12 +30,11 @@ public class TestGetReasonWithParser ext
protected void runTest() throws Throwable {
SOAPFault soapFaultWithParser =
getTestMessage(MESSAGE).getBody().getFault();
- assertFalse(
+ assertNotNull(
"Fault Test with parser: - getReason method returns null",
- soapFaultWithParser.getReason() == null);
- assertTrue(
+ soapFaultWithParser.getReason());
+ assertEquals(
"Fault Test with parser: - Fault reason local name mismatch",
- soapFaultWithParser.getReason().getLocalName().equals(
- spec.getFaultReasonLocalName()));
+ spec.getFaultReasonLocalName(),
soapFaultWithParser.getReason().getLocalName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRole.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRole.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRole.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRole.java
Sat Jan 22 11:03:49 2011
@@ -30,15 +30,14 @@ public class TestGetRole extends SOAPTes
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
- assertTrue(
+ assertNull(
"Fault Test:- After creating a SOAPFault, it has a role",
- soapFault.getRole() == null);
+ soapFault.getRole());
soapFault.setRole(soapFactory.createSOAPFaultRole(soapFault));
- assertFalse(
+ assertNotNull(
"Fault Test:- After calling setRole method, Fault has no role",
- soapFault.getRole() == null);
- assertTrue("Fault Test:- Fault role local name mismatch",
- soapFault.getRole().getLocalName().equals(
- spec.getFaultRoleLocalName()));
+ soapFault.getRole());
+ assertEquals("Fault Test:- Fault role local name mismatch",
+ spec.getFaultRoleLocalName(),
soapFault.getRole().getLocalName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
Sat Jan 22 11:03:49 2011
@@ -30,12 +30,11 @@ public class TestGetRoleWithParser exten
protected void runTest() throws Throwable {
SOAPFault soapFaultWithParser =
getTestMessage(MESSAGE).getBody().getFault();
- assertFalse(
+ assertNotNull(
"Fault Test with parser: - getRole method returns null",
- soapFaultWithParser.getRole() == null);
- assertTrue(
+ soapFaultWithParser.getRole());
+ assertEquals(
"Fault Test with parser: - Fault role local name mismatch",
- soapFaultWithParser.getRole().getLocalName().equals(
- spec.getFaultRoleLocalName()));
+ spec.getFaultRoleLocalName(),
soapFaultWithParser.getRole().getLocalName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetCode.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetCode.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetCode.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetCode.java
Sat Jan 22 11:03:49 2011
@@ -34,9 +34,8 @@ public class TestSetCode extends SOAPTes
assertNotNull(
"Fault Test:- After calling setCode method, Fault has no code",
soapFault.getCode());
- assertTrue("Fault Test:- Code local name mismatch",
- soapFault.getCode().getLocalName().equals(
- spec.getFaultCodeLocalName()));
+ assertEquals("Fault Test:- Code local name mismatch",
+ spec.getFaultCodeLocalName(),
soapFault.getCode().getLocalName());
try {
soapFault.setCode(altSoapFactory.createSOAPFaultCode());
fail("SOAPFaultCode should not be set in to a SOAPFault for a
different SOAP version");
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetDetail.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetDetail.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetDetail.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetDetail.java
Sat Jan 22 11:03:49 2011
@@ -31,12 +31,11 @@ public class TestSetDetail extends SOAPT
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
soapFault.setDetail(soapFactory.createSOAPFaultDetail(soapFault));
- assertFalse(
+ assertNotNull(
"Fault Test:- After calling setDetail method, Fault has no
detail",
- soapFault.getDetail() == null);
- assertTrue("Fault Test:- Fault detail local name mismatch",
- soapFault.getDetail().getLocalName().equals(
- spec.getFaultDetailLocalName()));
+ soapFault.getDetail());
+ assertEquals("Fault Test:- Fault detail local name mismatch",
+ spec.getFaultDetailLocalName(),
soapFault.getDetail().getLocalName());
try {
soapFault.setDetail(altSoapFactory.createSOAPFaultDetail());
fail("SOAPFaultDetail should not be set in to a SOAPFault for a
different SOAP version");
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetReason.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetReason.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetReason.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetReason.java
Sat Jan 22 11:03:49 2011
@@ -31,12 +31,11 @@ public class TestSetReason extends SOAPT
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
soapFault.setReason(soapFactory.createSOAPFaultReason(soapFault));
- assertFalse(
+ assertNotNull(
"Fault Test:- After calling setReason method, Fault has no
reason",
- soapFault.getReason() == null);
- assertTrue("Fault Test:- Fault reason local name mismatch",
- soapFault.getReason().getLocalName().equals(
- spec.getFaultReasonLocalName()));
+ soapFault.getReason());
+ assertEquals("Fault Test:- Fault reason local name mismatch",
+ spec.getFaultReasonLocalName(),
soapFault.getReason().getLocalName());
try {
soapFault.setReason(altSoapFactory.createSOAPFaultReason());
fail("SOAPFaultReason should not be set in to a SOAPFault for a
different SOAP version");
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetRole.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetRole.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetRole.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetRole.java
Sat Jan 22 11:03:49 2011
@@ -31,12 +31,11 @@ public class TestSetRole extends SOAPTes
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
soapFault.setRole(soapFactory.createSOAPFaultRole(soapFault));
- assertFalse(
+ assertNotNull(
"Fault Test:- After calling setRole method, Fault has no role",
- soapFault.getRole() == null);
- assertTrue("Fault Test:- Fault role local name mismatch",
- soapFault.getRole().getLocalName().equals(
- spec.getFaultRoleLocalName()));
+ soapFault.getRole());
+ assertEquals("Fault Test:- Fault role local name mismatch",
+ spec.getFaultRoleLocalName(),
soapFault.getRole().getLocalName());
try {
soapFault.setRole(altSoapFactory.createSOAPFaultRole());
fail("SOAPFaultRole should not be set in to a SOAPFault for a
different SOAP version");
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
Sat Jan 22 11:03:49 2011
@@ -48,29 +48,27 @@ public class TestAddDetailEntry extends
soapFactory.createOMElement("DetailEntry2", omNamespace));
Iterator iterator = soapFaultDetail.getAllDetailEntries();
OMElement detailEntry1 = (OMElement) iterator.next();
- assertFalse(
+ assertNotNull(
"SOAP Fault Detail Test : - After calling addDetailEntry
method twice, getAllDetailEntries method returns empty iterator",
- detailEntry1 == null);
- assertTrue(
+ detailEntry1);
+ assertEquals(
"SOAP Fault Detail Test : - detailEntry1 local name mismatch",
- detailEntry1.getLocalName().equals("DetailEntry1"));
- assertTrue(
+ "DetailEntry1", detailEntry1.getLocalName());
+ assertEquals(
"SOAP Fault Detail Test : - detailEntry1 namespace uri
mismatch",
- detailEntry1.getNamespace().getNamespaceURI().equals(
- "http://www.test.org";));
+ "http://www.test.org";,
detailEntry1.getNamespace().getNamespaceURI());
OMElement detailEntry2 = (OMElement) iterator.next();
- assertFalse(
+ assertNotNull(
"SOAP Fault Detail Test : - After calling addDetailEntry
method twice, getAllDetailEntries method returns an iterator with only one
object",
- detailEntry2 == null);
- assertTrue(
+ detailEntry2);
+ assertEquals(
"SOAP Fault Detail Test : - detailEntry2 local name mismatch",
- detailEntry2.getLocalName().equals("DetailEntry2"));
- assertTrue(
+ "DetailEntry2", detailEntry2.getLocalName());
+ assertEquals(
"SOAP Fault Detail Test : - detailEntry2 namespace uri
mismatch",
- detailEntry2.getNamespace().getNamespaceURI().equals(
- "http://www.test.org";));
- assertTrue(
+ "http://www.test.org";,
detailEntry2.getNamespace().getNamespaceURI());
+ assertFalse(
"SOAP Fault Detail Test : - After calling addDetailEntry
method twice, getAllDetailEntries method returns an iterator with three
objects",
- !iterator.hasNext());
+ iterator.hasNext());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
Sat Jan 22 11:03:49 2011
@@ -42,25 +42,24 @@ public class TestGetAllDetailEntries ext
SOAPFaultDetail soapFaultDetail =
soapFactory.createSOAPFaultDetail(fault);
OMNamespace omNamespace =
soapFactory.createOMNamespace("http://www.test.org";, "test");
Iterator iterator = soapFaultDetail.getAllDetailEntries();
- assertTrue(
+ assertFalse(
"SOAP Fault Detail Test : - After creating SOAP11FaultDetail
element, it has DetailEntries",
- !iterator.hasNext());
+ iterator.hasNext());
soapFaultDetail.addDetailEntry(
soapFactory.createOMElement("DetailEntry", omNamespace));
iterator = soapFaultDetail.getAllDetailEntries();
OMElement detailEntry = (OMElement) iterator.next();
- assertFalse(
+ assertNotNull(
"SOAP Fault Detail Test : - After calling addDetailEntry
method, getAllDetailEntries method returns empty iterator",
- detailEntry == null);
- assertTrue(
+ detailEntry);
+ assertEquals(
"SOAP Fault Detail Test : - detailEntry local name mismatch",
- detailEntry.getLocalName().equals("DetailEntry"));
- assertTrue(
+ "DetailEntry", detailEntry.getLocalName());
+ assertEquals(
"SOAP Fault Detail Test : - detailEntry namespace uri
mismatch",
- detailEntry.getNamespace().getNamespaceURI().equals(
- "http://www.test.org";));
- assertTrue(
+ "http://www.test.org";,
detailEntry.getNamespace().getNamespaceURI());
+ assertFalse(
"SOAP Fault Detail Test : - After calling addDetailEntry
method once, getAllDetailEntries method returns an iterator with two objects",
- !iterator.hasNext());
+ iterator.hasNext());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
Sat Jan 22 11:03:49 2011
@@ -37,30 +37,30 @@ public class TestGetAllDetailEntriesWith
SOAPFaultDetail soapFaultDetail =
getTestMessage(MESSAGE).getBody().getFault().getDetail();
Iterator iterator = soapFaultDetail.getAllDetailEntries();
OMText textEntry = (OMText) iterator.next();
- assertFalse(
+ assertNotNull(
"SOAP Fault Detail Test With Parser : - getAllDetailEntries
method returns empty iterator",
- textEntry == null);
- assertTrue(
+ textEntry);
+ assertEquals(
"SOAP Fault Detail Test With Parser : - text value mismatch",
- textEntry.getText().trim().equals("Details of error"));
+ "Details of error", textEntry.getText().trim());
OMElement detailEntry1 = (OMElement) iterator.next();
- assertFalse(
+ assertNotNull(
"SOAP Fault Detail Test With Parser : - getAllDetailEntries
method returns an itrator without detail entries",
- detailEntry1 == null);
- assertTrue(
+ detailEntry1);
+ assertEquals(
"SOAP Fault Detail Test With Parser : - detailEntry1 localname
mismatch",
- detailEntry1.getLocalName().equals("MaxTime"));
+ "MaxTime", detailEntry1.getLocalName());
iterator.next();
OMElement detailEntry2 = (OMElement) iterator.next();
- assertFalse(
+ assertNotNull(
"SOAP Fault Detail Test With Parser : - getAllDetailEntries
method returns an itrator with only one detail entries",
- detailEntry2 == null);
- assertTrue(
+ detailEntry2);
+ assertEquals(
"SOAP Fault Detail Test With Parser : - detailEntry2 localname
mismatch",
- detailEntry2.getLocalName().equals("AveTime"));
+ "AveTime", detailEntry2.getLocalName());
iterator.next();
- assertTrue(
+ assertFalse(
"SOAP Fault Detail Test With Parser : - getAllDetailEntries
method returns an itrator with more than two detail entries",
- !iterator.hasNext());
+ iterator.hasNext());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java
Sat Jan 22 11:03:49 2011
@@ -41,29 +41,27 @@ public class TestAddHeaderBlock extends
soapHeader.addHeaderBlock("echoOk2", namespace);
Iterator iterator = soapHeader.getChildren();
SOAPHeaderBlock headerBlock1 = (SOAPHeaderBlock) iterator.next();
- assertFalse(
+ assertNotNull(
"SOAP Header Test : - After calling addHeaderBlock method
twice, getChildren method returns empty iterator",
- headerBlock1 == null);
- assertTrue("SOAP Header Test : - HeaderBlock1 local name mismatch",
- headerBlock1.getLocalName().equals("echoOk1"));
- assertTrue(
+ headerBlock1);
+ assertEquals("SOAP Header Test : - HeaderBlock1 local name mismatch",
+ "echoOk1", headerBlock1.getLocalName());
+ assertEquals(
"SOAP Header Test : - HeaderBlock1 namespace uri mismatch",
- headerBlock1.getNamespace().getNamespaceURI().equals(
- "http://www.example.org";));
+ "http://www.example.org";,
headerBlock1.getNamespace().getNamespaceURI());
SOAPHeaderBlock headerBlock2 = (SOAPHeaderBlock) iterator.next();
- assertFalse(
+ assertNotNull(
"SOAP Header Test : - After calling addHeaderBlock method
twice, getChildren method returns an iterator with only one object",
- headerBlock2 == null);
- assertTrue("SOAP Header Test : - HeaderBlock2 local name mismatch",
- headerBlock2.getLocalName().equals("echoOk2"));
- assertTrue(
+ headerBlock2);
+ assertEquals("SOAP Header Test : - HeaderBlock2 local name mismatch",
+ "echoOk2", headerBlock2.getLocalName());
+ assertEquals(
"SOAP Header Test : - HeaderBlock2 namespace uri mismatch",
- headerBlock2.getNamespace().getNamespaceURI().equals(
- "http://www.example.org";));
+ "http://www.example.org";,
headerBlock2.getNamespace().getNamespaceURI());
- assertTrue(
+ assertFalse(
"SOAP Header Test : - After calling addHeaderBlock method
twice, getChildren method returns an iterator with more than two elements",
- !iterator.hasNext());
+ iterator.hasNext());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java
Sat Jan 22 11:03:49 2011
@@ -42,27 +42,25 @@ public class TestExamineAllHeaderBlocks
Iterator iterator = soapHeader.examineAllHeaderBlocks();
iterator.hasNext();
SOAPHeaderBlock headerBlock1 = (SOAPHeaderBlock) iterator.next();
- assertFalse(
+ assertNotNull(
"SOAP Header Test : - After calling addHeaderBlock method
twice, examineAllHeaderBlocks method returns empty iterator",
- headerBlock1 == null);
- assertTrue("SOAP Header Test : - HeaderBlock1 local name mismatch",
- headerBlock1.getLocalName().equals("echoOk1"));
- assertTrue(
+ headerBlock1);
+ assertEquals("SOAP Header Test : - HeaderBlock1 local name mismatch",
+ "echoOk1", headerBlock1.getLocalName());
+ assertEquals(
"SOAP Header Test : - HeaderBlock1 namespace uri mismatch",
- headerBlock1.getNamespace().getNamespaceURI().equals(
- "http://www.example.org";));
+ "http://www.example.org";,
headerBlock1.getNamespace().getNamespaceURI());
assertTrue(iterator.hasNext());
SOAPHeaderBlock headerBlock2 = (SOAPHeaderBlock) iterator.next();
- assertFalse(
+ assertNotNull(
"SOAP Header Test : - After calling addHeaderBlock method
twice, examineAllHeaderBlocks method returns an iterator with only one object",
- headerBlock2 == null);
- assertTrue("SOAP Header Test : - HeaderBlock2 local name mismatch",
- headerBlock2.getLocalName().equals("echoOk2"));
- assertTrue(
+ headerBlock2);
+ assertEquals("SOAP Header Test : - HeaderBlock2 local name mismatch",
+ "echoOk2", headerBlock2.getLocalName());
+ assertEquals(
"SOAP Header Test : - HeaderBlock2 namespace uri mismatch",
- headerBlock2.getNamespace().getNamespaceURI().equals(
- "http://www.example.org";));
+ "http://www.example.org";,
headerBlock2.getNamespace().getNamespaceURI());
assertFalse(
"SOAP Header Test : - After calling addHeaderBlock method
twice, examineAllHeaderBlocks method returns an iterator with more than two
object",
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java
Sat Jan 22 11:03:49 2011
@@ -42,12 +42,12 @@ public class TestGetHeaderBlocksWithNSUR
soapFactory.createOMNamespace("http://www.test1.org";, "test1"));
ArrayList arrayList = soapHeader.getHeaderBlocksWithNSURI(
"http://www.test1.org";);
- assertTrue(
+ assertEquals(
"SOAP Header Test : - getHeaderBlocksWithNSURI returns an
arrayList of incorrect size",
- arrayList.size() == 1);
- assertTrue(
+ 1, arrayList.size());
+ assertEquals(
"SOAP Header Test : - headerBlock of given namespace uri
mismatch",
- ((SOAPHeaderBlock)
arrayList.get(0)).getNamespace().getNamespaceURI()
- .equals("http://www.test1.org";));
+ "http://www.test1.org";,
+ ((SOAPHeaderBlock)
arrayList.get(0)).getNamespace().getNamespaceURI());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java
Sat Jan 22 11:03:49 2011
@@ -30,14 +30,13 @@ public class TestGetRole extends SOAPTes
protected void runTest() throws Throwable {
SOAPHeaderBlock soapHeaderBlock = createSOAPHeaderBlock();
- assertTrue(
+ assertNull(
"SOAP HeaderBlock Test : - After creating SOAPHeaderBlock, it
has a role",
- soapHeaderBlock.getRole() == null);
+ soapHeaderBlock.getRole());
soapHeaderBlock.setRole(
"http://example.org/my-role";);
- assertTrue(
+ assertEquals(
"SOAP HeaderBlock Test : - After calling setRole method,
getRole method returns incorrect role value",
- soapHeaderBlock.getRole().equals(
- "http://example.org/my-role";));
+ "http://example.org/my-role";, soapHeaderBlock.getRole());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
Sat Jan 22 11:03:49 2011
@@ -32,10 +32,9 @@ public class TestSetRole extends SOAPTes
SOAPHeaderBlock soapHeaderBlock = createSOAPHeaderBlock();
soapHeaderBlock.setRole(
"http://example.org/my-role";);
- assertTrue(
+ assertEquals(
"SOAP HeaderBlock Test : - After calling setRole method,
getRole method returns incorrect role value",
- soapHeaderBlock.getRole().equals(
- "http://example.org/my-role";));
+ "http://example.org/my-role";, soapHeaderBlock.getRole());
try {
soapHeaderBlock.setRole("Any Value");
} catch (Exception e) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java
Sat Jan 22 11:03:49 2011
@@ -32,9 +32,9 @@ public class TestGetNode extends SOAPTes
SOAPFault soapFault = soapFactory.createSOAPFault();
// TODO: LLOM returns null while DOM throws
UnsupportedOperationException
try {
- assertTrue(
+ assertNull(
"SOAP 1.1 Fault Test:- After creating a SOAP11Fault, it
has a node",
- soapFault.getNode() == null);
+ soapFault.getNode());
} catch (UnsupportedOperationException ex) {
// This is also fine.
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java
Sat Jan 22 11:03:49 2011
@@ -31,15 +31,14 @@ public class TestGetNode extends SOAPTes
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
- assertTrue(
+ assertNull(
"SOAP 1.2 Fault Test:- After creating a SOAP12Fault, it has a
node",
- soapFault.getNode() == null);
+ soapFault.getNode());
soapFault.setNode(soapFactory.createSOAPFaultNode(soapFault));
- assertFalse(
+ assertNotNull(
"SOAP 1.2 Fault Test:- After calling setNode method, Fault has
no node",
- soapFault.getNode() == null);
- assertTrue("SOAP 1.2 Fault Test:- Fault node local name mismatch",
- soapFault.getNode().getLocalName().equals(
- SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME));
+ soapFault.getNode());
+ assertEquals("SOAP 1.2 Fault Test:- Fault node local name mismatch",
+ SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME,
soapFault.getNode().getLocalName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNodeWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNodeWithParser.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNodeWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNodeWithParser.java
Sat Jan 22 11:03:49 2011
@@ -31,12 +31,11 @@ public class TestGetNodeWithParser exten
protected void runTest() throws Throwable {
SOAPFault soapFaultWithParser =
getTestMessage(MESSAGE).getBody().getFault();
- assertFalse(
+ assertNotNull(
"SOAP 1.2 Fault Test with parser: - getNode method returns
null",
- soapFaultWithParser.getNode() == null);
- assertTrue(
+ soapFaultWithParser.getNode());
+ assertEquals(
"SOAP 1.2 Fault Test with parser: - Fault node local name
mismatch",
- soapFaultWithParser.getNode().getLocalName().equals(
- SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME));
+ SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME,
soapFaultWithParser.getNode().getLocalName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java?rev=1062140&r1=1062139&r2=1062140&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
Sat Jan 22 11:03:49 2011
@@ -32,12 +32,11 @@ public class TestSetNode extends SOAPTes
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
soapFault.setNode(soapFactory.createSOAPFaultNode(soapFault));
- assertFalse(
+ assertNotNull(
"SOAP 1.2 Fault Test:- After calling setNode method, Fault has
no node",
- soapFault.getNode() == null);
- assertTrue("SOAP 1.2 Fault Test:- Fault node local name mismatch",
- soapFault.getNode().getLocalName().equals(
- SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME));
+ soapFault.getNode());
+ assertEquals("SOAP 1.2 Fault Test:- Fault node local name mismatch",
+ SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME,
soapFault.getNode().getLocalName());
try {
soapFault.setNode(altSoapFactory.createSOAPFaultNode());
fail("SOAP11FaultNode should nott be set in to a SOAP12Fault");
