Author: kelvingoodson
Date: Tue Feb 20 09:12:18 2007
New Revision: 509664
URL: http://svn.apache.org/viewvc?view=rev&rev=509664
Log:
TUSCANY-1123 further test case clean up
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
incubator/tuscany/java/sdo/impl/src/test/resources/prefix.xsd
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java?view=diff&rev=509664&r1=509663&r2=509664
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
Tue Feb 20 09:12:18 2007
@@ -27,7 +27,6 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sdo.impl.ClassImpl;
import org.apache.tuscany.sdo.util.SDOUtil;
import com.example.simple.SimpleFactory;
@@ -37,7 +36,6 @@
import commonj.sdo.helper.DataFactory;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XSDHelper;
/**
@@ -86,7 +84,7 @@
SimpleFactory.INSTANCE.register(hc);
XSDHelper xsdHelper = hc.getXSDHelper();
- DataObject quoteSDO =
(DataObject)SimpleFactoryImpl.INSTANCE.createQuote();
+ DataObject quoteSDO = (DataObject)SimpleFactory.INSTANCE.createQuote();
List typeList = new Vector();
typeList.add(quoteSDO.getType());
String xsd = null;
@@ -153,7 +151,7 @@
XSDHelper xsdHelper = hc.getXSDHelper();
SimpleFactory.INSTANCE.register(hc);
- DataObject quoteSDO =
(DataObject)SimpleFactoryImpl.INSTANCE.createQuote();
+ DataObject quoteSDO = (DataObject)SimpleFactory.INSTANCE.createQuote();
DataObject quoteType = DataFactory.INSTANCE.create("commonj.sdo",
"Type");
@@ -203,7 +201,7 @@
}
- public void testXSDCorners() throws IOException {
+ public void testPrefixFromNSWithHyphenNumber() throws IOException {
XSDHelper xsdHelper = hc.getXSDHelper();
xsdHelper.define(xsdCornersURL.openStream(), xsdCornersURL.toString());
DataFactory df = hc.getDataFactory();
@@ -212,16 +210,16 @@
root.setString("a2", "a2s");
String doc = hc.getXMLHelper().save(root,
"http://www.example.com/simple-1";, "a");
- String prefix = ((ClassImpl)
root.getType()).getEPackage().getNsPrefix(); // what if there isnt one
- assertEquals("s1", prefix);
- XMLDocument root2 = hc.getXMLHelper().load(doc);
+ assertTrue(doc.indexOf("xmlns:s1=\"http://www.example.com/simple-1\"";)
!= -1);
}
- public void testPrefix() throws IOException {
+ public void testShortPrefix() throws IOException {
XSDHelper xsdHelper = hc.getXSDHelper();
URL url = getClass().getResource("/prefix.xsd");
- Object EClassifier = xsdHelper.define(url.openStream(),
url.toString()).get(0);
- String prefix = ((ClassImpl) EClassifier).getEPackage().getNsPrefix();
- assertTrue(prefix.length() < "soaassureservice".length());
+ xsdHelper.define(url.openStream(), url.toString());
+ DataObject cmd =
hc.getDataFactory().create("http://soaassureservice.soabench.ibm.com";,
"CreateClaim");
+ cmd.setString("requestInfo", "cost");
+ String doc = hc.getXMLHelper().save(cmd,
"http://soaassureservice.soabench.ibm.com";, "createClaim");
+
assertTrue(doc.indexOf("xmlns:as=\"http://soaassureservice.soabench.ibm.com\"";)
!= -1);
}
}
Modified: incubator/tuscany/java/sdo/impl/src/test/resources/prefix.xsd
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/resources/prefix.xsd?view=diff&rev=509664&r1=509663&r2=509664
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/resources/prefix.xsd (original)
+++ incubator/tuscany/java/sdo/impl/src/test/resources/prefix.xsd Tue Feb 20
09:12:18 2007
@@ -14,13 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<schema xmlns="http://www.w3.org/2001/XMLSchema";
targetNamespace="http://soaassureservice.soabench.ibm.com";
xmlns:as="http://soaassureservice.soabench.ibm.com";>
- <element name="requestInfo" type="string"/>
- <element name="createClaim">
- <complexType>
- <sequence>
- <element ref="as:requestInfo"/>
- </sequence>
- </complexType>
- </element>
-</schema>
\ No newline at end of file
+<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:as="http://soaassureservice.soabench.ibm.com";
targetNamespace="http://soaassureservice.soabench.ibm.com";>
+ <element name="requestInfo" type="string"/>
+ <complexType name="CreateClaim">
+ <sequence>
+ <element ref="as:requestInfo"/>
+ </sequence>
+ </complexType>
+</schema>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
