Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bugfix] fixed bug on AbstractToSaxWriterVisitor writing timestates

This commit is contained in:
Robert von Burg 2015-02-21 00:19:58 +01:00
parent c9d16f9ee4
commit 193b76ed60
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
li.strolch.model/src/main/java/li/strolch/model/xml/AbstractToSaxWriterVisitor.java
View File

@ -82,7 +82,7 @@ public abstract class AbstractToSaxWriterVisitor {
ITimeVariable<IValue<?>> timeEvolution = timedState.getTimeEvolution();
SortedSet<ITimeValue<IValue<?>>> values = timeEvolution.getValues();
writeStartStrolchElement(Tags.TIMED_STATE, !values.isEmpty(), timedState);
writeStartStrolchElement(Tags.TIMED_STATE, values.isEmpty(), timedState);
for (ITimeValue<IValue<?>> timeValue : values) {
this.writer.writeEmptyElement(Tags.VALUE);

35
li.strolch.model/src/test/java/li/strolch/model/XmlToSaxTest.java
View File

@ -18,10 +18,19 @@ package li.strolch.model;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import li.strolch.model.visitor.OrderDeepEqualsVisitor;
import li.strolch.model.visitor.ResourceDeepEqualsVisitor;
import li.strolch.model.xml.OrderToSaxVisitor;
import li.strolch.model.xml.OrderToSaxWriterVisitor;
import li.strolch.model.xml.ResourceToSaxVisitor;
import li.strolch.model.xml.ResourceToSaxWriterVisitor;
import li.strolch.model.xml.SimpleStrolchElementListener;
import li.strolch.model.xml.XmlModelSaxReader;
@ -72,4 +81,30 @@ public class XmlToSaxTest extends ModelTest {
visitor.visit(parsedResource);
assertTrue("To DOM and back should equal same Resource:\n" + visitor.getMismatchedLocators(), visitor.isEqual());
}
@Test
public void shouldToSaxOrder() throws XMLStreamException {
Order order = ModelGenerator.createOrder("@1", "My Order 1", "MyOrder");
XMLOutputFactory factory = XMLOutputFactory.newInstance();
ByteArrayOutputStream out = new ByteArrayOutputStream();
XMLStreamWriter writer = factory.createXMLStreamWriter(out, "UTF-8");
writer.writeStartDocument();
writer.writeStartElement(Tags.STROLCH_MODEL);
OrderToSaxWriterVisitor toSax = new OrderToSaxWriterVisitor(writer);
toSax.visit(order);
writer.writeEndDocument();
}
@Test
public void shouldToSaxResource() throws XMLStreamException {
Resource resource = ModelGenerator.createResource("@1", "My Resource 1", "MyResource");
XMLOutputFactory factory = XMLOutputFactory.newInstance();
ByteArrayOutputStream out = new ByteArrayOutputStream();
XMLStreamWriter writer = factory.createXMLStreamWriter(out, "UTF-8");
writer.writeStartDocument();
writer.writeStartElement(Tags.STROLCH_MODEL);
ResourceToSaxWriterVisitor toSax = new ResourceToSaxWriterVisitor(writer);
toSax.visit(resource);
writer.writeEndDocument();
}
}