Fix logic for milliseconds

Author: HardNorth

src/main/java/com/epam/reportportal/karate/ReportPortalUtils.java

@@ -564,10 +564,12 @@ public static Instant getStepStartTime(@Nullable String scenarioUniqueId, Map<St
 			stepStartTimeMap.put(scenarioUniqueId, currentStepStartTime);
 			return currentStepStartTime;
 		}
-		if (lastStepStartTime.compareTo(currentStepStartTime) >= 0) {
-			if (useMicroseconds) {
+		if (useMicroseconds) {
+			if (lastStepStartTime.compareTo(currentStepStartTime) >= 0) {
 				currentStepStartTime = lastStepStartTime.plus(1, ChronoUnit.MICROS);
-			} else {
+			}
+		} else {
+			if (lastStepStartTime.truncatedTo(ChronoUnit.MILLIS).compareTo(currentStepStartTime.truncatedTo(ChronoUnit.MILLIS)) >= 0) {
 				currentStepStartTime = lastStepStartTime.plus(1, ChronoUnit.MILLIS);
 			}
 		}

src/test/java/com/epam/reportportal/karate/timing/SimpleTimingTest.java

@@ -23,12 +23,13 @@
 import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
 import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
 import com.intuit.karate.Results;
+import io.reactivex.Maybe;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.ArgumentCaptor;
 
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -54,13 +55,29 @@ public void setupMock() {
 		mockBatchLogging(client);
 	}
 
+	public static Stream<Arguments> testCases() {
+		return Stream.of( //
+				Arguments.of(false, false), //
+				Arguments.of(false, true), //
+				Arguments.of(true, false), //
+				Arguments.of(true, true) //
+		);
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@ParameterizedTest
-	@ValueSource(booleans = { true, false })
-	public void test_each_item_has_correct_start_date(boolean report) {
+	@MethodSource("testCases")
+	public void test_each_item_has_correct_start_date(boolean report, boolean useMicroseconds) {
 		Results results;
 		if (report) {
+			if (useMicroseconds) {
+				when(client.getApiInfo()).thenReturn(Maybe.just(TestUtils.testApiInfo()));
+			}
 			results = TestUtils.runAsReport(rp, TEST_FEATURE);
 		} else {
+			if (useMicroseconds) {
+				when(client.getApiInfo()).thenReturn(Maybe.just(TestUtils.testApiInfo()));
+			}
 			results = TestUtils.runAsHook(rp, TEST_FEATURE);
 		}
 		assertThat(results.getFailCount(), equalTo(0));
@@ -80,13 +97,13 @@ public void test_each_item_has_correct_start_date(boolean report) {
 
 		assertThat(
 				"Launch start time is greater than Feature start time.",
-				(Date) featureRq.getStartTime(),
-				greaterThanOrEqualTo((Date) launchRq.getStartTime())
+				(Comparable) featureRq.getStartTime(),
+				greaterThanOrEqualTo((Comparable) launchRq.getStartTime())
 		);
 		assertThat(
 				"Feature start time is greater than Scenario start time.",
-				(Date) scenarioRq.getStartTime(),
-				greaterThanOrEqualTo((Date) featureRq.getStartTime())
+				(Comparable) scenarioRq.getStartTime(),
+				greaterThanOrEqualTo((Comparable) featureRq.getStartTime())
 		);
 
 		List<StartTestItemRQ> steps = stepCaptor.getAllValues();
@@ -98,19 +115,19 @@ public void test_each_item_has_correct_start_date(boolean report) {
 				.orElseThrow();
 
 		assertThat(
-				"Scenario start time is greater than Step start time.",
-				(Date) firstStep.getStartTime(),
-				greaterThanOrEqualTo((Date) scenarioRq.getStartTime())
+				"First Step start time is greater or equal than Scenario start time.",
+				(Comparable) firstStep.getStartTime(),
+				greaterThanOrEqualTo((Comparable) scenarioRq.getStartTime())
 		);
 		assertThat(
-				"First Step start time is greater or equal than Second Step start time.",
-				(Date) secondStep.getStartTime(),
-				greaterThan((Date) firstStep.getStartTime())
+				"Second Step start time is greater than First Step start time.",
+				(Comparable) secondStep.getStartTime(),
+				greaterThan((Comparable) firstStep.getStartTime())
 		);
 		assertThat(
-				"Second Step start time is greater or equal than Third Step start time.",
-				(Date) thirdStep.getStartTime(),
-				greaterThan((Date) secondStep.getStartTime())
+				"Third Step start time is greater than Second Step start time.",
+				(Comparable) thirdStep.getStartTime(),
+				greaterThan((Comparable) secondStep.getStartTime())
 		);
 	}
 }

src/test/java/com/epam/reportportal/karate/utils/TestUtils.java

@@ -19,10 +19,12 @@
 import com.epam.reportportal.karate.KarateReportPortalRunner;
 import com.epam.reportportal.karate.ReportPortalHook;
 import com.epam.reportportal.listeners.ListenerParameters;
+import com.epam.reportportal.service.LaunchImpl;
 import com.epam.reportportal.service.ReportPortal;
 import com.epam.reportportal.service.ReportPortalClient;
 import com.epam.reportportal.util.test.CommonUtils;
 import com.epam.reportportal.utils.http.HttpRequestUtils;
+import com.epam.ta.reportportal.ws.model.ApiInfo;
 import com.epam.ta.reportportal.ws.model.BatchSaveOperatingRS;
 import com.epam.ta.reportportal.ws.model.Constants;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
@@ -250,4 +252,12 @@ public static List<Pair<String, byte[]>> extractBinaryParts(List<MultipartBody.P
 				})
 				.collect(Collectors.toList());
 	}
+
+	public static ApiInfo testApiInfo() {
+		ApiInfo apiInfo = new ApiInfo();
+		ApiInfo.Build build = new ApiInfo.Build();
+		apiInfo.setBuild(build);
+		build.setVersion(LaunchImpl.MICROSECONDS_MIN_VERSION);
+		return apiInfo;
+	}
 }