ODE-1158 added unit test coverage

dan-du-car · Mar 12, 2019 · c12ce6f · c12ce6f
1 parent 2e51fb0
commit c12ce6f
Show file tree

Hide file tree

Showing 7 changed files with 360 additions and 31 deletions.
diff --git a/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/OdeMsgMetadata.java b/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/OdeMsgMetadata.java
@@ -20,7 +20,7 @@
 public class OdeMsgMetadata extends OdeObject {
 
  public enum GeneratedBy {
- TMC, OBU, RSU, TMC_VIA_SAT, TMC_VIA_SNMP
+ TMC, OBU, RSU, TMC_VIA_SAT, TMC_VIA_SNMP, UNKNOWN
  }
 
  private static final long serialVersionUID = 3979762143291085955L;

diff --git a/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/RxSource.java b/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/RxSource.java
@@ -20,5 +20,5 @@ public enum RxSource {
  SAT, // XM satelite
  RV, // for BSM rx
  SNMP,// for SRM payload from backend/ODE
- NA, unknown
+ NA, UNKNOWN
 }
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/coder/stream/LogFileToAsn1CodecPublisher.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/coder/stream/LogFileToAsn1CodecPublisher.java
@@ -154,29 +154,4 @@ private void publishList(XmlUtils xmlUtils, List<OdeData> dataList) throws JsonP
  }
  }
 
- public StringPublisher getPublisher() {
- return publisher;
- }
-
- public void setPublisher(StringPublisher publisher) {
- this.publisher = publisher;
- }
-
- public LogFileParser getFileParser() {
- return fileParser;
- }
-
- public void setFileParser(LogFileParser fileParser) {
- this.fileParser = fileParser;
- }
-
- public SerialId getSerialId() {
- return serialId;
- }
-
- public void setSerialId(SerialId serialId) {
- this.serialId = serialId;
- }
-
-
 }
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/importer/parser/LogFileParser.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/importer/parser/LogFileParser.java
@@ -235,6 +235,7 @@ public void updateMetadata(OdeLogMetadata metadata) {
  metadata.setRecordGeneratedBy(GeneratedBy.RSU);
  break;
  case RV:
+ case NA:
  metadata.setRecordGeneratedBy(GeneratedBy.OBU);
  break;
  case SAT:
@@ -244,18 +245,18 @@ public void updateMetadata(OdeLogMetadata metadata) {
  metadata.setRecordGeneratedBy(GeneratedBy.TMC_VIA_SNMP);
  break;
  default:
- metadata.setRecordGeneratedBy(GeneratedBy.OBU);
+ metadata.setRecordGeneratedBy(GeneratedBy.UNKNOWN);
  break;
  }
  } else {
- receivedMessageDetails.setRxSource(RxSource.unknown);
+ receivedMessageDetails.setRxSource(RxSource.UNKNOWN);
  }
  } else {
  metadata.setRecordGeneratedBy(GeneratedBy.OBU);
  }
  }
 
- public static ReceivedMessageDetails buildReceivedMessageDetails(LogFileParser parser) {
+ private static ReceivedMessageDetails buildReceivedMessageDetails(LogFileParser parser) {
  LocationParser locationParser = parser.getLocationParser();
  ReceivedMessageDetails rxMsgDetails = null;
  if (locationParser != null) {

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/importer/parser/RxMsgFileParser.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/importer/parser/RxMsgFileParser.java
@@ -106,7 +106,7 @@ public void setRxSource(int rxSourceOrdinal) {
  } catch (Exception e) {
  logger.error("Invalid RxSource: {}. Valid values are {}: ", 
  rxSourceOrdinal, RxSource.values());
- setRxSource(RxSource.unknown);
+ setRxSource(RxSource.UNKNOWN);
  }
  }
 

diff --git a/...e-svcs/src/test/java/us/dot/its/jpo/ode/coder/stream/LogFileToAsn1CodecPublisherTest.java b/...e-svcs/src/test/java/us/dot/its/jpo/ode/coder/stream/LogFileToAsn1CodecPublisherTest.java
@@ -17,6 +17,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -90,6 +91,23 @@ public void testPublishEOF(@Mocked LogFileParser mockLogFileParser) throws Excep
  assertTrue(dataList.isEmpty());
  }
 
+ @Test(expected = Exception.class)
+ public void testPublishThrowsException(@Mocked LogFileParser mockLogFileParser) throws Exception {
+ new Expectations() {
+ {
+ LogFileParser.factory(anyString);
+ result = mockLogFileParser;
+
+ mockLogFileParser.parseFile((BufferedInputStream) any, anyString);
+ result = new Exception();
+ }
+ };
+
+ testLogFileToAsn1CodecPublisher.publish(new BufferedInputStream(new ByteArrayInputStream(new byte[0])),
+ "fileName", ImporterFileType.LEAR_LOG_FILE);
+ fail("Expected an Exception to be thrown");
+ }
+
  @Test
  public void testPublishDecodeFailure(@Mocked LogFileParser mockLogFileParser) throws Exception {
  new Expectations() {