From 4be3bce3bf4f4f01abaecb802308c236930dd824 Mon Sep 17 00:00:00 2001 From: Daniel Florian Date: Tue, 25 Mar 2014 11:48:32 -0400 Subject: [PATCH] Modified a couple test cases to make sure the node does not have the unqualified property. There might be other tests needed to verify other situations. --- .../modeshape/sequencer/xsd/XsdSequencerTest.java | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/sequencers/modeshape-sequencer-xsd/src/test/java/org/modeshape/sequencer/xsd/XsdSequencerTest.java b/sequencers/modeshape-sequencer-xsd/src/test/java/org/modeshape/sequencer/xsd/XsdSequencerTest.java index 8d0699f..bd3a1e7 100644 --- a/sequencers/modeshape-sequencer-xsd/src/test/java/org/modeshape/sequencer/xsd/XsdSequencerTest.java +++ b/sequencers/modeshape-sequencer-xsd/src/test/java/org/modeshape/sequencer/xsd/XsdSequencerTest.java @@ -16,8 +16,10 @@ package org.modeshape.sequencer.xsd; +import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import javax.jcr.Node; import org.junit.Test; @@ -36,7 +38,7 @@ public class XsdSequencerTest extends AbstractSequencerTest { assertSequencedSuccessfully("stockQuote.xsd"); } - private void assertSequencedSuccessfully( String filename ) throws Exception { + private Node assertSequencedSuccessfully( String filename ) throws Exception { int pathSeparatorIndex = filename.lastIndexOf("/"); String nodeName = pathSeparatorIndex != -1 ? filename.substring(pathSeparatorIndex + 1) : filename; @@ -47,6 +49,8 @@ public class XsdSequencerTest extends AbstractSequencerTest { assertCreatedBySessionUser(outputNode, session); assertEquals(XsdLexicon.SCHEMA_DOCUMENT, outputNode.getPrimaryNodeType().getName()); assertTrue(outputNode.getNodes().getSize() > 0); + + return outputNode; } @Test @@ -81,7 +85,10 @@ public class XsdSequencerTest extends AbstractSequencerTest { @Test public void shouldBeAbleToParseXsdFromDefinitiveXmlSchemaExampleChapter04ord1() throws Exception { - assertSequencedSuccessfully("definitiveXmlSchema/chapter04ord1.xsd"); + final Node outputNode = assertSequencedSuccessfully("definitiveXmlSchema/chapter04ord1.xsd"); + final Node includeNode = outputNode.getNode(XsdLexicon.INCLUDE); + assertThat(includeNode.hasProperty(XsdLexicon.SCHEMA_LOCATION), is(true)); + assertThat(includeNode.hasProperty("schemaLocation"), is(false)); } @Test @@ -142,6 +149,14 @@ public class XsdSequencerTest extends AbstractSequencerTest { @Test @FixFor("MODE-1464") public void shouldBeAbleToParseUnsignedLong() throws Exception { - assertSequencedSuccessfully("unsigned_long.xsd"); + final Node outputNode = assertSequencedSuccessfully("unsigned_long.xsd"); + + final Node includeNode = outputNode.getNode(XsdLexicon.IMPORT); + assertThat(includeNode.hasProperty(XsdLexicon.SCHEMA_LOCATION), is(true)); + assertThat(includeNode.hasProperty("schemaLocation"), is(false)); + + final Node complexType = outputNode.getNode("openAttrs"); + assertThat(complexType.hasProperty(XsdLexicon.MIXED), is(true)); + assertThat(complexType.hasProperty("mixed"), is(false)); } } -- 1.8.5.2 (Apple Git-48)