Skip to content

Commit

Permalink
Merge pull request #11 from sarahtattersall/fix_default_weight
Browse files Browse the repository at this point in the history 
Fix issue #10 by adding default value to GenerateObjectList.xml
  • Loading branch information
Sarah Tattersall committed Oct 10, 2013
2 parents 7a12db4 + 01533db commit a8ac05a
Show file tree
Hide file tree
Showing 3 changed files with 135 additions and 7 deletions.
13 changes: 10 additions & 3 deletions src/main/resources/xslt/GenerateObjectList.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,16 @@
<xsl:attribute name="target">
<xsl:value-of select="@target"/>
</xsl:attribute>
<xsl:attribute name="inscription">
<xsl:value-of select="inscription/value"/>
</xsl:attribute>
<xsl:choose>
<xsl:when test="inscription/value">
<xsl:attribute name="inscription">
<xsl:value-of select="inscription/value"/>
</xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:attribute name="inscription">1</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
<xsl:attribute name="inscriptionOffsetX">
<xsl:value-of select="inscription/graphics/offset/@x"/>
</xsl:attribute>
Expand Down
63 changes: 59 additions & 4 deletions src/test/java/pipe/utilities/transformers/PNMLTransformerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLTestCase;
import org.w3c.dom.Document;
import org.junit.Before;
import org.w3c.dom.*;

