Fix unit tests in ToJsonServiceController

Note that a bug in jmockit prevents exepectations from working here
Trihydro · Dec 4, 2018 · f6a0340 · f6a0340
1 parent 7b94b3c
commit f6a0340
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 31 deletions.
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/services/json/ToJsonServiceController.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/services/json/ToJsonServiceController.java
@@ -17,41 +17,33 @@
 public class ToJsonServiceController {
 
  private static final Logger logger = LoggerFactory.getLogger(ToJsonServiceController.class);
- 
+
  private OdeProperties odeProperties;
 
  @Autowired
  public ToJsonServiceController(OdeProperties odeProps) {
  super();
-
- this.odeProperties = odeProps;
 
- logger.info("Starting {}", this.getClass().getSimpleName());
+ this.odeProperties = odeProps;
 
  // BSM POJO --> JSON converter
  launchConverter(odeProps.getKafkaTopicOdeBsmPojo(), OdeBsmDeserializer.class.getName(),
- new ToJsonConverter<>(odeProps, false, odeProps.getKafkaTopicOdeBsmJson()));
+  new ToJsonConverter<>(odeProps, false, odeProps.getKafkaTopicOdeBsmJson()));
 
  // TIM POJO --> JSON converter
  launchConverter(odeProps.getKafkaTopicOdeTimPojo(), OdeTimDeserializer.class.getName(),
- new ToJsonConverter<>(odeProps, false, odeProps.getKafkaTopicOdeTimJson()));
+  new ToJsonConverter<>(odeProps, false, odeProps.getKafkaTopicOdeTimJson()));
 
-// ODE-787 Now POJO to JSon publishing will be done in us.dot.its.jpo.ode.traveler.TimController.depositTim(String, RequestVerb)
-// // Broadcast TIM POJO --> Broadcast TIM JSON converter
-// launchConverter(odeProps.getKafkaTopicOdeTimBroadcastPojo(), OdeTimDeserializer.class.getName(),
-// new ToJsonConverter<>(odeProps, false, odeProps.getKafkaTopicOdeTimBroadcastJson()));
  }
 
- private <V> void launchConverter(String fromTopic, String serializerFQN, 
- ToJsonConverter<V> jsonConverter) {
- logger.info("Converting records from topic {} and publishing to topic {} ", 
- fromTopic, jsonConverter.getOutputTopic());
+ private <V> void launchConverter(String fromTopic, String serializerFQN, ToJsonConverter<V> jsonConverter) {
+ logger.info("Starting JSON converter, converting records from topic {} and publishing to topic {} ", fromTopic,
+ jsonConverter.getOutputTopic());
 
- MessageConsumer<String, V> consumer = new MessageConsumer<String, V>(
- odeProperties.getKafkaBrokers(), this.getClass().getSimpleName(), 
- jsonConverter, serializerFQN);
+ MessageConsumer<String, V> consumer = new MessageConsumer<String, V>(odeProperties.getKafkaBrokers(),
+ this.getClass().getSimpleName(), jsonConverter, serializerFQN);
 
- consumer.setName(this.getClass().getName() + fromTopic + "Consumer");
+ consumer.setName(this.getClass().getName().toString() + fromTopic + "Consumer");
  jsonConverter.start(consumer, fromTopic);
  }
 }
diff --git a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/services/json/ToJsonServiceControllerTest.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/services/json/ToJsonServiceControllerTest.java
@@ -1,9 +1,4 @@
 package us.dot.its.jpo.ode.services.json;
-//TODO
-//Redo this test the class being tested had changed 
-//
-//
-import org.junit.Ignore;
 import org.junit.Test;
 
 import mockit.Capturing;
@@ -23,22 +18,16 @@ public class ToJsonServiceControllerTest {
  @Capturing
  MessageConsumer<?, ?> capturingMessageConsumer;
 
- @Ignore
  @Test
  public void test() {
  new Expectations() {
  {
  new ToJsonConverter<>((OdeProperties) any, anyBoolean, anyString);
- times = 3;
+ times = 2;
 
  new MessageConsumer<>(anyString, anyString, (MessageProcessor<?, ?>) any, anyString);
- times = 3;
+ times = 2;
 
- capturingMessageConsumer.setName(anyString);
- times = 3;
-
- capturingToJsonConverter.start((MessageConsumer) any, anyString);
- times = 3;
  }
  };
  new ToJsonServiceController(injectableOdeProperties);