Skip to content
Snippets Groups Projects
Commit 7079362c authored by Brutzman, Don's avatar Brutzman, Don
Browse files

update enumerations to match current naming convention

parent 38f1b306
No related branches found
No related tags found
No related merge requests found
...@@ -59,7 +59,7 @@ public class BitFieldRoundTripTest ...@@ -59,7 +59,7 @@ public class BitFieldRoundTripTest
EntityStatePdu espdu = factory.makeEntityStatePdu(); EntityStatePdu espdu = factory.makeEntityStatePdu();
espdu.setForceId(ForceID.FRIENDLY_9); espdu.setForceId(ForceID.FRIENDLY_9);
espdu.setEntityType(new edu.nps.moves.dis7.entities.usa.platform.land.MK48_14_logisticsplatformtruck()); espdu.setEntityType(new edu.nps.moves.dis7.entities.usa.platform.land.MK48_14_logistics_platform_truck());
Vector3Float lv = new Vector3Float(); Vector3Float lv = new Vector3Float();
lv.setX(5.0f); lv.setX(5.0f);
espdu.setEntityLinearVelocity(lv); espdu.setEntityLinearVelocity(lv);
......
This diff is collapsed.
...@@ -55,7 +55,7 @@ public class DataQueryPduRoundTripTest ...@@ -55,7 +55,7 @@ public class DataQueryPduRoundTripTest
private static FixedDatum fixedDatum1 = new FixedDatum(); private static FixedDatum fixedDatum1 = new FixedDatum();
private static int fixedDatum1Value = 0x111111FF; private static int fixedDatum1Value = 0x111111FF;
private static VariableRecordType fixedDatum1VarRecordType = VariableRecordType.$120_MM_HEAT_QUANTITY; private static VariableRecordType fixedDatum1VarRecordType = VariableRecordType._120_MM_HEAT_QUANTITY;
private static FixedDatum fixedDatum2 = new FixedDatum(); private static FixedDatum fixedDatum2 = new FixedDatum();
private static int fixedDatum2Value = 0x222222FF; private static int fixedDatum2Value = 0x222222FF;
private static VariableRecordType fixedDatum2VarRecordType = VariableRecordType.ACCELERATION; private static VariableRecordType fixedDatum2VarRecordType = VariableRecordType.ACCELERATION;
......
...@@ -10,7 +10,7 @@ import org.junit.jupiter.api.*; ...@@ -10,7 +10,7 @@ import org.junit.jupiter.api.*;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
/** /**
* NullFieldsMarshallTest()); created on May 20, 2019 MOVES Institute Naval Postgraduate School, Monterey, CA, USA www.nps.edu * NullFieldsMarshallTest created on May 20, 2019 MOVES Institute Naval Postgraduate School, Monterey, CA, USA www.nps.edu
* *
* @author Mike Bailey, jmbailey@edu.nps.edu * @author Mike Bailey, jmbailey@edu.nps.edu
* @version $Id$ * @version $Id$
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
*/ */
package edu.nps.moves.dis7; package edu.nps.moves.dis7;
import edu.nps.moves.dis7.objecttypes.LinearObject.Culturalfeature.Tracks_Tire.Tracks_Tire; import edu.nps.moves.dis7.objecttypes.LinearObject.Culturalfeature.TracksTire.TracksTire;
import edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ConcertinaWire._2_Roll._2_Roll; import edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ConcertinaWire._2Roll;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.junit.jupiter.api.*; import org.junit.jupiter.api.*;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
...@@ -31,7 +31,7 @@ public class ObjectTypeMarshallTest ...@@ -31,7 +31,7 @@ public class ObjectTypeMarshallTest
{ {
Throwable thr = null; Throwable thr = null;
try { try {
_2_Roll roll2 = new _2_Roll(); _2Roll roll2 = new _2Roll();
common(roll2); common(roll2);
} }
catch (Throwable t) { catch (Throwable t) {
...@@ -45,7 +45,7 @@ public class ObjectTypeMarshallTest ...@@ -45,7 +45,7 @@ public class ObjectTypeMarshallTest
{ {
Throwable thr = null; Throwable thr = null;
try { try {
Tracks_Tire tracksTire = new Tracks_Tire(); TracksTire tracksTire = new TracksTire();
common(tracksTire); common(tracksTire);
} }
catch (Throwable t) { catch (Throwable t) {
......
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