You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2006/03/05 23:39:43 UTC
svn commit: r383426 - in
/incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap:
SOAPBindingExtensionsTest.java SOAPBindingFaultExtensionsTest.java
SOAPBindingOperationExtensionsTest.java
Author: jkaputin
Date: Sun Mar 5 14:39:42 2006
New Revision: 383426
URL: http://svn.apache.org/viewcvs?rev=383426&view=rev
Log:
Improved these 3 junit testcases:
For assertEquals specify expected then actual so they
appear correctly in the error message.
Changed some assertTrue to assertEquals.
Removed some unnecessary instance variables and replaced
with local variables.
Modified:
incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java
incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java
incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java
Modified: incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java?rev=383426&r1=383425&r2=383426&view=diff
==============================================================================
--- incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java (original)
+++ incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java Sun Mar 5 14:39:42 2006
@@ -82,8 +82,9 @@
{
String actual = fSoapBindExts.getSoapVersion();
assertNotNull("The value for soap version was null", actual);
- assertTrue("The value expected for soap version was '1.2', but the actual value was '" + actual + "'.",
- "1.2".equals(actual));
+ assertEquals("Expected '1.2' for soap version but the actual value was '" + actual + "'.",
+ "1.2",
+ actual);
}
/**
@@ -96,8 +97,9 @@
assertNotNull("The value for soap underlying protocol was null", actual);
URI expected = URI.create("http://www.w3.org/2003/05/soap/bindings/HTTP");
- assertTrue("The value expected for soap underlying protocol was '" + expected.toString() + "', but the actual value was '" + actual.toString() + "'.",
- expected.equals(actual));
+ assertEquals("Unexpected value for soap underlying protocol.",
+ expected,
+ actual);
}
/**
@@ -110,8 +112,9 @@
assertNotNull("The value for soap mep default was null", actual);
URI expected = URI.create("http://www.w3.org/2003/05/soap/mep/request-response");
- assertTrue("The value expected for soap mep default was '" + expected.toString() + "', but the actual value was '" + actual.toString() + "'.",
- expected.equals(actual));
+ assertEquals("Unexpected value for soap mep default.",
+ expected,
+ actual);
}
/**
@@ -121,8 +124,9 @@
public void testGetSoapModulesExist()
{
SOAPModule[] actual = fSoapBindExts.getSoapModules();
- assertTrue("Expected 2 SOAPModule objects, but the actual number was " + actual.length + ".",
- actual.length == 2);
+ assertEquals("Unexpected number of SOAPModule objects.",
+ 2,
+ actual.length);
}
}
Modified: incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java?rev=383426&r1=383425&r2=383426&view=diff
==============================================================================
--- incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java (original)
+++ incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java Sun Mar 5 14:39:42 2006
@@ -50,7 +50,6 @@
private DescriptionElement fDescElem = null;
private Binding fBinding = null;
- private SOAPBindingFaultExtensions fSoapBindFaultExts = null;
private String fWsdlPath = "org/apache/woden/wsdl20/extensions/soap/resources/SOAPBindingFaultExtensions.wsdl";
public static Test suite()
@@ -79,7 +78,7 @@
fBinding = descComp.getBindings()[0];
assertNotNull("The Description does not contain a Binding.", fBinding);
- assertEquals("The Binding does not contain 3 BindingFaults.", fBinding.getBindingFaults().length, 3);
+ assertEquals("The Binding contains an unexpected number of BindingFaults.", 3, fBinding.getBindingFaults().length);
}
/*
@@ -103,8 +102,8 @@
assertNotNull("The SOAPBindingFaultExtensions did not return a SoapFaultCode.", soapFaultCode);
assertTrue("The SoapFaultCode does not represent a QName.", soapFaultCode.isQName());
assertEquals("The QName represented by the SoapFaultCode is not the expected one.",
- soapFaultCode.getQName(),
- new QName("http://www.w3.org/2003/05/soap-envelope","fault1"));
+ new QName("http://www.w3.org/2003/05/soap-envelope","fault1"),
+ soapFaultCode.getQName());
}
/**
@@ -120,8 +119,8 @@
assertNotNull("The SOAPBindingFaultExtensions did not return a SoapFaultCode.", soapFaultCode);
assertEquals("The SoapFaultCode does not represent the xs:token #any.",
- soapFaultCode,
- SoapFaultCode.ANY);
+ SoapFaultCode.ANY,
+ soapFaultCode);
}
/**
@@ -138,8 +137,8 @@
assertNotNull("The SOAPBindingFaultExtensions did not return a SoapFaultCode.", soapFaultCode);
assertEquals("The wsoap:code extension attribute was omitted, so SoapFaultCode.ANY was expected by default.",
- soapFaultCode,
- SoapFaultCode.ANY);
+ SoapFaultCode.ANY,
+ soapFaultCode);
}
/**
@@ -176,8 +175,8 @@
assertNotNull("The SOAPBindingFaultExtensions did not return a SoapFaultSubcodes.", soapFaultSubcodes);
assertEquals("The SoapFaultSubcodes does not represent the xs:token #any.",
- soapFaultSubcodes,
- SoapFaultSubcodes.ANY);
+ SoapFaultSubcodes.ANY,
+ soapFaultSubcodes);
}
/**
@@ -194,8 +193,8 @@
assertNotNull("The SOAPBindingFaultExtensions did not return a SoapFaultSubcodes.", soapFaultSubcodes);
assertEquals("The SoapFaultSubcodes does not represent the xs:token #any.",
- soapFaultSubcodes,
- SoapFaultSubcodes.ANY);
+ SoapFaultSubcodes.ANY,
+ soapFaultSubcodes);
}
/**
@@ -208,8 +207,7 @@
SOAPBindingFaultExtensions soapBindFaultExts =
(SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
SOAPModule[] actual = soapBindFaultExts.getSoapModules();
- assertTrue("Expected 3 SOAPModule objects, but the actual number was " + actual.length + ".",
- actual.length == 3);
+ assertEquals("Unexpected number of SOAPModule objects.", 3, actual.length);
}
/**
@@ -222,8 +220,7 @@
SOAPBindingFaultExtensions soapBindFaultExts =
(SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
SOAPHeaderBlock[] actual = soapBindFaultExts.getSoapHeaders();
- assertTrue("Expected 2 SOAPHeaderBlock objects, but the actual number was " + actual.length + ".",
- actual.length == 2);
+ assertEquals("Unexpected number of SOAPHeaderBlock objects.", 2, actual.length);
}
}
Modified: incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java?rev=383426&r1=383425&r2=383426&view=diff
==============================================================================
--- incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java (original)
+++ incubator/woden/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java Sun Mar 5 14:39:42 2006
@@ -96,9 +96,7 @@
URI soapMep = soapBindOperExts.getSoapMep();
assertNotNull("The SOAPBindingOperationExtensions did not return a value for {soap mep}.", soapMep);
- assertEquals("The {soap mep} URI is not the expected one.",
- URI.create("urn:mep"),
- soapMep);
+ assertEquals("Unexpected soap mep URI.", URI.create("urn:mep"), soapMep);
}
/**
@@ -112,9 +110,7 @@
URI soapAction = soapBindOperExts.getSoapAction();
assertNotNull("The SOAPBindingOperationExtensions did not return a value for {soap action}.", soapAction);
- assertEquals("The {soap action} URI is not the expected one.",
- URI.create("urn:action"),
- soapAction);
+ assertEquals("Unexpected soap action URI.", URI.create("urn:action"), soapAction);
}
/**
@@ -126,8 +122,7 @@
SOAPBindingOperationExtensions soapBindOperExts =
(SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
SOAPModule[] actual = soapBindOperExts.getSoapModules();
- assertTrue("Expected 1 SOAPModule object, but the actual number was " + actual.length + ".",
- actual.length == 1);
+ assertEquals("Unexpected number of SOAPModule objects.", 1, actual.length);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org