public class PNMLTransformerTest extends XMLTestCase
{
Expand All @@ -19,8 +20,36 @@ public class PNMLTransformerTest extends XMLTestCase
public static final String SIMPLE_NET_WITH_TOKEN = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?><pnml><net id=\"Net-One\" type=\"P/T net\"><token id=\"Default\" enabled=\"true\" red=\"0\" green=\"0\" blue=\"0\"/><place id=\"P0\"><graphics><position x=\"135.0\" y=\"120.0\"/></graphics><name><value>P0</value><graphics/></name><initialMarking><value>2</value><graphics/></initialMarking></place><place id=\"P1\"><graphics><position x=\"375.0\" y=\"120.0\"/></graphics><name><value>P1</value><graphics/></name><initialMarking><value>0</value><graphics/></initialMarking></place><transition id=\"T0\"><graphics><position x=\"255.0\" y=\"120.0\"/></graphics><name><value>T0</value><graphics/></name><orientation><value>0</value></orientation><rate><value>1.0</value></rate><timed><value>true</value></timed></transition><arc id=\"P0 to T0\" source=\"P0\" target=\"T0\"><graphics/><inscription><value>1</value><graphics/></inscription><arcpath id=\"000\" x=\"160\" y=\"131\" curvePoint=\"false\"/><arcpath id=\"001\" x=\"260\" y=\"131\" curvePoint=\"false\"/></arc><arc id=\"T0 to P1\" source=\"T0\" target=\"P1\"><graphics/><inscription><value>1</value><graphics/></inscription><arcpath id=\"000\" x=\"270\" y=\"131\" curvePoint=\"false\"/><arcpath id=\"001\" x=\"371\" y=\"131\" curvePoint=\"false\"/></arc></net></pnml>";
public static final String ONE_TOKEN_TWO_INITIAL_MARKINGS = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?><pnml><net id=\"Net-One\" type=\"P/T net\"><token id=\"Default\" enabled=\"true\" red=\"0\" green=\"0\" blue=\"0\"/><place id=\"P0\"><graphics><position x=\"135.0\" y=\"120.0\"/></graphics><name><value>P0</value><graphics/></name><initialMarking><value>Default,0,Red,0</value><graphics/></initialMarking></place></net></pnml>";;
public static final String TWO_TOKENS_TWO_INITIAL_MARKINGS_ONE_NONZERO = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?><pnml><net id=\"Net-One\" type=\"P/T net\"><token id=\"Default\" enabled=\"true\" red=\"0\" green=\"0\" blue=\"0\"/><token id=\"Red\" enabled=\"true\" red=\"255\" green=\"0\" blue=\"0\"/><place id=\"P0\"><graphics><position x=\"135.0\" y=\"120.0\"/></graphics><name><value>P0</value><graphics/></name><initialMarking><value>Default,0,Red,1</value><graphics/></initialMarking></place></net></pnml>";;
private static final String SIMPLE_NET_FILE = "src"+SLASH+"test"+SLASH+"resources"+SLASH+"xml"+SLASH+"simpleNet.xml";
private PNMLTransformer transformer;

private static final String SIMPLE_NET_FILE;
private static final String NO_DEFAULT_ARC_VALUE_FILE;

static {
final StringBuilder xmlDirectoryBuilder = new StringBuilder();
xmlDirectoryBuilder.append("src")
.append(SLASH)
.append("test")
.append(SLASH)
.append("resources")
.append(SLASH)
.append("xml")
.append(SLASH);
final StringBuilder simpleNetFileBuilder = new StringBuilder(xmlDirectoryBuilder);
simpleNetFileBuilder.append("simpleNet.xml");
SIMPLE_NET_FILE = simpleNetFileBuilder.toString();

final StringBuilder noDefaultArcValueBuilder = new StringBuilder(xmlDirectoryBuilder);
noDefaultArcValueBuilder.append("noDefaultArcValue.xml");
NO_DEFAULT_ARC_VALUE_FILE = noDefaultArcValueBuilder.toString();
}

private PNMLTransformer transformer;

@Before
public void setUp()
{
transformer = new PNMLTransformer();
}

// @Test Junit 3 will be used to run this class because it uses XMLUnit; @Test annotations ignored.
public void testDocumentsBuiltFromSameFileAreEqual() throws Exception
Expand All @@ -40,7 +69,33 @@ public void testDocumentsBuiltFromFileAndFromStreamAreEqual() throws Exception
Diff diff = new Diff(doc, doc2);
assertXMLIdentical("identical",diff, true);
}
public static StreamSource getNetAsStreamSource(String net)
/**
*
* This method ensures that an arc nodes inscription matches the expectedValue
*
* @param arc the arcNode to find an inscription of
* @param expectedValue the value that should be associated with an arcs inscription
*
*/
private void assertArcValue(Node arc, String expectedValue)
{
NamedNodeMap arcAttributes = arc.getAttributes();
Node actualInscriptionNode = arcAttributes.getNamedItem("inscription");
String actualInscription = actualInscriptionNode.getNodeValue();
assertEquals(expectedValue, actualInscription);
}
public void testDefaultArcValue()
{
Document doc = transformer.transformPNML(NO_DEFAULT_ARC_VALUE_FILE);
NodeList nodeList = doc.getElementsByTagName("arc");
assertEquals(2, nodeList.getLength());

Node firstArc = nodeList.item(0);
Node secondArc = nodeList.item(1);
assertArcValue(firstArc, "1");
assertArcValue(secondArc, "10");
}
public static StreamSource getNetAsStreamSource(String net)
{
StreamSource simpleSource = new StreamSource(new ByteArrayInputStream(net.getBytes()));
return simpleSource;
Expand Down
66 changes: 66 additions & 0 deletions src/test/resources/xml/noDefaultArcValue.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<pnml>
<net id="Net-One" type="P/T net">
<place id="P0">
<graphics>
<position x="135.0" y="120.0"/>
</graphics>
<name>
<value>P0</value>
<graphics/>
</name>
<initialMarking>
<value>2</value>
<graphics/>
</initialMarking>
</place>
<place id="P1">
<graphics>
<position x="375.0" y="120.0"/>
</graphics>
<name>
<value>P1</value>
<graphics/>
</name>
<initialMarking>
<value>0</value>
<graphics/>
</initialMarking>
</place>
<transition id="T0">
<graphics>
<position x="255.0" y="120.0"/>
</graphics>
<name>
<value>T0</value>
<graphics/>
</name>
<orientation>
<value>0</value>
</orientation>
<rate>
<value>1.0</value>
</rate>
<timed>
<value>true</value>
</timed>
</transition>
<arc id="noValueArc" source="P0" target="T0">
<graphics/>
<inscription>
<graphics/>
</inscription>
<arcpath id="000" x="160" y="131" curvePoint="false"/>
<arcpath id="001" x="260" y="131" curvePoint="false"/>
</arc>
<arc id="T0 to P1" source="T0" target="P1">
<graphics/>
<inscription>
<value>10</value>
<graphics/>
</inscription>
<arcpath id="000" x="270" y="131" curvePoint="false"/>
<arcpath id="001" x="371" y="131" curvePoint="false"/>
</arc>
</net>
</pnml>

0 comments on commit a8ac05a

Please sign in to comment.