You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2019/01/18 23:08:48 UTC
svn commit: r1851656 [4/28] - in /xmlbeans/trunk: ./ external/ lib/
resources/ resources/typeimpl/ resources/typeimpl/org/
resources/typeimpl/org/apache/ resources/typeimpl/org/apache/xmlbeans/
resources/typeimpl/org/apache/xmlbeans/impl/ resources/typ...
Modified: xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java Fri Jan 18 23:08:44 2019
@@ -15,46 +15,26 @@
package compile.scomp.incr.schemaCompile.detailed;
-import junit.framework.TestCase;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.xmlbeans.impl.common.QNameHelper;
-import org.apache.xmlbeans.impl.tool.SchemaCompiler;
-import org.apache.xmlbeans.impl.tool.CodeGenUtil;
-import org.apache.xmlbeans.impl.tool.SchemaCodeGenerator;
-import org.apache.xmlbeans.impl.tool.Diff;
-import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
-import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelComplexType;
-import org.apache.xmlbeans.impl.util.FilerImpl;
-import org.apache.xmlbeans.*;
-
-import java.io.*;
-import java.util.*;
-
-//import tools.util.TestRunUtil;
import compile.scomp.common.CompileCommon;
import compile.scomp.common.CompileTestBase;
-import compile.scomp.common.mockobj.TestFiler;
+import org.apache.xmlbeans.*;
+import org.apache.xmlbeans.impl.util.FilerImpl;
+import org.junit.*;
import javax.xml.namespace.QName;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
-/**
- *
- *
- */
public class IncrCompilationTests extends CompileTestBase {
-
- public IncrCompilationTests(String name) {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(IncrCompilationTests.class);
- }
-
+ @Before
public void setUp() throws IOException {
CompileCommon.deltree(CompileCommon.xbeanOutput(outputDir));
out = CompileCommon.xbeanOutput(outPath);
@@ -67,14 +47,15 @@ public class IncrCompilationTests extend
xm.setSavePrettyPrint();
}
- public void tearDown() throws Exception
- {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
if (errors.size() > 0)
errors.clear();
}
+ @Test
+ @Ignore
public void test_dupetype_diffns() throws Exception {
XmlObject obj1 = XmlObject.Factory.parse(getBaseSchema("baz", "elName", "string", "attrName", "string"));
XmlObject obj2 = XmlObject.Factory.parse(getBaseSchema("bar", "elName", "string", "attrName", "string"));
@@ -110,7 +91,8 @@ public class IncrCompilationTests extend
handleErrors(errors);
}
-
+ @Test
+ @Ignore("Duplicate global type")
public void test_dupens_difftypename() throws Exception {
XmlObject obj1 = XmlObject.Factory.parse(getBaseSchema("baz", "elName", "string", "attrName", "string"));
XmlObject obj2 = XmlObject.Factory.parse(getBaseSchema("baz", "elName2", "string", "attrName2", "string"));
@@ -139,6 +121,8 @@ public class IncrCompilationTests extend
* This test should not change sts since xmlobject is same
* @throws Exception
*/
+ @Test
+ @Ignore("Duplicate global type")
public void test_dupens_dupetypename() throws Exception {
XmlObject obj1 = XmlObject.Factory.parse(getBaseSchema("baz", "elName", "string", "attrName", "string"));
XmlObject obj2 = XmlObject.Factory.parse(getBaseSchema("baz", "elName", "string", "attrName", "string"));
@@ -164,6 +148,8 @@ public class IncrCompilationTests extend
handleErrors(errors);
}
+ @Test
+ @Ignore("Duplicate global type")
public void test_dupens_attrnamechange() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
XmlObject obj1 = XmlObject.Factory.parse(getBaseSchema("baz", "elName", "string", "attrName", "string"));
@@ -183,12 +169,14 @@ public class IncrCompilationTests extend
findElementbyQName(base, baseTypes);
findElementbyQName(incr, incrTypes);
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
}
+ @Test
+ @Ignore("Duplicate global type")
public void test_dupens_attrtypechange() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
XmlObject obj1 = XmlObject.Factory.parse(getBaseSchema("baz", "elName", "string", "attrName", "string"));
@@ -208,13 +196,14 @@ public class IncrCompilationTests extend
findElementbyQName(base, baseTypes);
findElementbyQName(incr, incrTypes);
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
}
-
+ @Test
+ @Ignore("Duplicate global type")
public void test_dupens_eltypechange() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
XmlObject obj1 = XmlObject.Factory.parse(getBaseSchema("baz", "elName", "string", "attrName", "string"));
@@ -235,12 +224,14 @@ public class IncrCompilationTests extend
findElementbyQName(incr, incrTypes);
// if (incr.findElement(incrTypes[0]).getType().g
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
}
+ @Test
+ @Ignore("Duplicate global type")
public void test_typechange() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
XmlObject obj1 = XmlObject.Factory.parse(getBaseSchema("baz", "elName", "string", "attrName", "string"));
@@ -260,13 +251,14 @@ public class IncrCompilationTests extend
findElementbyQName(base, baseTypes);
findElementbyQName(incr, incrTypes);
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
}
// test regeneration of generated java files by the Filer
+ @Test
public void test_schemaFilesRegeneration_01() throws Exception {
// incremental compile with the same file again. There should be no regeneration of src files
@@ -310,7 +302,7 @@ public class IncrCompilationTests extend
handleErrors(errors);
}
-
+ @Test
public void test_schemaFilesRegeneration_02() throws Exception {
// incremental compile with the changes. Specific files should be regenerated
XmlObject obj1 = XmlObject.Factory.parse(schemaFilesRegeneration_schema1);
Modified: xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java Fri Jan 18 23:08:44 2019
@@ -15,49 +15,34 @@
package compile.scomp.incr.schemaCompile.detailed;
-import junit.framework.TestCase;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.xmlbeans.impl.common.QNameHelper;
-import org.apache.xmlbeans.impl.tool.SchemaCompiler;
-import org.apache.xmlbeans.impl.tool.CodeGenUtil;
-import org.apache.xmlbeans.impl.tool.SchemaCodeGenerator;
-import org.apache.xmlbeans.impl.tool.Diff;
-import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
-import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelComplexType;
-import org.apache.xmlbeans.*;
+import compile.scomp.common.CompileCommon;
+import compile.scomp.common.CompileTestBase;
+import org.apache.xmlbeans.SchemaTypeSystem;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import javax.xml.namespace.QName;
import java.io.File;
-import java.io.StringWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-import java.util.Collections;
-
-import tools.util.TestRunUtil;
-import compile.scomp.common.CompileCommon;
-import compile.scomp.common.CompileTestBase;
-import javax.xml.namespace.QName;
+import static org.junit.Assert.assertNotSame;
-/**
- *
- *
- */
+@Ignore("Currently all tests receive a duplicate schema entry exception")
public class ModelGroupTests extends CompileTestBase {
+ File obj1File, obj2File;
- public ModelGroupTests(String name) {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(ModelGroupTests.class);
- }
-
+ @Before
public void setUp() throws IOException {
CompileCommon.deltree(CompileCommon.xbeanOutput(outputDir));
out = CompileCommon.xbeanOutput(outPath);
@@ -68,37 +53,56 @@ public class ModelGroupTests extends Com
xm = new XmlOptions();
xm.setErrorListener(errors);
xm.setSavePrettyPrint();
+
+ obj1File = File.createTempFile("obj1_", ".xsd");
+ obj2File = File.createTempFile("obj2_", ".xsd");
}
- public void tearDown() throws Exception
- {
- super.tearDown();
- if (errors.size() > 0)
+ @After
+ public void tearDown() throws Exception {
+ if (errors.size() > 0) {
errors.clear();
+ }
+ obj1File.delete();
+ obj2File.delete();
+ }
+
+ private XmlObject[] getSchema(File objFile, String schemaString) throws IOException, XmlException {
+ FileOutputStream fos = new FileOutputStream(objFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, Charset.forName("UTF-8"));
+ if (!schemaString.startsWith("<?xml")) {
+ osw.write(getSchemaTop("baz"));
+ }
+ osw.write(schemaString);
+ if (!schemaString.startsWith("<?xml")) {
+ osw.write(getSchemaBottom());
+ }
+ osw.close();
+
+ XmlObject obj = XmlObject.Factory.parse(objFile);
+ obj.documentProperties().setSourceName(objFile.toURI().toASCIIString());
+ return new XmlObject[]{obj};
}
+ @Test
public void test_model_diffns_choice2seqchange() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
- XmlObject obj1 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ XmlObject[] schemas = getSchema(obj1File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:choice>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:choice>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject obj2 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ "</xs:complexType>");
+ XmlObject[] schemas2 = getSchema(obj2File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:sequence>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:sequence>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject[] schemas = new XmlObject[]{obj1};
- XmlObject[] schemas2 = new XmlObject[]{obj2};
- schemas[0].documentProperties().setSourceName("obj1");
- schemas2[0].documentProperties().setSourceName("obj2");
+ "</xs:complexType>");
SchemaTypeSystem base = compileSchemas(schemas, builtin, xm);
SchemaTypeSystem incr = incrCompileXsd(base, schemas2, builtin, xm);
@@ -111,34 +115,31 @@ public class ModelGroupTests extends Com
findElementbyQName(incr, incrTypes);
// if (incr.findElement(incrTypes[0]).getType().g
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
}
+ @Test
public void test_model_seq2choicechange() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
- XmlObject obj1 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ XmlObject[] schemas = getSchema(obj1File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:sequence>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:sequence>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject obj2 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ "</xs:complexType>");
+ XmlObject[] schemas2 = getSchema(obj2File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:choice>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:choice>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject[] schemas = new XmlObject[]{obj1};
- XmlObject[] schemas2 = new XmlObject[]{obj2};
- schemas[0].documentProperties().setSourceName("obj1");
- schemas2[0].documentProperties().setSourceName("obj2");
+ "</xs:complexType>");
SchemaTypeSystem base = compileSchemas(schemas, builtin, xm);
SchemaTypeSystem incr = incrCompileXsd(base, schemas2, builtin, xm);
@@ -150,28 +151,25 @@ public class ModelGroupTests extends Com
findElementbyQName(base, baseTypes);
findElementbyQName(incr, incrTypes);
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
}
+ @Test
public void test_model_seq2choicechange_diffns() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
- XmlObject obj1 = XmlObject.Factory.parse(getBaseSchema("bar", "elName", "string", "attrName", "string"));
- XmlObject obj2 = XmlObject.Factory.parse(
- getSchemaTop("baz")+
+ XmlObject[] schemas = getSchema(obj1File,
+ getBaseSchema("bar", "elName", "string", "attrName", "string"));
+ XmlObject[] schemas2 = getSchema(obj2File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:sequence>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:sequence>" +
- "</xs:complexType>"+getSchemaBottom());
- XmlObject[] schemas = new XmlObject[]{obj1};
- XmlObject[] schemas2 = new XmlObject[]{obj2};
- schemas[0].documentProperties().setSourceName("obj1");
- schemas2[0].documentProperties().setSourceName("obj2");
+ "</xs:complexType>");
SchemaTypeSystem base = compileSchemas(schemas, builtin, xm);
SchemaTypeSystem incr = incrCompileXsd(base, schemas2, builtin, xm);
@@ -184,34 +182,31 @@ public class ModelGroupTests extends Com
findElementbyQName(incr, incrTypes);
// if (incr.findElement(incrTypes[0]).getType().g
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
}
+ @Test
public void test_model_seq2allchange() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
- XmlObject obj1 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ XmlObject[] schemas = getSchema(obj1File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:sequence>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:sequence>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject obj2 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ "</xs:complexType>");
+ XmlObject[] schemas2 = getSchema(obj2File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:all>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:all>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject[] schemas = new XmlObject[]{obj1};
- XmlObject[] schemas2 = new XmlObject[]{obj2};
- schemas[0].documentProperties().setSourceName("obj1");
- schemas2[0].documentProperties().setSourceName("obj2");
+ "</xs:complexType>");
SchemaTypeSystem base = compileSchemas(schemas, builtin, xm);
SchemaTypeSystem incr = incrCompileXsd(base, schemas2, builtin, xm);
@@ -224,34 +219,31 @@ public class ModelGroupTests extends Com
findElementbyQName(incr, incrTypes);
// if (incr.findElement(incrTypes[0]).getType().g
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
}
+ @Test
public void test_model_all2seqchange() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
- XmlObject obj1 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ XmlObject[] schemas = getSchema(obj1File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:all>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:all>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject obj2 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ "</xs:complexType>");
+ XmlObject[] schemas2 = getSchema(obj2File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:sequence>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:sequence>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject[] schemas = new XmlObject[]{obj1};
- XmlObject[] schemas2 = new XmlObject[]{obj2};
- schemas[0].documentProperties().setSourceName("obj1");
- schemas2[0].documentProperties().setSourceName("obj2");
+ "</xs:complexType>");
SchemaTypeSystem base = compileSchemas(schemas, builtin, xm);
SchemaTypeSystem incr = incrCompileXsd(base, schemas2, builtin, xm);
@@ -264,34 +256,31 @@ public class ModelGroupTests extends Com
findElementbyQName(incr, incrTypes);
// if (incr.findElement(incrTypes[0]).getType().g
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
}
+ @Test
public void test_model_all2choicechange() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
- XmlObject obj1 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ XmlObject[] schemas = getSchema(obj1File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:all>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:all>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject obj2 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ "</xs:complexType>");
+ XmlObject[] schemas2 = getSchema(obj2File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:choice>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:choice>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject[] schemas = new XmlObject[]{obj1};
- XmlObject[] schemas2 = new XmlObject[]{obj2};
- schemas[0].documentProperties().setSourceName("obj1");
- schemas2[0].documentProperties().setSourceName("obj2");
+ "</xs:complexType>");
SchemaTypeSystem base = compileSchemas(schemas, builtin, xm);
SchemaTypeSystem incr = incrCompileXsd(base, schemas2, builtin, xm);
@@ -304,34 +293,31 @@ public class ModelGroupTests extends Com
findElementbyQName(incr, incrTypes);
// if (incr.findElement(incrTypes[0]).getType().g
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
}
+ @Test
public void test_model_choice2choicechange() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
- XmlObject obj1 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ XmlObject[] schemas = getSchema(obj1File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:choice>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:choice>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject obj2 = XmlObject.Factory.parse(getSchemaTop("baz") +
+ "</xs:complexType>");
+ XmlObject[] schemas2 = getSchema(obj2File,
"<xs:element name=\"elName\" type=\"bas:aType\" xmlns:bas=\"http://baz\" />" +
"<xs:complexType name=\"aType\">" +
"<xs:all>" +
"<xs:element name=\"a\" type=\"xs:string\" />" +
"<xs:element name=\"b\" type=\"xs:string\" />" +
"</xs:all>" +
- "</xs:complexType>" + getSchemaBottom());
- XmlObject[] schemas = new XmlObject[]{obj1};
- XmlObject[] schemas2 = new XmlObject[]{obj2};
- schemas[0].documentProperties().setSourceName("obj1");
- schemas2[0].documentProperties().setSourceName("obj2");
+ "</xs:complexType>");
SchemaTypeSystem base = compileSchemas(schemas, builtin, xm);
SchemaTypeSystem incr = incrCompileXsd(base, schemas2, builtin, xm);
@@ -344,12 +330,9 @@ public class ModelGroupTests extends Com
findElementbyQName(incr, incrTypes);
// if (incr.findElement(incrTypes[0]).getType().g
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
}
-
-
-
}
Modified: xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java Fri Jan 18 23:08:44 2019
@@ -15,46 +15,25 @@
package compile.scomp.incr.schemaCompile.detailed;
-import junit.framework.TestCase;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.xmlbeans.impl.common.QNameHelper;
-import org.apache.xmlbeans.impl.tool.SchemaCompiler;
-import org.apache.xmlbeans.impl.tool.CodeGenUtil;
-import org.apache.xmlbeans.impl.tool.SchemaCodeGenerator;
-import org.apache.xmlbeans.impl.tool.Diff;
-import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
-import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelComplexType;
-import org.apache.xmlbeans.*;
-
-import java.io.File;
-import java.io.StringWriter;
-import java.io.IOException;
-import java.util.*;
-
-import tools.util.TestRunUtil;
import compile.scomp.common.CompileCommon;
import compile.scomp.common.CompileTestBase;
+import org.apache.xmlbeans.SchemaTypeSystem;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
import javax.xml.namespace.QName;
+import java.io.IOException;
+import java.util.ArrayList;
+import static org.junit.Assert.assertNotSame;
-/**
- *
- *
- */
-public class PerfTests extends CompileTestBase {
-
-
- public PerfTests(String name) {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(PerfTests.class);
- }
+public class PerfTests extends CompileTestBase {
+ @Before
public void setUp() throws IOException {
CompileCommon.deltree(CompileCommon.xbeanOutput(outputDir));
out = CompileCommon.xbeanOutput(outPath);
@@ -67,13 +46,14 @@ public class PerfTests extends CompileTe
xm.setSavePrettyPrint();
}
- public void tearDown() throws Exception
- {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
if (errors.size() > 0)
errors.clear();
}
+ @Ignore("throws duplicate global type")
+ @Test
public void test_perf_choice2seqchange() throws Exception {
//XmlObject.Factory.parse(getBaseSchema("baz","elName", "elType", "attrName","attrType"));
XmlObject obj1 = XmlObject.Factory.parse(getSchemaTop("baz") +
@@ -113,7 +93,7 @@ public class PerfTests extends CompileTe
findElementbyQName(base, baseTypes);
findElementbyQName(incr, incrTypes);
- Assert.assertNotSame(base, incr);
+ assertNotSame(base, incr);
compareandPopErrors(out, outincr, errors);
handleErrors(errors);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org