Author: veithen
Date: Wed Dec 14 23:25:11 2011
New Revision: 1214541
URL: http://svn.apache.org/viewvc?rev=1214541&view=rev
Log:
AXIOM-311: Make correct usage of assertions and removed some redundant
assertions.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultTextTestBase.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultValueTestBase.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultTextTestBase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultTextTestBase.java?rev=1214541&r1=1214540&r2=1214541&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultTextTestBase.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultTextTestBase.java
Wed Dec 14 23:25:11 2011
@@ -47,26 +47,26 @@ public class SOAPFaultTextTestBase exten
soap11FaultText.getLang());
soap11FaultText.setLang("en");
- assertTrue(
+ assertEquals(
"SOAP 1.1 Fault Text Test : - After calling setLang method,
Lang attribute value mismatch",
- soap11FaultText.getLang().equals("en"));
+ "en", soap11FaultText.getLang());
}
public void testSOAP11SetText() {
soap11FaultText.setText("This is only a test");
- assertTrue(
+ assertEquals(
"SOAP 1.1 Fault Text Test : - After calling setText method,
getText method return incorrect string",
- soap11FaultText.getText().equals("This is only a test"));
+ "This is only a test", soap11FaultText.getText());
}
public void testSOAP11GetText() {
- assertTrue(
+ assertEquals(
"SOAP 1.1 Fault Text Test : - After creating SOAPFaultText, it
has a text",
- soap11FaultText.getText().equals(""));
+ "", soap11FaultText.getText());
soap11FaultText.setText("This is only a test");
- assertTrue(
+ assertEquals(
"SOAP 1.1 Fault Text Test : - After calling setText method,
getText method return incorrect string",
- soap11FaultText.getText().equals("This is only a test"));
+ "This is only a test", soap11FaultText.getText());
}
public void testSOAP12GetLang() {
@@ -76,41 +76,41 @@ public class SOAPFaultTextTestBase exten
soap12FaultText.getLang());
soap12FaultText.setLang("en");
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Text Test : - After calling setLang method,
Lang attribute value mismatch",
- soap12FaultText.getLang().equals("en"));
+ "en", soap12FaultText.getLang());
}
public void testSOAP12SetText() {
soap12FaultText.setText("This is only a test");
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Text Test : - After calling setText method,
getText method return incorrect string",
- soap12FaultText.getText().equals("This is only a test"));
+ "This is only a test", soap12FaultText.getText());
}
public void testSOAP12GetText() {
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Text Test : - After creating SOAPFaultText, it
has a text",
- soap12FaultText.getText().equals(""));
+ "", soap12FaultText.getText());
soap12FaultText.setText("This is only a test");
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Text Test : - After calling setText method,
getText method return incorrect string",
- soap12FaultText.getText().equals("This is only a test"));
+ "This is only a test", soap12FaultText.getText());
}
//SOAP 1.1 Fault Text Test (With Parser)
public void testSOAP11GetTextWithParser() {
- assertTrue(
+ assertEquals(
"SOAP 1.1 Fault Text Test With Parser : - getText method
returns incorrect string",
- soap11FaultTextWithParser.trim().equals("Sender Timeout"));
+ "Sender Timeout", soap11FaultTextWithParser.trim());
}
//SOAP 1.2 Fault Text Test (With Parser)
public void testSOAP12GetTextWithParser() {
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Text Test With Parser : - getText method
returns incorrect string",
- soap12FaultTextWithParser.getText().equals("Sender Timeout"));
+ "Sender Timeout", soap12FaultTextWithParser.getText());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultValueTestBase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultValueTestBase.java?rev=1214541&r1=1214540&r2=1214541&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultValueTestBase.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultValueTestBase.java
Wed Dec 14 23:25:11 2011
@@ -36,88 +36,74 @@ public class SOAPFaultValueTestBase exte
//SOAP 1.1 Fault Value Test (Programaticaly Created)
public void testSOAP11setText() {
soap11FaultValue.setText("This is only Test");
- assertTrue("SOAP 1.1 Fault Value Test : - value text mismatch",
- soap11FaultValue.getText().equals("This is only Test"));
+ assertEquals("SOAP 1.1 Fault Value Test : - value text mismatch",
+ "This is only Test", soap11FaultValue.getText());
}
public void testSOAP11GetText() {
- assertTrue(
+ assertEquals(
"SOAP 1.1 Fault Value Test : - After creating Fault Value, it
has a text",
- soap11FaultValue.getText().equals(""));
+ "", soap11FaultValue.getText());
soap11FaultValue.setText("This is only Test");
- assertFalse(
- "SOAP 1.1 Fault Value Test : - After calling setText method,
getText method returns null",
- soap11FaultValue.getText().equals(""));
- assertTrue("SOAP 1.1 Fault Value Test : - value text mismatch",
- soap11FaultValue.getText().equals("This is only Test"));
+ assertEquals("SOAP 1.1 Fault Value Test : - value text mismatch",
+ "This is only Test", soap11FaultValue.getText());
}
//SOAP 1.2 Fault Value(In Fault Code) Test (Programaticaly Created)
public void testSOAP12setTextInFaultCode() {
soap12FaultValueInFaultCode.setText("This is only Test");
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Value Test in Fault Code : - value text
mismatch",
- soap12FaultValueInFaultCode.getText().equals(
- "This is only Test"));
+ "This is only Test", soap12FaultValueInFaultCode.getText());
}
public void testSOAP12GetTextInFaultCode() {
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Value Test in Fault Code : - After creating
Fault Value, it has a text",
- soap12FaultValueInFaultCode.getText().equals(""));
+ "", soap12FaultValueInFaultCode.getText());
soap12FaultValueInFaultCode.setText("This is only Test");
- assertFalse(
- "SOAP 1.2 Fault Value Test in Fault Code : - After calling
setText method, getText method returns null",
- soap12FaultValueInFaultCode.getText().equals(""));
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Value Test in Fault Code : - value text
mismatch",
- soap12FaultValueInFaultCode.getText().equals(
- "This is only Test"));
+ "This is only Test", soap12FaultValueInFaultCode.getText());
}
//SOAP 1.2 Fault Value(In Fault SubCode) Test (Programaticaly Created)
public void testSOAP12setTextInFaultSubCode() {
soap12FaultValueInFaultSubCode.setText("This is only Test");
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Value Test in Fault SubCode : - value text
mismatch",
- soap12FaultValueInFaultSubCode.getText().equals(
- "This is only Test"));
+ "This is only Test", soap12FaultValueInFaultSubCode.getText());
}
public void testSOAP12GetTextInFaultSubCode() {
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Value Test in Fault SubCode : - After creating
Fault Value, it has a text",
- soap12FaultValueInFaultSubCode.getText().equals(""));
+ "", soap12FaultValueInFaultSubCode.getText());
soap12FaultValueInFaultSubCode.setText("This is only Test");
- assertFalse(
- "SOAP 1.2 Fault Value Test in Fault SubCode : - After calling
setText method, getText method returns null",
- soap12FaultValueInFaultSubCode.getText().equals(""));
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Value Test in Fault SubCode : - value text
mismatch",
- soap12FaultValueInFaultSubCode.getText().equals(
- "This is only Test"));
+ "This is only Test", soap12FaultValueInFaultSubCode.getText());
}
//SOAP 1.1 Fault Value Test (With Parser)
public void testSOAP11GetTextWithParser() {
- assertTrue(
+ assertEquals(
"SOAP 1.1 Fault Value Test with parser : - value text
mismatch",
- soap11FaultValueWithParser.trim().equals("env:Sender"));
+ "env:Sender", soap11FaultValueWithParser.trim());
}
//SOAP 1.2 Fault Value(In Fault Code) Test (With Parser)
public void testSOAP12setTextWithParserInFaultCode() {
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Value Test with parser in Fault Code : - value
text mismatch",
- soap12FaultValueInFaultCodeWithParser.getText().equals(
- "env:Sender"));
+ "env:Sender", soap12FaultValueInFaultCodeWithParser.getText());
}
//SOAP 1.2 Fault Value(In Fault SubCode) Test (With Parser)
public void testSOAP12setTextWithParserInFaultSubCode() {
- assertTrue(
+ assertEquals(
"SOAP 1.2 Fault Value Test with parser in Fault SubCode : -
value text mismatch",
- soap12FaultValueInFaultSubCodeWithParser.getText().equals(
- "m:MessageTimeout In First Subcode"));
+ "m:MessageTimeout In First Subcode",
+ soap12FaultValueInFaultSubCodeWithParser.getText());
}
}
