Author: veithen
Date: Mon Mar 15 23:15:50 2010
New Revision: 923502
URL: http://svn.apache.org/viewvc?rev=923502&view=rev
Log:
ADB test cases: Changed the name and target namespace of complete.xsd to match
the package name where the unit tests are located. This makes it easier to
navigate the tests and will also allow to write test cases that access
protected attributes.
Added:
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/testsuite.xsd
- copied, changed from r923466,
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/complete.xsd
Removed:
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/complete.xsd
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AnyElementsTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/CustomElementsTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/IntElementsTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/OuterElementsTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/StringElementsTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/XsdAnyElementsTest.java
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml?rev=923502&r1=923501&r2=923502&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml Mon Mar 15
23:15:50 2010
@@ -54,7 +54,7 @@
<arg file="${schema.source.dir}/mixed_minoccus0.xsd"/>
<arg
file="${schema.source.dir}/simple/simpleType-All.xsd"/>
<arg
file="${schema.source.dir}/derived/derivedType-All.xsd"/>
- <arg file="${testsuite.source.dir}/complete.xsd"/>
+ <arg file="${testsuite.source.dir}/testsuite.xsd"/>
<arg file="${testsuite.source.dir}/extensions.xsd"/>
<arg file="${testsuite.source.dir}/union.xsd"/>
<arg file="${testsuite.source.dir}/all.xsd"/>
Copied:
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/testsuite.xsd
(from r923466,
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/complete.xsd)
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/testsuite.xsd?p2=axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/testsuite.xsd&p1=axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/complete.xsd&r1=923466&r2=923502&rev=923502&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/complete.xsd
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/testsuite.xsd
Mon Mar 15 23:15:50 2010
@@ -17,9 +17,9 @@
~ under the License.
-->
-<schema targetNamespace="http://types.echo.services";
+<schema targetNamespace="http://apache.org/axis2/schema/testsuite";
xmlns="http://www.w3.org/2001/XMLSchema";
- xmlns:tns="http://types.echo.services";
+ xmlns:tns="http://apache.org/axis2/schema/testsuite";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java?rev=923502&r1=923501&r2=923502&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java
Mon Mar 15 23:15:50 2010
@@ -25,9 +25,6 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.schema.AbstractTestCase;
-import services.echo.types.BookInformation;
-
-
public class AbstractTest extends AbstractTestCase {
protected OMElement getOMElement(){
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AnyElementsTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AnyElementsTest.java?rev=923502&r1=923501&r2=923502&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AnyElementsTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AnyElementsTest.java
Mon Mar 15 23:15:50 2010
@@ -21,11 +21,6 @@ package org.apache.axis2.schema.testsuit
import org.apache.axiom.om.OMElement;
-import services.echo.types.TestAny1;
-import services.echo.types.TestAny2;
-import services.echo.types.TestAny3;
-import services.echo.types.TestAny4;
-
public class AnyElementsTest extends AbstractTest {
public static final int MIN_EQUALS_ZERO = 0;
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/CustomElementsTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/CustomElementsTest.java?rev=923502&r1=923501&r2=923502&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/CustomElementsTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/CustomElementsTest.java
Mon Mar 15 23:15:50 2010
@@ -22,7 +22,6 @@ package org.apache.axis2.schema.testsuit
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.StAXUtils;
-import services.echo.types.*;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/IntElementsTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/IntElementsTest.java?rev=923502&r1=923501&r2=923502&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/IntElementsTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/IntElementsTest.java
Mon Mar 15 23:15:50 2010
@@ -22,7 +22,6 @@ package org.apache.axis2.schema.testsuit
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.StAXUtils;
-import services.echo.types.*;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/OuterElementsTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/OuterElementsTest.java?rev=923502&r1=923501&r2=923502&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/OuterElementsTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/OuterElementsTest.java
Mon Mar 15 23:15:50 2010
@@ -22,7 +22,6 @@ package org.apache.axis2.schema.testsuit
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.StAXUtils;
-import services.echo.types.*;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/StringElementsTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/StringElementsTest.java?rev=923502&r1=923501&r2=923502&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/StringElementsTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/StringElementsTest.java
Mon Mar 15 23:15:50 2010
@@ -22,7 +22,6 @@ package org.apache.axis2.schema.testsuit
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.StAXUtils;
-import services.echo.types.*;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/XsdAnyElementsTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/XsdAnyElementsTest.java?rev=923502&r1=923501&r2=923502&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/XsdAnyElementsTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/XsdAnyElementsTest.java
Mon Mar 15 23:15:50 2010
@@ -22,7 +22,6 @@ package org.apache.axis2.schema.testsuit
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.StAXUtils;
-import services.echo.types.*;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
