diff --git a/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java b/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java index b25a216d894b6887b25725f8281aaeb3cc5d21a7..af90a1b6fd2b078f657c70ed25a7e1dab13bc345 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 2e9a86dc17034324e2e65bda0acf9489f8ce78a6..6facb84b361b0933fc87c54874e196ed27a3f0fa 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 d8278e29aa4b39604b25ab43a17a11b2a7d25722..0990e496c715171c9fbf8b1a7cfeba0b94283e07 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 66c30f19468c773941fe99698caac8c2e0770448..0094789a48589933531c7b606095f02a88e1e0a4 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 e99ad4383d5c1e44b2e13e8d5410ddc9724ae0a8..b39e6f459aab083d2f13c45a00400bb5a0f37454 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 7f8f81599844f861cbaa2faadbe1a02a38676733..c4b463883761d6014fa90942e972888e01cd4499 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();