Author: kelvingoodson
Date: Mon Dec 4 03:32:53 2006
New Revision: 482141
URL: http://svn.apache.org/viewvc?view=rev&rev=482141
Log:
TUSCANY-935 altering namespace of test case data to avoid the "point in time"
issue that there is currently cross talk between type scopes because the
alterations to the type generator that need to be done for the HelperContext
work have not been done yet. I have also slimmed down the schema to be
specific to the test case while I was in the file to ease readability.
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java
incubator/tuscany/java/sdo/impl/src/test/resources/dotNames.xsd
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AllTests.java?view=diff&rev=482141&r1=482140&r2=482141
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
Mon Dec 4 03:32:53 2006
@@ -10,8 +10,6 @@
TestSuite suite = new TestSuite();
// suite.addTestSuite(ChangeSummaryOnDataObjectTestCase.class);
- suite.addTestSuite(DotNameTest.class);
-
suite.addTestSuite(ChangeSummaryTestCase.class);
suite.addTestSuite(CrossScopeCopyTestCase.class);
suite.addTestSuite(DataTypeBaseTypeTestCase.class);
@@ -31,9 +29,7 @@
suite.addTestSuite(XMLStreamHelperTestCase.class);
suite.addTestSuite(XPathTestCase.class);
suite.addTestSuite(XSDHelperTestCase.class);
-
suite.addTestSuite(DotNameTest.class);
-
return suite;
}
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java?view=diff&rev=482141&r1=482140&r2=482141
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java
Mon Dec 4 03:32:53 2006
@@ -38,7 +38,7 @@
public class DotNameTest extends TestCase {
private final String TEST_MODEL = "/dotNames.xsd";
- private final String TEST_NAMESPACE = "http://www.example.com/simple";;
+ private final String TEST_NAMESPACE = "http://www.example.com/dotNames";;
private HelperContext hc;
private TypeHelper th;
private DataFactory df;
@@ -47,7 +47,7 @@
* Simple Dynamic SDO 2 test.
*/
public void testDynamic() throws IOException {
- Type quoteType = th.getType(TEST_NAMESPACE, "Quote");
+ Type quoteType = th.getType(TEST_NAMESPACE, "DotNameType");
DataObject quote = df.create(quoteType);
Modified: incubator/tuscany/java/sdo/impl/src/test/resources/dotNames.xsd
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/resources/dotNames.xsd?view=diff&rev=482141&r1=482140&r2=482141
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/resources/dotNames.xsd (original)
+++ incubator/tuscany/java/sdo/impl/src/test/resources/dotNames.xsd Mon Dec 4
03:32:53 2006
@@ -1,43 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
-->
-<xsd:schema
- targetNamespace="http://www.example.com/simple";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:simple="http://www.example.com/simple";>
+<xsd:schema xmlns:dn="http://www.example.com/dotNames";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
targetNamespace="http://www.example.com/dotNames";>
- <xsd:element name="stockQuote" type="simple:Quote"/>
+ <xsd:element name="dotNameElement" type="dn:DotNameType"/>
- <xsd:complexType name="Quote">
+ <xsd:complexType name="DotNameType">
<xsd:sequence>
- <xsd:element name="symbol" type="xsd:string"/>
- <xsd:element name="companyName" type="xsd:string"/>
- <xsd:element name="price" type="xsd:decimal"/>
- <xsd:element name="open1" type="xsd:decimal"/>
- <xsd:element name="high" type="xsd:decimal"/>
- <xsd:element name="low" type="xsd:decimal"/>
- <xsd:element name="volume" type="xsd:double"/>
- <xsd:element name="change1" type="xsd:double"/>
- <xsd:element name="quotes" type="simple:Quote" minOccurs="0"
maxOccurs="unbounded"/>
- <xsd:element name="property.2.1" type="xsd:string" minOccurs="0"
maxOccurs="unbounded"/>
- <xsd:element name="foo.bar" type="xsd:string" minOccurs="0"
maxOccurs="unbounded"/>
+ <xsd:element maxOccurs="unbounded" minOccurs="0" name="property.2.1"
type="xsd:string"/>
+ <xsd:element maxOccurs="unbounded" minOccurs="0" name="foo.bar"
type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
-
</xsd:schema>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
