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
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@
</includes>
<reportFormat>brief</reportFormat>
<useFile>false</useFile>
<!-- the forked JVM talks to Maven over TCP, not its stdout, which the console output tests print
writes to directly (Jansi's AnsiConsole), and which would otherwise corrupt that channel -->
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -265,6 +268,10 @@
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
<!-- the dependencies' module descriptors: the runnable jar is one jar on the
class path, not a module -->
<exclude>module-info.class</exclude>
<exclude>META-INF/versions/*/module-info.class</exclude>
</excludes>
</filter>
</filters>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ class CollisionAvoidanceTest extends AnyFunSuite with Matchers {
case ProcedureOutcome.Passed => (true, "")
case ProcedureOutcome.Failed(why) => (false, why)
case ProcedureOutcome.Skipped(why) => (false, why)
case ProcedureOutcome.Excluded(why) => (false, why)
}

test("a DUT that backs off as it should passes, at both settings, which are restored") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,12 @@ class EventRulesTest extends AnyFunSuite with Matchers {
List(Revisions.v3_1r1.elements("8.14.2m").asInstanceOf[io.stepfunc.dnp3c.conformance.api.TestProcedure])
an[ConfigurationException] should be thrownBy Revisions.v3_1r1.validate(Options.from(base), test)
Revisions.v3_1r1.validate(
Options.from(base + (TimeSyncOptions.timeToUnsynchronizedMs.id -> "0") +
(
io.stepfunc.dnp3c.conformance.api.options.AnalogInputOptions.valueReturnDeadband.id -> "10",
io.stepfunc.dnp3c.conformance.api.options.ClassOptions.class1.binaryInputs.id -> "0",
io.stepfunc.dnp3c.conformance.api.options.ClassOptions.class2.binaryInputs.id -> "1, 2")),
Options.from(base ++ Map(
TimeSyncOptions.timeToUnsynchronizedMs.id -> "0",
io.stepfunc.dnp3c.conformance.api.options.AnalogInputOptions.valueReturnDeadband.id -> "10",
io.stepfunc.dnp3c.conformance.api.options.ClassOptions.class1.binaryInputs.id -> "0",
io.stepfunc.dnp3c.conformance.api.options.ClassOptions.class2.binaryInputs.id -> "1, 2"
)),
test
) should
equal(2)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,13 @@ class UnsolicitedNetworkTest extends AnyFunSuite with Matchers {
case c: UdpConnection =>
val overUdp = setup.mode != NetworkMode.Tcp && (solicited || !tcpOpen || udpAfterTcp)
overUdp &&
(if (solicited) setup.udpResponses match {
case UdpDestination.Fixed(p) if !dataTo20000 => port(c) == p
case _ if dataTo20000 => port(c) == 20000
case UdpDestination.OriginatingPort => true
}
else port(c) == destination(isNull))
(if (!solicited) port(c) == destination(isNull)
else if (dataTo20000) port(c) == 20000
else
setup.udpResponses match {
case UdpDestination.Fixed(p) => port(c) == p
case UdpDestination.OriginatingPort => true
})
}

override def connect(c: Connection, keep: Boolean): InetSocketAddress = {
Expand Down
Loading