From 3428ed125ae7b16c04f2b784d00b8c3954dd4798 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Sun, 19 Jan 2025 14:01:43 -0700 Subject: [PATCH] Updated BSM-related POJOs to address field renamings in J2735 2024 Signed-off-by: dmccoystephenson --- .../plugin/j2735/J2735EmergencyDetails.java | 55 ++---------------- .../plugin/j2735/J2735PrivilegedEvents.java | 24 ++------ .../j2735/J2735SpecialVehicleExtensions.java | 32 ++--------- .../J2735SupplementalVehicleExtensions.java | 50 ++++++++--------- .../ode/plugin/j2735/J2735TrailerData.java | 32 ++--------- .../ode/plugin/j2735/J2735VehicleData.java | 39 ++----------- .../builders/EmergencyDetailsBuilder.java | 3 +- .../builders/PrivilegedEventsBuilder.java | 7 +-- .../SpecialVehicleExtensionsBuilder.java | 5 +- .../SupplementalVehicleExtensionsBuilder.java | 21 ++++--- .../j2735/builders/TrailerDataBuilder.java | 6 +- .../j2735/builders/VehicleDataBuilder.java | 5 +- .../j2735/J2735BsmPart2ContentTest.java | 40 +++++++------ .../j2735/J2735EmergencyDetailsTest.java | 23 +++----- .../J2735SpecialVehicleExtensionTest.java | 14 ++--- ...2735SupplementalVehicleExtensionsTest.java | 17 ++---- .../plugin/j2735/J2735TrailerDataTest.java | 18 ++---- .../plugin/j2735/builders/BsmBuilderTest.java | 20 +++---- .../builders/EmergencyDetailsBuilderTest.java | 56 +++++++++---------- ...plementalVehicleExtensionsBuilderTest.java | 49 +++++++--------- .../coder/OdeBsmDataCreatorHelperTest.java | 11 ++-- 21 files changed, 175 insertions(+), 352 deletions(-) diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735EmergencyDetails.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735EmergencyDetails.java index 5a1aecd84..b957f010b 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735EmergencyDetails.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735EmergencyDetails.java @@ -15,64 +15,19 @@ ******************************************************************************/ package us.dot.its.jpo.ode.plugin.j2735; +import lombok.Data; +import lombok.EqualsAndHashCode; import us.dot.its.jpo.ode.plugin.asn1.Asn1Object; +@EqualsAndHashCode(callSuper = true) +@Data public class J2735EmergencyDetails extends Asn1Object { private static final long serialVersionUID = 1L; - private Integer sspRights; + private Integer doNotUse; private J2735PrivilegedEvents events; private J2735LightbarInUse lightsUse; private J2735MultiVehicleResponse multi; private J2735ResponseType responseType; private J2735SirenInUse sirenUse; - - public Integer getSspRights() { - return sspRights; - } - - public void setSspRights(Integer sspRights) { - this.sspRights = sspRights; - } - - public J2735PrivilegedEvents getEvents() { - return events; - } - - public void setEvents(J2735PrivilegedEvents events) { - this.events = events; - } - - public J2735LightbarInUse getLightsUse() { - return lightsUse; - } - - public void setLightsUse(J2735LightbarInUse lightsUse) { - this.lightsUse = lightsUse; - } - - public J2735MultiVehicleResponse getMulti() { - return multi; - } - - public void setMulti(J2735MultiVehicleResponse multi) { - this.multi = multi; - } - - public J2735ResponseType getResponseType() { - return responseType; - } - - public void setResponseType(J2735ResponseType responseType) { - this.responseType = responseType; - } - - public J2735SirenInUse getSirenUse() { - return sirenUse; - } - - public void setSirenUse(J2735SirenInUse sirenUse) { - this.sirenUse = sirenUse; - } - } diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735PrivilegedEvents.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735PrivilegedEvents.java index 445c2add6..1d8db23ed 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735PrivilegedEvents.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735PrivilegedEvents.java @@ -15,29 +15,15 @@ ******************************************************************************/ package us.dot.its.jpo.ode.plugin.j2735; +import lombok.Data; +import lombok.EqualsAndHashCode; import us.dot.its.jpo.ode.plugin.asn1.Asn1Object; +@EqualsAndHashCode(callSuper = true) +@Data public class J2735PrivilegedEvents extends Asn1Object { - private static final long serialVersionUID = 1L; private J2735BitString event; - private Integer sspRights; - - public J2735BitString getEvent() { - return event; - } - - public void setEvent(J2735BitString event) { - this.event = event; - } - - public Integer getSspRights() { - return sspRights; - } - - public void setSspRights(Integer sspRights) { - this.sspRights = sspRights; - } - + private Integer doNotUse; } diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735SpecialVehicleExtensions.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735SpecialVehicleExtensions.java index 0db9c6ff2..984f31796 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735SpecialVehicleExtensions.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735SpecialVehicleExtensions.java @@ -15,35 +15,15 @@ ******************************************************************************/ package us.dot.its.jpo.ode.plugin.j2735; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data public class J2735SpecialVehicleExtensions extends J2735BsmPart2ExtensionBase { private static final long serialVersionUID = 1L; private J2735EmergencyDetails vehicleAlerts; private J2735EventDescription description; - private J2735TrailerData trailers; - - public J2735EmergencyDetails getVehicleAlerts() { - return vehicleAlerts; - } - - public void setVehicleAlerts(J2735EmergencyDetails vehicleAlerts) { - this.vehicleAlerts = vehicleAlerts; - } - - public J2735EventDescription getDescription() { - return description; - } - - public void setDescription(J2735EventDescription description) { - this.description = description; - } - - public J2735TrailerData getTrailers() { - return trailers; - } - - public void setTrailers(J2735TrailerData trailers) { - this.trailers = trailers; - } - + private J2735TrailerData doNotUse; } diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735SupplementalVehicleExtensions.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735SupplementalVehicleExtensions.java index 79271849c..866044bef 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735SupplementalVehicleExtensions.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735SupplementalVehicleExtensions.java @@ -21,12 +21,12 @@ public class J2735SupplementalVehicleExtensions extends J2735BsmPart2ExtensionBa private Integer classification; private J2735VehicleClassification classDetails; private J2735VehicleData vehicleData; - private J2735WeatherReport weatherReport; - private J2735WeatherProbe weatherProbe; - private J2735ObstacleDetection obstacle; + private J2735WeatherReport doNotUse1; + private J2735WeatherProbe doNotUse2; + private J2735ObstacleDetection doNotUse3; private J2735DisabledVehicle status; - private J2735SpeedProfile speedProfile; - private J2735RTCMPackage theRTCM; + private J2735SpeedProfile doNotUse4; + private J2735RTCMPackage doNotUse5; public Integer getClassification() { return classification; @@ -52,28 +52,28 @@ public void setVehicleData(J2735VehicleData vehicleData) { this.vehicleData = vehicleData; } - public J2735WeatherReport getWeatherReport() { - return weatherReport; + public J2735WeatherReport getDoNotUse1() { + return doNotUse1; } - public void setWeatherReport(J2735WeatherReport weatherReport) { - this.weatherReport = weatherReport; + public void setDoNotUse1(J2735WeatherReport doNotUse1) { + this.doNotUse1 = doNotUse1; } - public J2735WeatherProbe getWeatherProbe() { - return weatherProbe; + public J2735WeatherProbe getDoNotUse2() { + return doNotUse2; } - public void setWeatherProbe(J2735WeatherProbe weatherProbe) { - this.weatherProbe = weatherProbe; + public void setDoNotUse2(J2735WeatherProbe doNotUse2) { + this.doNotUse2 = doNotUse2; } - public J2735ObstacleDetection getObstacle() { - return obstacle; + public J2735ObstacleDetection getDoNotUse3() { + return doNotUse3; } - public void setObstacle(J2735ObstacleDetection obstacle) { - this.obstacle = obstacle; + public void setDoNotUse3(J2735ObstacleDetection doNotUse3) { + this.doNotUse3 = doNotUse3; } public J2735DisabledVehicle getStatus() { @@ -84,20 +84,20 @@ public void setStatus(J2735DisabledVehicle status) { this.status = status; } - public J2735SpeedProfile getSpeedProfile() { - return speedProfile; + public J2735SpeedProfile getDoNotUse4() { + return doNotUse4; } - public void setSpeedProfile(J2735SpeedProfile speedProfile) { - this.speedProfile = speedProfile; + public void setDoNotUse4(J2735SpeedProfile doNotUse4) { + this.doNotUse4 = doNotUse4; } - public J2735RTCMPackage getTheRTCM() { - return theRTCM; + public J2735RTCMPackage getDoNotUse5() { + return doNotUse5; } - public void setTheRTCM(J2735RTCMPackage theRTCM) { - this.theRTCM = theRTCM; + public void setDoNotUse5(J2735RTCMPackage doNotUse5) { + this.doNotUse5 = doNotUse5; } } diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735TrailerData.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735TrailerData.java index 8a1048e17..eaced946f 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735TrailerData.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735TrailerData.java @@ -17,38 +17,16 @@ import java.util.ArrayList; import java.util.List; - +import lombok.Data; +import lombok.EqualsAndHashCode; import us.dot.its.jpo.ode.plugin.asn1.Asn1Object; +@EqualsAndHashCode(callSuper = true) +@Data public class J2735TrailerData extends Asn1Object { private static final long serialVersionUID = 1L; private J2735PivotPointDescription connection; - private Integer sspRights; + private Integer doNotUse; private List units = new ArrayList<>(); - - public J2735PivotPointDescription getConnection() { - return connection; - } - - public void setConnection(J2735PivotPointDescription connection) { - this.connection = connection; - } - - public Integer getSspRights() { - return sspRights; - } - - public void setSspRights(Integer sspRights) { - this.sspRights = sspRights; - } - - public List getUnits() { - return units; - } - - public void setUnits(List units) { - this.units = units; - } - } diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735VehicleData.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735VehicleData.java index c9eab82ec..b69762585 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735VehicleData.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735VehicleData.java @@ -17,44 +17,15 @@ import java.io.Serializable; import java.math.BigDecimal; +import lombok.Data; +import lombok.EqualsAndHashCode; +@EqualsAndHashCode() +@Data public class J2735VehicleData implements Serializable{ private static final long serialVersionUID = 1L; private J2735BumperHeights bumpers; private BigDecimal height; private Integer mass; - private Integer trailerWeight; - - public J2735BumperHeights getBumpers() { - return bumpers; - } - - public void setBumpers(J2735BumperHeights bumpers) { - this.bumpers = bumpers; - } - - public BigDecimal getHeight() { - return height; - } - - public void setHeight(BigDecimal height) { - this.height = height; - } - - public Integer getMass() { - return mass; - } - - public void setMass(Integer mass) { - this.mass = mass; - } - - public Integer getTrailerWeight() { - return trailerWeight; - } - - public void setTrailerWeight(Integer trailerWeight) { - this.trailerWeight = trailerWeight; - } - + private Integer doNotUse; } diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/EmergencyDetailsBuilder.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/EmergencyDetailsBuilder.java index ce3650e0f..7824fd1d8 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/EmergencyDetailsBuilder.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/EmergencyDetailsBuilder.java @@ -16,7 +16,6 @@ package us.dot.its.jpo.ode.plugin.j2735.builders; import com.fasterxml.jackson.databind.JsonNode; - import us.dot.its.jpo.ode.plugin.j2735.J2735EmergencyDetails; import us.dot.its.jpo.ode.plugin.j2735.J2735LightbarInUse; import us.dot.its.jpo.ode.plugin.j2735.J2735MultiVehicleResponse; @@ -33,7 +32,7 @@ public static J2735EmergencyDetails genericEmergencyDetails(JsonNode vehicleAler J2735EmergencyDetails va = new J2735EmergencyDetails(); // Required elements - va.setSspRights(vehicleAlerts.get("sspRights").asInt()); + va.setDoNotUse(vehicleAlerts.get("doNotUse").asInt()); va.setSirenUse(J2735SirenInUse.valueOf(vehicleAlerts.get("sirenUse").fields().next().getKey().replaceAll("-", "_").toUpperCase())); va.setLightsUse(J2735LightbarInUse.valueOf(vehicleAlerts.get("lightsUse").fields().next().getKey().replaceAll("-", "_").toUpperCase())); va.setMulti(J2735MultiVehicleResponse.valueOf(vehicleAlerts.get("multi").fields().next().getKey().replaceAll("-", "_").toUpperCase())); diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/PrivilegedEventsBuilder.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/PrivilegedEventsBuilder.java index 5e38c5d02..d01c20218 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/PrivilegedEventsBuilder.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/PrivilegedEventsBuilder.java @@ -16,12 +16,11 @@ package us.dot.its.jpo.ode.plugin.j2735.builders; import com.fasterxml.jackson.databind.JsonNode; - import us.dot.its.jpo.ode.plugin.j2735.J2735PrivilegedEvents; public class PrivilegedEventsBuilder { - private static final String SSP_RIGHTS = "sspRights"; + private static final String DO_NOT_USE = "doNotUse"; public enum J2735PrivilegedEventFlagsNames { peUnavailable, peEmergencyResponse, peEmergencyLightsActive, peEmergencySoundActive, peNonEmergencyLightsActive, @@ -37,14 +36,14 @@ private PrivilegedEventsBuilder() { public static J2735PrivilegedEvents genericPrivilegedEvents(JsonNode events) { - if (events.get(SSP_RIGHTS).asInt() < SSP_LOWER_BOUND || events.get(SSP_RIGHTS).asInt() > SSP_UPPER_BOUND) { + if (events.get(DO_NOT_USE).asInt() < SSP_LOWER_BOUND || events.get(DO_NOT_USE).asInt() > SSP_UPPER_BOUND) { throw new IllegalArgumentException("SSPindex value out of bounds [0..31]"); } J2735PrivilegedEvents pe = new J2735PrivilegedEvents(); pe.setEvent(BitStringBuilder.genericBitString(events.get("event"), J2735PrivilegedEventFlagsNames.values())); - pe.setSspRights(events.get(SSP_RIGHTS).asInt()); + pe.setDoNotUse(events.get(DO_NOT_USE).asInt()); return pe; } diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/SpecialVehicleExtensionsBuilder.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/SpecialVehicleExtensionsBuilder.java index 042213045..e13673ff0 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/SpecialVehicleExtensionsBuilder.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/SpecialVehicleExtensionsBuilder.java @@ -16,7 +16,6 @@ package us.dot.its.jpo.ode.plugin.j2735.builders; import com.fasterxml.jackson.databind.JsonNode; - import us.dot.its.jpo.ode.plugin.j2735.J2735BsmPart2Content; import us.dot.its.jpo.ode.plugin.j2735.J2735SpecialVehicleExtensions; @@ -38,9 +37,9 @@ public static void evaluateSpecialVehicleExt(J2735BsmPart2Content part2Content, if (desc != null) { specVeh.setDescription(EventDescriptionBuilder.genericEventDescription(desc)); } - JsonNode tr = specVehExt.get("trailers"); + JsonNode tr = specVehExt.get("doNotUse"); if (tr != null) { - specVeh.setTrailers(TrailerDataBuilder.genericTrailerData(tr)); + specVeh.setDoNotUse(TrailerDataBuilder.genericTrailerData(tr)); } } diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/SupplementalVehicleExtensionsBuilder.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/SupplementalVehicleExtensionsBuilder.java index 505546916..ea2876126 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/SupplementalVehicleExtensionsBuilder.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/SupplementalVehicleExtensionsBuilder.java @@ -16,7 +16,6 @@ package us.dot.its.jpo.ode.plugin.j2735.builders; import com.fasterxml.jackson.databind.JsonNode; - import us.dot.its.jpo.ode.plugin.j2735.J2735BsmPart2Content; import us.dot.its.jpo.ode.plugin.j2735.J2735SupplementalVehicleExtensions; @@ -41,23 +40,23 @@ public static J2735SupplementalVehicleExtensions evaluateSupplementalVehicleExte if (sve.has("vehicleData")) { genericSVE.setVehicleData(VehicleDataBuilder.genericVehicleData(sve.get("vehicleData"))); } - if (sve.has("weatherReport")) { - genericSVE.setWeatherReport(WeatherReportBuilder.genericWeatherReport(sve.get("weatherReport"))); + if (sve.has("doNotUse1")) { + genericSVE.setDoNotUse1(WeatherReportBuilder.genericWeatherReport(sve.get("doNotUse1"))); } - if (sve.has("weatherProbe")) { - genericSVE.setWeatherProbe(WeatherProbeBuilder.genericWeatherProbe(sve.get("weatherProbe"))); + if (sve.has("doNotUse2")) { + genericSVE.setDoNotUse2(WeatherProbeBuilder.genericWeatherProbe(sve.get("doNotUse2"))); } - if (sve.has("obstacle")) { - genericSVE.setObstacle(ObstacleDetectionBuilder.genericObstacleDetection(sve.get("obstacle"))); + if (sve.has("doNotUse3")) { + genericSVE.setDoNotUse3(ObstacleDetectionBuilder.genericObstacleDetection(sve.get("doNotUse3"))); } if (sve.has("status")) { genericSVE.setStatus(DisabledVehicleBuilder.genericDisabledVehicle(sve.get("status"))); } - if (sve.has("speedProfile")) { - genericSVE.setSpeedProfile(SpeedProfileBuilder.genericSpeedProfile(sve.get("speedProfile"))); + if (sve.has("doNotUse4")) { + genericSVE.setDoNotUse4(SpeedProfileBuilder.genericSpeedProfile(sve.get("doNotUse4"))); } - if (sve.has("theRTCM")) { - genericSVE.setTheRTCM(RTCMPackageBuilder.genericRTCMPackage(sve.get("theRTCM"))); + if (sve.has("doNotUse5")) { + genericSVE.setDoNotUse5(RTCMPackageBuilder.genericRTCMPackage(sve.get("doNotUse5"))); } return genericSVE; diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/TrailerDataBuilder.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/TrailerDataBuilder.java index cbfe8a17e..8a071bbc2 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/TrailerDataBuilder.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/TrailerDataBuilder.java @@ -15,10 +15,8 @@ ******************************************************************************/ package us.dot.its.jpo.ode.plugin.j2735.builders; -import java.util.Iterator; - import com.fasterxml.jackson.databind.JsonNode; - +import java.util.Iterator; import us.dot.its.jpo.ode.plugin.j2735.J2735TrailerData; public class TrailerDataBuilder { @@ -31,7 +29,7 @@ public static J2735TrailerData genericTrailerData(JsonNode trailers) { J2735TrailerData td = new J2735TrailerData(); td.setConnection(PivotPointDescriptionBuilder.genericPivotPointDescription(trailers.get("connection"))); - td.setSspRights(trailers.get("sspRights").asInt()); + td.setDoNotUse(trailers.get("doNotUse").asInt()); Iterator iter = trailers.get("units").elements(); diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/VehicleDataBuilder.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/VehicleDataBuilder.java index 0915a7a97..cc0692a12 100644 --- a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/VehicleDataBuilder.java +++ b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/VehicleDataBuilder.java @@ -16,7 +16,6 @@ package us.dot.its.jpo.ode.plugin.j2735.builders; import com.fasterxml.jackson.databind.JsonNode; - import us.dot.its.jpo.ode.plugin.j2735.J2735VehicleData; public class VehicleDataBuilder { @@ -37,8 +36,8 @@ public static J2735VehicleData genericVehicleData(JsonNode vehicleData) { if (vehicleData.get("mass") != null) { vd.setMass(MassOrWeightBuilder.genericVehicleMass(vehicleData.get("mass"))); } - if (vehicleData.get("trailerWeight") != null) { - vd.setTrailerWeight(MassOrWeightBuilder.genericTrailerWeight(vehicleData.get("trailerWeight"))); + if (vehicleData.get("doNotUse") != null) { + vd.setDoNotUse(MassOrWeightBuilder.genericTrailerWeight(vehicleData.get("doNotUse"))); } return vd; diff --git a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735BsmPart2ContentTest.java b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735BsmPart2ContentTest.java index 498155365..d9519d88c 100644 --- a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735BsmPart2ContentTest.java +++ b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735BsmPart2ContentTest.java @@ -1,18 +1,15 @@ package us.dot.its.jpo.ode.plugin.j2735; -import org.junit.jupiter.api.Test; - -import static org.junit.Assert.*; - - -import static us.dot.its.jpo.ode.plugin.j2735.J2735BsmPart2Content.J2735BsmPart2Id.*; +import static us.dot.its.jpo.ode.plugin.j2735.J2735BsmPart2Content.J2735BsmPart2Id.SpecialVehicleExtensions; +import static us.dot.its.jpo.ode.plugin.j2735.J2735BsmPart2Content.J2735BsmPart2Id.SupplementalVehicleExtensions; +import static us.dot.its.jpo.ode.plugin.j2735.J2735BsmPart2Content.J2735BsmPart2Id.VehicleSafetyExtensions; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import us.dot.its.jpo.ode.util.JsonUtils; public class J2735BsmPart2ContentTest { - - @Test public void shouldDeserializeBsmPart2Content_VehicleSafetyExtensions() { @@ -20,33 +17,34 @@ public void shouldDeserializeBsmPart2Content_VehicleSafetyExtensions() { var deserialized = (J2735BsmPart2Content)JsonUtils.fromJson(bsmJson, J2735BsmPart2Content.class); - assertNotNull(deserialized); - assertEquals(deserialized.getId(), VehicleSafetyExtensions); - assertTrue(deserialized.getValue() instanceof J2735VehicleSafetyExtensions); + Assertions.assertNotNull(deserialized); + Assertions.assertEquals(VehicleSafetyExtensions, deserialized.getId()); + Assertions.assertInstanceOf(J2735VehicleSafetyExtensions.class, deserialized.getValue()); var extensions = (J2735VehicleSafetyExtensions)deserialized.getValue(); - assertNotNull(extensions.getPathHistory()); - assertNotNull(extensions.getPathPrediction()); + Assertions.assertNotNull(extensions.getPathHistory()); + Assertions.assertNotNull(extensions.getPathPrediction()); } @Test public void shouldDeserializeBsmPart2Content_SupplementalVehicleExtensions() { - final String bsmJson = "{\"id\":\"SupplementalVehicleExtensions\",\"value\":{\"classification\":null,\"classDetails\":null,\"vehicleData\":null,\"weatherReport\":null,\"weatherProbe\":null,\"obstacle\":null,\"status\":null,\"speedProfile\":null,\"theRTCM\":null}}"; + final String bsmJson = "{\"id\":\"SupplementalVehicleExtensions\",\"value\":{\"classification\":null,\"classDetails\":null,\"vehicleData\":null,\"doNotUse1\":null,\"doNotUse2\":null,\"doNotUse3\":null,\"status\":null,\"doNotUse4\":null,\"doNotUse5\":null}}"; var deserialized = (J2735BsmPart2Content)JsonUtils.fromJson(bsmJson, J2735BsmPart2Content.class); - assertNotNull(deserialized); - assertEquals(deserialized.getId(), SupplementalVehicleExtensions); - assertTrue(deserialized.getValue() instanceof J2735SupplementalVehicleExtensions); + Assertions.assertNotNull(deserialized); + Assertions.assertEquals(SupplementalVehicleExtensions, deserialized.getId()); + Assertions.assertInstanceOf(J2735SupplementalVehicleExtensions.class, + deserialized.getValue()); } @Test public void shouldDeserializeBsmPart2Content_SpecialVehicleExtensions() { - final String bsmJson = "{\"id\":\"SpecialVehicleExtensions\",\"value\":{\"vehicleAlerts\":null,\"description\":null,\"trailers\":null}}"; + final String bsmJson = "{\"id\":\"SpecialVehicleExtensions\",\"value\":{\"vehicleAlerts\":null,\"description\":null,\"doNotUse\":null}}"; var deserialized = (J2735BsmPart2Content)JsonUtils.fromJson(bsmJson, J2735BsmPart2Content.class); - assertNotNull(deserialized); - assertEquals(deserialized.getId(), SpecialVehicleExtensions); - assertTrue(deserialized.getValue() instanceof J2735SpecialVehicleExtensions); + Assertions.assertNotNull(deserialized); + Assertions.assertEquals(SpecialVehicleExtensions, deserialized.getId()); + Assertions.assertInstanceOf(J2735SpecialVehicleExtensions.class, deserialized.getValue()); } } diff --git a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735EmergencyDetailsTest.java b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735EmergencyDetailsTest.java index f52a4fd94..1871d03e2 100644 --- a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735EmergencyDetailsTest.java +++ b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735EmergencyDetailsTest.java @@ -15,15 +15,10 @@ ******************************************************************************/ package us.dot.its.jpo.ode.plugin.j2735; -import static org.junit.Assert.assertEquals; - -import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; - import mockit.Tested; -//import mockit.integration.junit4.JMockit; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -//@RunWith(JMockit.class) public class J2735EmergencyDetailsTest { @Tested @@ -32,22 +27,22 @@ public class J2735EmergencyDetailsTest { @Test public void testGettersAndSetters() { Integer sspRights = 1; - ed.setSspRights(sspRights); - assertEquals(sspRights,ed.getSspRights()); + ed.setDoNotUse(sspRights); + Assertions.assertEquals(sspRights, ed.getDoNotUse()); J2735PrivilegedEvents events = new J2735PrivilegedEvents(); ed.setEvents(events); - assertEquals(events, ed.getEvents()); + Assertions.assertEquals(events, ed.getEvents()); J2735LightbarInUse lightsUse = null; ed.setLightsUse(lightsUse); - assertEquals(lightsUse,ed.getLightsUse()); + Assertions.assertEquals(lightsUse, ed.getLightsUse()); J2735MultiVehicleResponse multi = null; ed.setMulti(multi); - assertEquals(multi,ed.getMulti()); + Assertions.assertEquals(multi, ed.getMulti()); J2735ResponseType responseType = null; ed.setResponseType(responseType); - assertEquals(responseType,ed.getResponseType()); + Assertions.assertEquals(responseType, ed.getResponseType()); J2735SirenInUse sirenUse = null; ed.setSirenUse(sirenUse); - assertEquals(sirenUse,ed.getSirenUse()); + Assertions.assertEquals(sirenUse, ed.getSirenUse()); } } diff --git a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735SpecialVehicleExtensionTest.java b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735SpecialVehicleExtensionTest.java index 77b20c5f1..852ec9e37 100644 --- a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735SpecialVehicleExtensionTest.java +++ b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735SpecialVehicleExtensionTest.java @@ -15,11 +15,9 @@ ******************************************************************************/ package us.dot.its.jpo.ode.plugin.j2735; -import static org.junit.Assert.assertEquals; - -import org.junit.jupiter.api.Test; - import mockit.Tested; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class J2735SpecialVehicleExtensionTest { @Tested @@ -28,15 +26,15 @@ public class J2735SpecialVehicleExtensionTest { @Test public void testGettersAndSetters() { J2735TrailerData trailers = new J2735TrailerData(); - sve.setTrailers(trailers); - assertEquals(trailers,sve.getTrailers()); + sve.setDoNotUse(trailers); + Assertions.assertEquals(trailers, sve.getDoNotUse()); J2735EmergencyDetails vehicleAlerts = new J2735EmergencyDetails(); sve.setVehicleAlerts(vehicleAlerts); - assertEquals(vehicleAlerts,sve.getVehicleAlerts()); + Assertions.assertEquals(vehicleAlerts, sve.getVehicleAlerts()); J2735EventDescription description = new J2735EventDescription(); sve.setDescription(description); - assertEquals(description,sve.getDescription()); + Assertions.assertEquals(description, sve.getDescription()); } } diff --git a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735SupplementalVehicleExtensionsTest.java b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735SupplementalVehicleExtensionsTest.java index 7219e5e81..7091a77ba 100644 --- a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735SupplementalVehicleExtensionsTest.java +++ b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735SupplementalVehicleExtensionsTest.java @@ -15,15 +15,10 @@ ******************************************************************************/ package us.dot.its.jpo.ode.plugin.j2735; -import static org.junit.Assert.assertEquals; - -import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; - import mockit.Tested; -//import mockit.integration.junit4.JMockit; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -//@RunWith(JMockit.class) public class J2735SupplementalVehicleExtensionsTest { @Tested J2735SupplementalVehicleExtensions sve; @@ -31,10 +26,10 @@ public class J2735SupplementalVehicleExtensionsTest { @Test public void testGettersAndSetters() { J2735SpeedProfile speedProfile = new J2735SpeedProfile(); - sve.setSpeedProfile(speedProfile); - assertEquals(speedProfile,sve.getSpeedProfile()); + sve.setDoNotUse4(speedProfile); + Assertions.assertEquals(speedProfile, sve.getDoNotUse4()); J2735RTCMPackage theRTCM = new J2735RTCMPackage(); - sve.setTheRTCM(theRTCM); - assertEquals(theRTCM,sve.getTheRTCM()); + sve.setDoNotUse5(theRTCM); + Assertions.assertEquals(theRTCM, sve.getDoNotUse5()); } } diff --git a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735TrailerDataTest.java b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735TrailerDataTest.java index a60196439..703dd02ec 100644 --- a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735TrailerDataTest.java +++ b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/J2735TrailerDataTest.java @@ -15,18 +15,12 @@ ******************************************************************************/ package us.dot.its.jpo.ode.plugin.j2735; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.List; - -import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; - import mockit.Tested; -//import mockit.integration.junit4.JMockit; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -//@RunWith(JMockit.class) public class J2735TrailerDataTest { @Tested J2735TrailerData td; @@ -35,12 +29,12 @@ public class J2735TrailerDataTest { public void testGettersAndSetters() { J2735PivotPointDescription connection = new J2735PivotPointDescription(); td.setConnection(connection); - assertEquals(connection,td.getConnection()); + Assertions.assertEquals(connection, td.getConnection()); Integer sspRights = 1; - td.setSspRights(sspRights); - assertEquals(sspRights,td.getSspRights()); + td.setDoNotUse(sspRights); + Assertions.assertEquals(sspRights, td.getDoNotUse()); List units = new ArrayList<>(); td.setUnits(units); - assertEquals(units,td.getUnits()); + Assertions.assertEquals(units, td.getUnits()); } } diff --git a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/BsmBuilderTest.java b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/BsmBuilderTest.java index 90896989f..606933b1a 100644 --- a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/BsmBuilderTest.java +++ b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/BsmBuilderTest.java @@ -15,36 +15,32 @@ ******************************************************************************/ package us.dot.its.jpo.ode.plugin.j2735.builders; -import static org.junit.Assert.*; - -import org.junit.jupiter.api.Test; - import com.fasterxml.jackson.databind.JsonNode; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import us.dot.its.jpo.ode.plugin.j2735.J2735Bsm; -import us.dot.its.jpo.ode.plugin.j2735.builders.BsmPart2ContentBuilder.BsmPart2ContentBuilderException; import us.dot.its.jpo.ode.util.XmlUtils; import us.dot.its.jpo.ode.util.XmlUtils.XmlUtilsException; public class BsmBuilderTest { @Test - public void shouldTranslateBsm() throws BsmPart2ContentBuilderException { + public void shouldTranslateBsm() { JsonNode jsonBsm = null; try { jsonBsm = XmlUtils.toObjectNode( - "us.dot.its.jpo.ode.model.OdeAsn1Payload538ffb5c-ce7d-438d-8727-8100c11f08b214202018-05-03T18:36:41.38Z[UTC]42018-05-03T17:54:14.206Z[UTC]OBUfalsebsmLogDuringEvent.csvbsmLogDuringEventsuccess40.4740068-104.96920331492.50.24246.3125rootIeee1609Dot2DataCOERunsecuredDataMessageFrameUPEREVMessageFrame20414B3AD21814206404740068-10496920331492519525465535121970512723000100002005700-14165-3670-294297433571-32917075150-130-142-38071129-634-7510170173-588-621156077-645-661257029-500-4213750-45-123-4315710-103-20-4316680-54198-3619130-193-2941922209-382-4672823300-390-3641824320-178-120-32624032767010100288002006004012810000020038191"); + "us.dot.its.jpo.ode.model.OdeAsn1Payload538ffb5c-ce7d-438d-8727-8100c11f08b214202018-05-03T18:36:41.38Z[UTC]42018-05-03T17:54:14.206Z[UTC]OBUfalsebsmLogDuringEvent.csvbsmLogDuringEventsuccess40.4740068-104.96920331492.50.24246.3125rootIeee1609Dot2DataCOERunsecuredDataMessageFrameUPEREVMessageFrame20414B3AD21814206404740068-10496920331492519525465535121970512723000100002005700-14165-3670-294297433571-32917075150-130-142-38071129-634-7510170173-588-621156077-645-661257029-500-4213750-45-123-4315710-103-20-4316680-54198-3619130-193-2941922209-382-4672823300-390-3641824320-178-120-32624032767010100288002006004012810000020038191"); } catch (XmlUtilsException e) { - fail("XML parsing error:" + e); + Assertions.fail("XML parsing error:" + e); } J2735Bsm actualBsm = BsmBuilder.genericBsm(jsonBsm.findValue("BasicSafetyMessage")); //assertEquals("string", actualBsm.toJson()); - assertNotNull(actualBsm); - String expected = "{\"coreData\":{\"msgCnt\":41,\"id\":\"4B3AD218\",\"secMark\":14206,\"position\":{\"latitude\":40.4740068,\"longitude\":-104.9692033,\"elevation\":1492.5},\"accelSet\":{\"accelLat\":0.00,\"accelLong\":0.23,\"accelVert\":0.00,\"accelYaw\":0.00},\"accuracy\":{\"semiMajor\":9.75,\"semiMinor\":12.70},\"transmission\":\"UNAVAILABLE\",\"speed\":0.24,\"heading\":246.3125,\"brakes\":{\"wheelBrakes\":{\"leftFront\":false,\"rightFront\":false,\"unavailable\":true,\"leftRear\":false,\"rightRear\":false},\"traction\":\"unavailable\",\"abs\":\"unavailable\",\"scs\":\"unavailable\",\"brakeBoost\":\"unavailable\",\"auxBrakes\":\"unavailable\"},\"size\":{\"width\":200,\"length\":570}},\"partII\":[{\"id\":\"VehicleSafetyExtensions\",\"value\":{\"pathHistory\":{\"crumbData\":[{\"elevationOffset\":-0.3,\"latOffset\":-0.0000141,\"lonOffset\":0.0000065,\"timeOffset\":6.70},{\"elevationOffset\":4.3,\"latOffset\":-0.0000294,\"lonOffset\":0.0000297,\"timeOffset\":35.71},{\"elevationOffset\":0.7,\"latOffset\":-0.0000329,\"lonOffset\":0.0000170,\"timeOffset\":51.50},{\"elevationOffset\":-0.3,\"latOffset\":-0.0000130,\"lonOffset\":-0.0000142,\"timeOffset\":80.71},{\"elevationOffset\":-7.5,\"latOffset\":0.0000129,\"lonOffset\":-0.0000634,\"timeOffset\":101.70},{\"elevationOffset\":-6.2,\"latOffset\":0.0000173,\"lonOffset\":-0.0000588,\"timeOffset\":115.60},{\"elevationOffset\":-6.6,\"latOffset\":0.0000077,\"lonOffset\":-0.0000645,\"timeOffset\":125.70},{\"elevationOffset\":-4.2,\"latOffset\":0.0000029,\"lonOffset\":-0.0000500,\"timeOffset\":137.50},{\"elevationOffset\":-4.3,\"latOffset\":-0.0000045,\"lonOffset\":-0.0000123,\"timeOffset\":157.10},{\"elevationOffset\":-4.3,\"latOffset\":-0.0000103,\"lonOffset\":-0.0000020,\"timeOffset\":166.80},{\"elevationOffset\":-3.6,\"latOffset\":-0.0000054,\"lonOffset\":0.0000198,\"timeOffset\":191.30},{\"elevationOffset\":1.9,\"latOffset\":-0.0000193,\"lonOffset\":-0.0000294,\"timeOffset\":222.09},{\"elevationOffset\":2.8,\"latOffset\":-0.0000382,\"lonOffset\":-0.0000467,\"timeOffset\":233.00},{\"elevationOffset\":1.8,\"latOffset\":-0.0000390,\"lonOffset\":-0.0000364,\"timeOffset\":243.20},{\"elevationOffset\":-0.3,\"latOffset\":-0.0000178,\"lonOffset\":-0.0000120,\"timeOffset\":262.40}]},\"pathPrediction\":{\"confidence\":0.0,\"radiusOfCurve\":0.0}}},{\"id\":\"SpecialVehicleExtensions\",\"value\":{\"trailers\":{\"connection\":{\"pivotOffset\":1.00,\"pivots\":false},\"sspRights\":0,\"units\":[{\"isDolly\":false,\"width\":200,\"length\":600,\"height\":2.00,\"mass\":64000,\"frontPivot\":{\"pivotOffset\":1.00,\"pivotAngle\":0.0000,\"pivots\":false},\"positionOffset\":{\"x\":0.00,\"y\":0.00},\"crumbData\":[]}]}}},{\"id\":\"SupplementalVehicleExtensions\",\"value\":{\"classDetails\":{\"fuelType\":\"unknownFuel\",\"hpmsType\":\"none\",\"keyType\":0,\"role\":\"basicVehicle\"},\"vehicleData\":{\"height\":1.90},\"weatherProbe\":{}}}]}"; - assertEquals(expected , actualBsm.toString()); + Assertions.assertNotNull(actualBsm); + String expected = "{\"coreData\":{\"msgCnt\":41,\"id\":\"4B3AD218\",\"secMark\":14206,\"position\":{\"latitude\":40.4740068,\"longitude\":-104.9692033,\"elevation\":1492.5},\"accelSet\":{\"accelLat\":0.00,\"accelLong\":0.23,\"accelVert\":0.00,\"accelYaw\":0.00},\"accuracy\":{\"semiMajor\":9.75,\"semiMinor\":12.70},\"transmission\":\"UNAVAILABLE\",\"speed\":0.24,\"heading\":246.3125,\"brakes\":{\"wheelBrakes\":{\"leftFront\":false,\"rightFront\":false,\"unavailable\":true,\"leftRear\":false,\"rightRear\":false},\"traction\":\"unavailable\",\"abs\":\"unavailable\",\"scs\":\"unavailable\",\"brakeBoost\":\"unavailable\",\"auxBrakes\":\"unavailable\"},\"size\":{\"width\":200,\"length\":570}},\"partII\":[{\"id\":\"VehicleSafetyExtensions\",\"value\":{\"pathHistory\":{\"crumbData\":[{\"elevationOffset\":-0.3,\"latOffset\":-0.0000141,\"lonOffset\":0.0000065,\"timeOffset\":6.70},{\"elevationOffset\":4.3,\"latOffset\":-0.0000294,\"lonOffset\":0.0000297,\"timeOffset\":35.71},{\"elevationOffset\":0.7,\"latOffset\":-0.0000329,\"lonOffset\":0.0000170,\"timeOffset\":51.50},{\"elevationOffset\":-0.3,\"latOffset\":-0.0000130,\"lonOffset\":-0.0000142,\"timeOffset\":80.71},{\"elevationOffset\":-7.5,\"latOffset\":0.0000129,\"lonOffset\":-0.0000634,\"timeOffset\":101.70},{\"elevationOffset\":-6.2,\"latOffset\":0.0000173,\"lonOffset\":-0.0000588,\"timeOffset\":115.60},{\"elevationOffset\":-6.6,\"latOffset\":0.0000077,\"lonOffset\":-0.0000645,\"timeOffset\":125.70},{\"elevationOffset\":-4.2,\"latOffset\":0.0000029,\"lonOffset\":-0.0000500,\"timeOffset\":137.50},{\"elevationOffset\":-4.3,\"latOffset\":-0.0000045,\"lonOffset\":-0.0000123,\"timeOffset\":157.10},{\"elevationOffset\":-4.3,\"latOffset\":-0.0000103,\"lonOffset\":-0.0000020,\"timeOffset\":166.80},{\"elevationOffset\":-3.6,\"latOffset\":-0.0000054,\"lonOffset\":0.0000198,\"timeOffset\":191.30},{\"elevationOffset\":1.9,\"latOffset\":-0.0000193,\"lonOffset\":-0.0000294,\"timeOffset\":222.09},{\"elevationOffset\":2.8,\"latOffset\":-0.0000382,\"lonOffset\":-0.0000467,\"timeOffset\":233.00},{\"elevationOffset\":1.8,\"latOffset\":-0.0000390,\"lonOffset\":-0.0000364,\"timeOffset\":243.20},{\"elevationOffset\":-0.3,\"latOffset\":-0.0000178,\"lonOffset\":-0.0000120,\"timeOffset\":262.40}]},\"pathPrediction\":{\"confidence\":0.0,\"radiusOfCurve\":0.0}}},{\"id\":\"SpecialVehicleExtensions\",\"value\":{\"doNotUse\":{\"connection\":{\"pivotOffset\":1.00,\"pivots\":false},\"doNotUse\":0,\"units\":[{\"isDolly\":false,\"width\":200,\"length\":600,\"height\":2.00,\"mass\":64000,\"frontPivot\":{\"pivotOffset\":1.00,\"pivotAngle\":0.0000,\"pivots\":false},\"positionOffset\":{\"x\":0.00,\"y\":0.00},\"crumbData\":[]}]}}},{\"id\":\"SupplementalVehicleExtensions\",\"value\":{\"classDetails\":{\"fuelType\":\"unknownFuel\",\"hpmsType\":\"none\",\"keyType\":0,\"role\":\"basicVehicle\"},\"vehicleData\":{\"height\":1.90},\"doNotUse2\":{}}}]}"; + Assertions.assertEquals(expected, actualBsm.toString()); } } diff --git a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/EmergencyDetailsBuilderTest.java b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/EmergencyDetailsBuilderTest.java index 8ecce1da1..9284d8317 100644 --- a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/EmergencyDetailsBuilderTest.java +++ b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/EmergencyDetailsBuilderTest.java @@ -15,20 +15,14 @@ ******************************************************************************/ package us.dot.its.jpo.ode.plugin.j2735.builders; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; - +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - -import com.fasterxml.jackson.databind.node.ObjectNode; - import us.dot.its.jpo.ode.plugin.j2735.J2735EmergencyDetails; import us.dot.its.jpo.ode.plugin.j2735.J2735LightbarInUse; import us.dot.its.jpo.ode.plugin.j2735.J2735MultiVehicleResponse; @@ -47,17 +41,17 @@ public void testRequiredFields() { J2735MultiVehicleResponse expectedMulti = J2735MultiVehicleResponse.SINGLEVEHICLE; ObjectNode testInput = JsonUtils.newNode(); - testInput.put("sspRights", expectedSspRights); + testInput.put("doNotUse", expectedSspRights); testInput.set("sirenUse", JsonUtils.newNode().put("notInUse", true)); testInput.set("lightsUse", JsonUtils.newNode().put("arrowSignsActive", true)); testInput.set("multi", JsonUtils.newNode().put("singleVehicle", true)); J2735EmergencyDetails actualValue = EmergencyDetailsBuilder.genericEmergencyDetails(testInput); - assertEquals(expectedSspRights, actualValue.getSspRights()); - assertEquals(expectedSirenUse, actualValue.getSirenUse()); - assertEquals(expectedLightsUse, actualValue.getLightsUse()); - assertEquals(expectedMulti, actualValue.getMulti()); + Assertions.assertEquals(expectedSspRights, actualValue.getDoNotUse()); + Assertions.assertEquals(expectedSirenUse, actualValue.getSirenUse()); + Assertions.assertEquals(expectedLightsUse, actualValue.getLightsUse()); + Assertions.assertEquals(expectedMulti, actualValue.getMulti()); } @Test @@ -66,38 +60,38 @@ public void testOptionalFields() { Integer expectedSspRights = 5; ObjectNode testInput = JsonUtils.newNode(); - testInput.put("sspRights", 8); + testInput.put("doNotUse", 8); testInput.set("sirenUse", JsonUtils.newNode().put("notInUse", true)); testInput.set("lightsUse", JsonUtils.newNode().put("arrowSignsActive", true)); testInput.set("multi", JsonUtils.newNode().put("singleVehicle", true)); // optional fields - testInput.set("events", JsonUtils.newNode().put("sspRights", 5).put("event", "001000")); + testInput.set("events", JsonUtils.newNode().put("doNotUse", 5).put("event", "001000")); testInput.set("responseType", JsonUtils.newNode().put("slowMoving", true)); J2735EmergencyDetails actualValue = EmergencyDetailsBuilder.genericEmergencyDetails(testInput); - assertEquals(expectedSspRights, actualValue.getEvents().getSspRights()); - assertFalse(actualValue.getEvents().getEvent().get("peUnavailable")); - assertFalse(actualValue.getEvents().getEvent().get("peEmergencyResponse")); - assertTrue(actualValue.getEvents().getEvent().get("peEmergencyLightsActive")); - assertFalse(actualValue.getEvents().getEvent().get("peEmergencySoundActive")); - assertFalse(actualValue.getEvents().getEvent().get("peNonEmergencyLightsActive")); - assertFalse(actualValue.getEvents().getEvent().get("peNonEmergencySoundActive")); - assertEquals(J2735ResponseType.SLOWMOVING, actualValue.getResponseType()); + Assertions.assertEquals(expectedSspRights, actualValue.getEvents().getDoNotUse()); + Assertions.assertFalse(actualValue.getEvents().getEvent().get("peUnavailable")); + Assertions.assertFalse(actualValue.getEvents().getEvent().get("peEmergencyResponse")); + Assertions.assertTrue(actualValue.getEvents().getEvent().get("peEmergencyLightsActive")); + Assertions.assertFalse(actualValue.getEvents().getEvent().get("peEmergencySoundActive")); + Assertions.assertFalse(actualValue.getEvents().getEvent().get("peNonEmergencyLightsActive")); + Assertions.assertFalse(actualValue.getEvents().getEvent().get("peNonEmergencySoundActive")); + Assertions.assertEquals(J2735ResponseType.SLOWMOVING, actualValue.getResponseType()); } @Test public void testOptionalFieldsWithInvalidSSPRights() { assertThrows(IllegalArgumentException.class, () -> { ObjectNode testInput = JsonUtils.newNode(); - testInput.put("sspRights", 8); + testInput.put("doNotUse", 8); testInput.set("sirenUse", JsonUtils.newNode().put("notInUse", true)); testInput.set("lightsUse", JsonUtils.newNode().put("arrowSignsActive", true)); testInput.set("multi", JsonUtils.newNode().put("singleVehicle", true)); // optional fields - testInput.set("events", JsonUtils.newNode().put("sspRights", 32).put("event", "001000")); + testInput.set("events", JsonUtils.newNode().put("doNotUse", 32).put("event", "001000")); testInput.set("responseType", JsonUtils.newNode().put("slowMoving", true)); EmergencyDetailsBuilder.genericEmergencyDetails(testInput); @@ -108,13 +102,13 @@ public void testOptionalFieldsWithInvalidSSPRights() { public void testConstructorIsPrivate() throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { Constructor constructor = EmergencyDetailsBuilder.class.getDeclaredConstructor(); - assertTrue(Modifier.isPrivate(constructor.getModifiers())); + Assertions.assertTrue(Modifier.isPrivate(constructor.getModifiers())); constructor.setAccessible(true); try { constructor.newInstance(); - fail("Expected IllegalAccessException.class"); + Assertions.fail("Expected IllegalAccessException.class"); } catch (Exception e) { - assertEquals(InvocationTargetException.class, e.getClass()); + Assertions.assertEquals(InvocationTargetException.class, e.getClass()); } } @@ -122,13 +116,13 @@ public void testConstructorIsPrivate() public void testPrivilegedEventsBuilderConstructorIsPrivate() throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { Constructor constructor = PrivilegedEventsBuilder.class.getDeclaredConstructor(); - assertTrue(Modifier.isPrivate(constructor.getModifiers())); + Assertions.assertTrue(Modifier.isPrivate(constructor.getModifiers())); constructor.setAccessible(true); try { constructor.newInstance(); - fail("Expected IllegalAccessException.class"); + Assertions.fail("Expected IllegalAccessException.class"); } catch (Exception e) { - assertEquals(InvocationTargetException.class, e.getClass()); + Assertions.assertEquals(InvocationTargetException.class, e.getClass()); } } } diff --git a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/SupplementalVehicleExtensionsBuilderTest.java b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/SupplementalVehicleExtensionsBuilderTest.java index 6ff061faa..752a95ab5 100644 --- a/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/SupplementalVehicleExtensionsBuilderTest.java +++ b/jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/SupplementalVehicleExtensionsBuilderTest.java @@ -15,22 +15,15 @@ ******************************************************************************/ package us.dot.its.jpo.ode.plugin.j2735.builders; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; - -import org.junit.jupiter.api.Test; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; - import mockit.Capturing; import mockit.Expectations; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import us.dot.its.jpo.ode.plugin.j2735.J2735BsmPart2Content; import us.dot.its.jpo.ode.plugin.j2735.J2735DisabledVehicle; import us.dot.its.jpo.ode.plugin.j2735.J2735ObstacleDetection; @@ -56,7 +49,7 @@ public void testClassification() { J2735SupplementalVehicleExtensions result = SupplementalVehicleExtensionsBuilder .evaluateSupplementalVehicleExtensions(outputContent, testInput); - assertEquals(Integer.valueOf(1), result.getClassification()); + Assertions.assertEquals(Integer.valueOf(1), result.getClassification()); } @Test @@ -77,7 +70,7 @@ public void testVehicleClass(@Capturing VehicleClassificationBuilder capturingVe J2735SupplementalVehicleExtensions result = SupplementalVehicleExtensionsBuilder .evaluateSupplementalVehicleExtensions(outputContent, testInput); - assertNotNull(result.getClassDetails()); + Assertions.assertNotNull(result.getClassDetails()); } @Test @@ -96,7 +89,7 @@ public void testVehicleData(@Capturing VehicleDataBuilder capturingVehicleDataBu J2735SupplementalVehicleExtensions result = SupplementalVehicleExtensionsBuilder .evaluateSupplementalVehicleExtensions(new J2735BsmPart2Content(), testInput); - assertNotNull(result.getVehicleData()); + Assertions.assertNotNull(result.getVehicleData()); } @Test @@ -110,12 +103,12 @@ public void testWeatherReport(@Capturing WeatherReportBuilder capturingWeatherRe }; ObjectNode testInput = JsonUtils.newNode(); - testInput.put("weatherReport", "something"); + testInput.put("doNotUse1", "something"); J2735SupplementalVehicleExtensions result = SupplementalVehicleExtensionsBuilder .evaluateSupplementalVehicleExtensions(new J2735BsmPart2Content(), testInput); - assertNotNull(result.getWeatherReport()); + Assertions.assertNotNull(result.getDoNotUse1()); } @Test @@ -129,12 +122,12 @@ public void testWeatherProbe(@Capturing WeatherProbeBuilder capturingWeatherProb }; ObjectNode testInput = JsonUtils.newNode(); - testInput.put("weatherProbe", "something"); + testInput.put("doNotUse2", "something"); J2735SupplementalVehicleExtensions result = SupplementalVehicleExtensionsBuilder .evaluateSupplementalVehicleExtensions(new J2735BsmPart2Content(), testInput); - assertNotNull(result.getWeatherProbe()); + Assertions.assertNotNull(result.getDoNotUse2()); } @Test @@ -148,12 +141,12 @@ public void testObstacle(@Capturing ObstacleDetectionBuilder capturingObstacleDe }; ObjectNode testInput = JsonUtils.newNode(); - testInput.put("obstacle", "something"); + testInput.put("doNotUse3", "something"); J2735SupplementalVehicleExtensions result = SupplementalVehicleExtensionsBuilder .evaluateSupplementalVehicleExtensions(new J2735BsmPart2Content(), testInput); - assertNotNull(result.getObstacle()); + Assertions.assertNotNull(result.getDoNotUse3()); } @Test @@ -172,7 +165,7 @@ public void testStatus(@Capturing DisabledVehicleBuilder capturingDisabledVehicl J2735SupplementalVehicleExtensions result = SupplementalVehicleExtensionsBuilder .evaluateSupplementalVehicleExtensions(new J2735BsmPart2Content(), testInput); - assertNotNull(result.getStatus()); + Assertions.assertNotNull(result.getStatus()); } @Test @@ -186,12 +179,12 @@ public void testSpeedProfile(@Capturing SpeedProfileBuilder capturingSpeedProfil }; ObjectNode testInput = JsonUtils.newNode(); - testInput.put("speedProfile", "something"); + testInput.put("doNotUse4", "something"); J2735SupplementalVehicleExtensions result = SupplementalVehicleExtensionsBuilder .evaluateSupplementalVehicleExtensions(new J2735BsmPart2Content(), testInput); - assertNotNull(result.getSpeedProfile()); + Assertions.assertNotNull(result.getDoNotUse4()); } @Test @@ -205,12 +198,12 @@ public void testRtcmPackage(@Capturing RTCMPackageBuilder capturingRTCMPackageBu }; ObjectNode testInput = JsonUtils.newNode(); - testInput.put("theRTCM", "something"); + testInput.put("doNotUse5", "something"); J2735SupplementalVehicleExtensions result = SupplementalVehicleExtensionsBuilder .evaluateSupplementalVehicleExtensions(new J2735BsmPart2Content(), testInput); - assertNotNull(result.getTheRTCM()); + Assertions.assertNotNull(result.getDoNotUse5()); } @Test @@ -218,13 +211,13 @@ public void testConstructorIsPrivate() throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { Constructor constructor = SupplementalVehicleExtensionsBuilder.class .getDeclaredConstructor(); - assertTrue(Modifier.isPrivate(constructor.getModifiers())); + Assertions.assertTrue(Modifier.isPrivate(constructor.getModifiers())); constructor.setAccessible(true); try { constructor.newInstance(); - fail("Expected IllegalAccessException.class"); + Assertions.fail("Expected IllegalAccessException.class"); } catch (Exception e) { - assertEquals(InvocationTargetException.class, e.getClass()); + Assertions.assertEquals(InvocationTargetException.class, e.getClass()); } } diff --git a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/coder/OdeBsmDataCreatorHelperTest.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/coder/OdeBsmDataCreatorHelperTest.java index 6587fb028..543954af4 100644 --- a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/coder/OdeBsmDataCreatorHelperTest.java +++ b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/coder/OdeBsmDataCreatorHelperTest.java @@ -1,13 +1,10 @@ package us.dot.its.jpo.ode.coder; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; import static org.junit.jupiter.api.Assertions.assertEquals; import java.math.BigDecimal; - +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - import us.dot.its.jpo.ode.model.OdeBsmData; import us.dot.its.jpo.ode.model.OdeBsmPayload; import us.dot.its.jpo.ode.plugin.j2735.J2735BsmPart2ExtensionBase; @@ -18,16 +15,16 @@ public class OdeBsmDataCreatorHelperTest { @Test public void testCreateOdeBsmData() { - String consumedData = "RVbsmTxsuccessRVunsecuredDataMessageFrameUPERus.dot.its.jpo.ode.model.OdeAsn1Payload746fdbbb-188b-471b-a4ed-8f9c0310851210002022-10-31T06:50:07.892312Z60false172.19.0.1MessageFrame20350D337EAF8800396792924-10593528173395935270019696000501000000001000000000000-1347-37532261530-1998-6328-1262370-1887-8337-3962710-1166-10100-5763020164-11501-77633802130-12445-95637804586-12737-102642206499-12139-111646708041-10872-906503010185-7426-53655353276720000001000020065535655351010734101001000000000000000"; + String consumedData = "RVbsmTxsuccessRVunsecuredDataMessageFrameUPERus.dot.its.jpo.ode.model.OdeAsn1Payload746fdbbb-188b-471b-a4ed-8f9c0310851210002022-10-31T06:50:07.892312Z60false172.19.0.1MessageFrame20350D337EAF8800396792924-10593528173395935270019696000501000000001000000000000-1347-37532261530-1998-6328-1262370-1887-8337-3962710-1166-10100-5763020164-11501-77633802130-12445-95637804586-12737-102642206499-12139-111646708041-10872-906503010185-7426-53655353276720000001000020065535655351010734101001000000000000000"; try { XmlUtils.toObjectNode(consumedData); } catch (XmlUtilsException e) { - fail("XML parsing error:" + e); + Assertions.fail("XML parsing error:" + e); } OdeBsmData bsmData; try { bsmData = OdeBsmDataCreatorHelper.createOdeBsmData(consumedData); - assertNotNull(bsmData); + Assertions.assertNotNull(bsmData); J2735BsmPart2ExtensionBase part2Ext = ((OdeBsmPayload)bsmData.getPayload()).getBsm().getPartII().get(0).getValue(); BigDecimal timeOffset = ((J2735VehicleSafetyExtensions)part2Ext).getPathHistory().getCrumbData().get(9).getTimeOffset(); assertEquals(Integer.toString(65535), timeOffset.toString());