Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<pathelement location="lib/byte-buddy-1.5.0.jar" /> <!-- only needed for tests compile and run -->
<pathelement location="lib/byte-buddy-agent-1.5.0.jar" /> <!-- only needed for tests compile and run -->
<pathelement location="lib/objenesis-2.4.jar" /> <!-- only needed for tests compile and run -->
<pathelement location="lib/jdom2-2.0.6.jar" />
<pathelement location="lib/jdom2-2.0.6.1.jar" />
<pathelement location="lib/jlfgr-1_0.jar" />
<pathelement location="lib/jcip-annotations-1.0.jar" /> <!-- only needed for compile -->
<pathelement location="lib/jsr305.jar" /> <!-- only needed for compile -->
Expand Down Expand Up @@ -183,6 +183,35 @@
</fail>
</target>

<target name="singletest" depends="compile, tests" description="build and run one test file (edited in build.xml)">
<mkdir dir="${testreporttarget}"/>
<junit haltonerror="false" haltonfailure="false" showoutput="yes" printsummary="yes" fork="yes" dir="." timeout="3600000" errorProperty="test.failed" failureProperty="test.failed">
<classpath refid="project.class.path" />
<sysproperty key="java.security.policy" value="lib/security.policy"/>
<sysproperty key="java.library.path" path=".:lib/"/>
<formatter type="xml"/>
<test name="org.openlcb.implementations.LocationServiceUtilsTest"/>
<!--
<test name="org.openlcb.ProducerConsumerEventReportMessageTest"/>
<test name="org.openlcb.can.MessageBuilderTest"/>
<test name="org.openlcb.DatagramAcknowledgedMessageTest"/>
-->
</junit>
<fail>
<condition>
<istrue value="${test.failed}" />
</condition>
</fail>
</target>

<target name="singledemo" depends="compile, tests" description="build and run one demo file (edited in build.xml)">
<java fork="yes" classname="org.openlcb.cdi.swing.CdiPanelDemo">
<classpath refid="project.class.path" />
<sysproperty key="java.security.policy" value="lib/security.policy"/>
<sysproperty key="java.library.path" path=".:lib/"/>
</java>
</target>

<target name="run-coverage" depends="compile, tests" description="build and run test suite, generating coverage report.">
<mkdir dir="${testreporttarget}"/>
<jacoco:coverage destfile="jacoco.exec" excludes="org.slf4j.*">
Expand Down
2 changes: 1 addition & 1 deletion lib/README
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Contents:

Specific components:

jdom-2.0.6.jar
jdom-2.0.6.1.jar
Used for testing only, not in main jar
from <jdom.org>

Expand Down
Binary file added lib/jdom2-2.0.6.1.jar
Binary file not shown.
Binary file removed lib/jdom2-2.0.6.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
<version>2.0.6</version>
<version>2.0.6.1</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
Expand Down