Skip to content
Snippets Groups Projects
Commit 216e3df7 authored by Terry D. Norbraten's avatar Terry D. Norbraten
Browse files

speed up just a bit

parent cfed742d
No related branches found
No related tags found
No related merge requests found
......@@ -14,6 +14,9 @@ import static org.junit.jupiter.api.Assertions.*;
@DisplayName("Comment Pdus Test")
public class CommentPdusTest
{
DisNetworking disnet;
Pdu receivedPdu;
@BeforeAll
public static void setUpClass()
{
......@@ -28,20 +31,21 @@ public class CommentPdusTest
@BeforeEach
public void setUp()
{
disnet = new DisNetworking();
setUpReceiver();
}
@AfterEach
public void tearDown()
{
// disnet.stop();
// disnet = null;
}
private Pdu receivedPdu;
@Test
public void testRoundTrip()
{
PduFactory factory = new PduFactory();
setUpReceiver();
testOne(factory.makeCommentPdu());
testOne(factory.makeCommentPdu("123_test_string"));
......@@ -66,10 +70,9 @@ public class CommentPdusTest
{
try {
Thread.sleep(250l); // make sure receiver is listening
DisNetworking disnet = new DisNetworking();
disnet.sendPdu(pdu);
Thread.sleep(1000l);
Thread.sleep(100l);
}
catch (Exception ex) {
System.err.println("Error sending Multicast: " + ex.getLocalizedMessage());
......@@ -87,7 +90,7 @@ public class CommentPdusTest
Thread rcvThread = new Thread(() -> {
try {
while(true) {
receivedPdu = new DisNetworking().receivePdu(); // blocks
receivedPdu = disnet.receivePdu(); // blocks
}
}
catch (IOException ex) {
......@@ -103,6 +106,9 @@ public class CommentPdusTest
public static void main(String[] args)
{
new CommentPdusTest().testRoundTrip();
CommentPdusTest cpt = new CommentPdusTest();
cpt.setUp();
cpt.testRoundTrip();
// cpt.tearDown();
}
}
......@@ -13,6 +13,9 @@ import static org.junit.jupiter.api.Assertions.*;
@DisplayName("Signal Pdus Test")
public class SignalPdusTest
{
Pdu receivedPdu;
DisNetworking disnet;
@BeforeAll
public static void setUpClass()
{
......@@ -27,15 +30,17 @@ public class SignalPdusTest
@BeforeEach
public void setUp()
{
disnet = new DisNetworking();
setUpReceiver();
}
@AfterEach
public void tearDown()
{
// disnet.stop();
// disnet = null;
}
private Pdu receivedPdu;
@Test
public void testRoundTrip()
{
......@@ -55,17 +60,15 @@ public class SignalPdusTest
isig2.setSamples((short) 0x3333);
isig2.setData("IntercomSignalPdu-testdata".getBytes());
setUpReceiver();
try {
Thread.sleep(2000l); //250l); // make sure receiver is listening
Thread.sleep(250l); // make sure receiver is listening
DisNetworking disnet = new DisNetworking();
disnet.sendPdu(sigPdu);
disnet.sendPdu(sigPdu2);
disnet.sendPdu(isig);
disnet.sendPdu(isig2);
Thread.sleep(3000l); //1000l); //(180*1000l));//waiter.wait();
Thread.sleep(100l);
}
catch (Exception ex) {
System.err.println("Error sending Multicast: " + ex.getLocalizedMessage());
......@@ -84,13 +87,12 @@ public class SignalPdusTest
{
Thread rcvThread = new Thread(() -> {
try {
receivedPdu = new DisNetworking().receivePdu(); // blocks
receivedPdu = disnet.receivePdu(); // blocks
}
catch (IOException ex) {
System.err.println("Error receiving Multicast: " + ex.getLocalizedMessage());
System.exit(1);
}
// waiter.notify();
});
rcvThread.setPriority(Thread.NORM_PRIORITY);
......@@ -100,7 +102,10 @@ public class SignalPdusTest
public static void main(String[] args)
{
new SignalPdusTest().testRoundTrip();
SignalPdusTest spt = new SignalPdusTest();
spt.setUp();
spt.testRoundTrip();
// cpt.tearDown();.testRoundTrip();
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment