From 3fe1c10d56677601d3dca6a064b24d21fb43bde9 Mon Sep 17 00:00:00 2001
From: "Norbraten, Terry" <tdnorbra@nps.edu>
Date: Thu, 4 Jun 2020 19:47:24 -0700
Subject: [PATCH] added mains, minor clean ups
---
test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java | 2 +-
test/edu/nps/moves/dis7/CreateAllPduTypesTest.java | 4 ++--
test/edu/nps/moves/dis7/EntityStatePduTest.java | 5 +++++
test/edu/nps/moves/dis7/MarshalEnumsTest.java | 7 ++++++-
test/edu/nps/moves/dis7/PduFactoryTest.java | 11 ++++++++---
test/edu/nps/moves/dis7/SignalPdusTest.java | 4 ++--
6 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java b/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java
index b25a216d89..af90a1b6fd 100644
--- a/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java
+++ b/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java
@@ -269,7 +269,7 @@ public class CreateAllObjectTypesTest
private void actualDumpObjectType(ObjectType ot)
{
String dom = ot.getDomain().toString();
- String kind = ot.getObjectKind().toString();;
+ String kind = ot.getObjectKind().toString();
String nm = ot.getClass().getName();
//System.out.println(String.format(formatStr, nm, dom, kind, ot.getCategory(), ot.getSubCategory()));
}
diff --git a/test/edu/nps/moves/dis7/CreateAllPduTypesTest.java b/test/edu/nps/moves/dis7/CreateAllPduTypesTest.java
index 2e9a86dc17..6facb84b36 100644
--- a/test/edu/nps/moves/dis7/CreateAllPduTypesTest.java
+++ b/test/edu/nps/moves/dis7/CreateAllPduTypesTest.java
@@ -140,14 +140,14 @@ public class CreateAllPduTypesTest
((Marshaller) ob).marshal(dos);
//System.out.println("marshalled " + ob.getClass().getSimpleName());
}
- catch (Throwable t) {
+ catch (Exception t) {
throw new RuntimeException(t);
}
});
}
catch (Throwable t) {
throwable = t;
- t.printStackTrace();
+ t.printStackTrace(System.err);
}
assertNull(throwable, "Exception should be null if successful marshal");
}
diff --git a/test/edu/nps/moves/dis7/EntityStatePduTest.java b/test/edu/nps/moves/dis7/EntityStatePduTest.java
index d8278e29aa..0990e496c7 100644
--- a/test/edu/nps/moves/dis7/EntityStatePduTest.java
+++ b/test/edu/nps/moves/dis7/EntityStatePduTest.java
@@ -45,4 +45,9 @@ public class EntityStatePduTest
}
assertNull(thr, "Exception indicates error creating EntityStatePdu");
}
+
+ public static void main(String[] args)
+ {
+ new EntityStatePduTest().testEntityCapabilities();
+ }
}
diff --git a/test/edu/nps/moves/dis7/MarshalEnumsTest.java b/test/edu/nps/moves/dis7/MarshalEnumsTest.java
index 66c30f1946..0094789a48 100644
--- a/test/edu/nps/moves/dis7/MarshalEnumsTest.java
+++ b/test/edu/nps/moves/dis7/MarshalEnumsTest.java
@@ -517,7 +517,7 @@ public class MarshalEnumsTest
thr = t;
}
if (thr != null)
- thr.printStackTrace();
+ thr.printStackTrace(System.err);
assertNull(thr, "Exception should be null if successful marshal");
//System.out.println(""+count+" enums and disbitsets tested");
}
@@ -586,5 +586,10 @@ public class MarshalEnumsTest
}
System.out.println();
}
+
+ public static void main(String[] args)
+ {
+ new MarshalEnumsTest().testGoodMarshall();
+ }
}
diff --git a/test/edu/nps/moves/dis7/PduFactoryTest.java b/test/edu/nps/moves/dis7/PduFactoryTest.java
index e99ad4383d..b39e6f459a 100644
--- a/test/edu/nps/moves/dis7/PduFactoryTest.java
+++ b/test/edu/nps/moves/dis7/PduFactoryTest.java
@@ -123,8 +123,8 @@ public class PduFactoryTest
}
catch (Throwable t) {
ex = t;
- System.out.println(t.getLocalizedMessage());
- t.printStackTrace();
+ System.err.println(t.getLocalizedMessage());
+ t.printStackTrace(System.err);
}
assertNull(ex, "Exception should be null if successful creation of all objects");
@@ -139,9 +139,14 @@ public class PduFactoryTest
private void actualDumpObjectType(ObjectType ot)
{
String dom = ot.getDomain().toString();
- String kind = ot.getObjectKind().toString();;
+ String kind = ot.getObjectKind().toString();
String nm = ot.getClass().getName();
System.out.println(String.format(formatStr, nm, dom, kind, ot.getCategory(), ot.getSubCategory()));
}
+
+ public static void main(String[] args)
+ {
+ new PduFactoryTest().testCreateAllPdus();
+ }
}
diff --git a/test/edu/nps/moves/dis7/SignalPdusTest.java b/test/edu/nps/moves/dis7/SignalPdusTest.java
index 7f8f815998..c4b4638837 100644
--- a/test/edu/nps/moves/dis7/SignalPdusTest.java
+++ b/test/edu/nps/moves/dis7/SignalPdusTest.java
@@ -46,14 +46,14 @@ public class SignalPdusTest
sigPdu2.setEncodingScheme((short) 0x1111);
sigPdu2.setSampleRate(0x22222222);
sigPdu2.setSamples((short) 0x3333);
- sigPdu2.setData(new String("SignalPdu-testdata").getBytes());
+ sigPdu2.setData("SignalPdu-testdata".getBytes());
IntercomSignalPdu isig = factory.makeIntercomSignalPdu();
IntercomSignalPdu isig2 = factory.makeIntercomSignalPdu();
isig2.setEncodingScheme((short) 0x1111);
isig2.setSampleRate(0x22222222);
isig2.setSamples((short) 0x3333);
- isig2.setData(new String("IntercomSignalPdu-testdata").getBytes());
+ isig2.setData("IntercomSignalPdu-testdata".getBytes());
setUpReceiver();
--
GitLab