Get rid of unnecessary hard code in the tests code

Author: ozgliderpilot

memex/src/test/java/com/johnlpage/memex/cucumber/steps/CucumberSpringContextConfig.java

@@ -16,7 +16,7 @@
 @CucumberContextConfiguration
 @SpringBootTest(classes = CucumberTestsContainersConfig.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles("test")
-@EmbeddedKafka(partitions = 1, topics = {"test"})
+@EmbeddedKafka
 public class CucumberSpringContextConfig {
 
 }

memex/src/test/java/com/johnlpage/memex/cucumber/steps/InspectionsPreConditionSteps.java

@@ -47,7 +47,7 @@ public void givenVehicleInspectionsExist(DataTable dataTable) throws JsonProcess
         List<VehicleInspection> inspections = new ArrayList<>();
 
         for (Map<String, String> row : rows) {
-            String json = row.get("vehicleinspection");
+            String json = row.values().iterator().next(); // Assuming each row has a single JSON string value
             VehicleInspection inspection = objectMapper.readValue(json, VehicleInspection.class);
             inspections.add(inspection);
             Long testId = inspection.getTestid();

memex/src/test/java/com/johnlpage/memex/cucumber/steps/KafkaConsumerSteps.java

@@ -47,8 +47,8 @@ public void init() {
     @Autowired
     private VehicleInspectionIdRangeValidator idRangeValidator;
 
-    @When("I send {int} vehicle inspections starting with id {long} to kafka with:")
-    public void sendVehicleInspectionsToKafka(int count, long startId, String jsonTemplate) throws JsonProcessingException {
+    @When("I send {int} vehicle inspections starting with id {long} to kafka {string} topic with:")
+    public void sendVehicleInspectionsToKafka(int count, long startId, String topicName, String jsonTemplate) throws JsonProcessingException {
         idRangeValidator.validate(startId);
         long endIdInclusive = startId + count - 1;
         idRangeValidator.validate(endIdInclusive);
@@ -59,11 +59,11 @@ public void sendVehicleInspectionsToKafka(int count, long startId, String jsonTe
             vehicleInspection.setTestid(testId);
 
             String message = objectMapper.writeValueAsString(vehicleInspection);
-            kafkaTemplate.send("test", message);
+            kafkaTemplate.send(topicName, message);
         }
     }
 
-    @Then("verify {int} vehicle inspections starting from id {long} do exist with:")
+    @Then("{int} vehicle inspections starting from id {long} do exist with:")
     public void verifyVehicleInspectionsSaved(int count, long startId, String expectedJson) throws JsonProcessingException {
         long endId = startId + count - 1;
         idRangeValidator.validateRange(startId, endId);
@@ -115,12 +115,4 @@ private void assertJsonContains(JsonNode expected, JsonNode actual) {
             }
         }
     }
-
-    public ResponseEntity<VehicleInspection> makeGetVehicleInspectionByIdRequest(long id) {
-        return restClient.get()
-                .uri(apiBaseUrl + "/api/inspections/id/" + id)
-                .retrieve()
-                .toEntity(VehicleInspection.class);
-    }
-
 }

memex/src/test/java/com/johnlpage/memex/cucumber/steps/RestApiSteps.java

@@ -112,7 +112,7 @@ public void eachItemInTheResponseArrayShouldContain(String key, String value) {
         assertFalse(list.isEmpty(), "Response array should not be empty for this check");
         for (Map<String, Object> item : list) {
             if (key.indexOf('.') > 0) {
-                // If the value is a vehicle field, we need to check the nested structure
+                // If the value is an embedded document field, we need to check the nested structure
                 String[] parts = key.split("\\.");
                 assertThat(item, hasKey(parts[0]));
                 Object nestedValue = item.get(parts[0]);

memex/src/test/java/com/johnlpage/memex/cucumber/steps/TimeManagementSteps.java

@@ -13,12 +13,10 @@ public class TimeManagementSteps {
     @Autowired
     MacrosRegister macroRegister;
 
-    private ZonedDateTime capturedTimestamp;
-
     @Given("I capture the current timestamp to {string} with {string} pattern")
     public void iCaptureTheCurrentTimestamp(String macroName, String datePattern) {
-        this.capturedTimestamp = ZonedDateTime.now();
-        macroRegister.registerMacro(macroName, this.capturedTimestamp.format(DateTimeFormatter.ofPattern(datePattern)));
+        ZonedDateTime capturedTimestamp = ZonedDateTime.now();
+        macroRegister.registerMacro(macroName, capturedTimestamp.format(DateTimeFormatter.ofPattern(datePattern)));
     }
 
     @Given("I wait for {int} second(s)")

memex/src/test/resources/features/inspections.kafka.feature

@@ -7,12 +7,12 @@ Feature: Vehicle Inspection Kafka Integration
   @kafka @sunny_day
   Scenario: Vehicle Inspection Kafka consumer listens to sent messages
     Given the vehicle inspections in range 10000-11000 do not exist
-    When I send 100 vehicle inspections starting with id 10000 to kafka with:
+    When I send 100 vehicle inspections starting with id 10000 to kafka "test" topic with:
     """
     {"capacity": 60, "vehicle": {"make": "Ford"}}
     """
     Then I wait for 2 seconds
-    And verify 100 vehicle inspections starting from id 10000 do exist with:
+    And 100 vehicle inspections starting from id 10000 do exist with:
     """
     {"capacity": 60, "vehicle": {"make": "Ford"}}
     """