From de6dec46846db88fb680c86f8a821852be076fec Mon Sep 17 00:00:00 2001 From: Dzmitry Asonau Date: Wed, 16 Feb 2022 10:21:43 +0300 Subject: [PATCH] Add export execution fixes --- ...er.java => TestCaseExecutionDeserializer.java} | 4 ++-- .../vividus/zephyr/exporter/ZephyrExporter.java | 15 ++++++--------- .../org/vividus/zephyr/model/TestCaseStatus.java | 4 ++-- ...va => TestCaseExecutionDeserializerTests.java} | 10 +++++----- .../zephyr/parser/TestCaseParserTests.java | 4 ++-- 5 files changed, 17 insertions(+), 20 deletions(-) rename vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/databind/{TestCaseDeserializer.java => TestCaseExecutionDeserializer.java} (92%) rename vividus-to-zephyr-exporter/src/test/java/org/vividus/zephyr/databind/{TestCaseDeserializerTests.java => TestCaseExecutionDeserializerTests.java} (90%) diff --git a/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/databind/TestCaseDeserializer.java b/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/databind/TestCaseExecutionDeserializer.java similarity index 92% rename from vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/databind/TestCaseDeserializer.java rename to vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/databind/TestCaseExecutionDeserializer.java index 89837f6813..5a13427be4 100644 --- a/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/databind/TestCaseDeserializer.java +++ b/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/databind/TestCaseExecutionDeserializer.java @@ -26,11 +26,11 @@ import org.vividus.util.json.JsonPathUtils; import org.vividus.zephyr.model.TestCaseExecution; -public class TestCaseDeserializer extends StdDeserializer +public class TestCaseExecutionDeserializer extends StdDeserializer { private static final long serialVersionUID = 7820826665413256040L; - public TestCaseDeserializer() + public TestCaseExecutionDeserializer() { super(TestCaseExecution.class); } diff --git a/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/exporter/ZephyrExporter.java b/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/exporter/ZephyrExporter.java index 3127c445ac..d1a6544d3f 100644 --- a/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/exporter/ZephyrExporter.java +++ b/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/exporter/ZephyrExporter.java @@ -49,7 +49,7 @@ import org.vividus.output.OutputReader; import org.vividus.zephyr.configuration.ZephyrConfiguration; import org.vividus.zephyr.configuration.ZephyrExporterProperties; -import org.vividus.zephyr.databind.TestCaseDeserializer; +import org.vividus.zephyr.databind.TestCaseExecutionDeserializer; import org.vividus.zephyr.facade.IZephyrFacade; import org.vividus.zephyr.facade.TestCaseParameters; import org.vividus.zephyr.facade.ZephyrFacade; @@ -89,17 +89,17 @@ public ZephyrExporter(JiraFacade jiraFacade, ZephyrFacade zephyrFacade, .configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true) .build() .registerModule(new SimpleModule() - .addDeserializer(TestCaseExecution.class, new TestCaseDeserializer())); + .addDeserializer(TestCaseExecution.class, new TestCaseExecutionDeserializer())); } public void exportResults() throws IOException, JiraConfigurationException { - if (zephyrExporterProperties.getExportResults()) + for (Story story : OutputReader.readStoriesFromJsons(zephyrExporterProperties.getSourceDirectory())) { - for (Story story : OutputReader.readStoriesFromJsons(zephyrExporterProperties.getSourceDirectory())) + if (zephyrExporterProperties.getExportResults()) { TestCaseLevel testCaseLevel = zephyrExporterProperties.getLevel(); - if (testCaseLevel.equals(TestCaseLevel.SCENARIO)) + if (testCaseLevel == TestCaseLevel.SCENARIO) { LOGGER.atInfo().addArgument(story::getPath).log("Exporting scenarios from {} story"); for (Scenario scenario : story.getFoldedScenarios()) @@ -113,10 +113,7 @@ else if (testCaseLevel.equals(TestCaseLevel.STORY)) exportStory(story); } } - } - else - { - for (Story story : OutputReader.readStoriesFromJsons(zephyrExporterProperties.getSourceDirectory())) + else { for (Scenario scenario : story.getFoldedScenarios()) { diff --git a/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/model/TestCaseStatus.java b/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/model/TestCaseStatus.java index 9110e9afc9..daaa98a71b 100644 --- a/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/model/TestCaseStatus.java +++ b/vividus-to-zephyr-exporter/src/main/java/org/vividus/zephyr/model/TestCaseStatus.java @@ -20,11 +20,11 @@ public enum TestCaseStatus { - BROKEN(0, "notPerformed"), + BROKEN(0, "broken"), FAILED(1, "failed"), UNKNOWN(2, ""), PENDING(3, "pending"), - SKIPPED(4, "ignorable"), + SKIPPED(4, "notPerformed"), PASSED(5, "successful"); private final String name; diff --git a/vividus-to-zephyr-exporter/src/test/java/org/vividus/zephyr/databind/TestCaseDeserializerTests.java b/vividus-to-zephyr-exporter/src/test/java/org/vividus/zephyr/databind/TestCaseExecutionDeserializerTests.java similarity index 90% rename from vividus-to-zephyr-exporter/src/test/java/org/vividus/zephyr/databind/TestCaseDeserializerTests.java rename to vividus-to-zephyr-exporter/src/test/java/org/vividus/zephyr/databind/TestCaseExecutionDeserializerTests.java index dc15c93ed6..44c31aca5b 100644 --- a/vividus-to-zephyr-exporter/src/test/java/org/vividus/zephyr/databind/TestCaseDeserializerTests.java +++ b/vividus-to-zephyr-exporter/src/test/java/org/vividus/zephyr/databind/TestCaseExecutionDeserializerTests.java @@ -36,7 +36,7 @@ import org.vividus.zephyr.model.TestCaseStatus; @ExtendWith(MockitoExtension.class) -public class TestCaseDeserializerTests +public class TestCaseExecutionDeserializerTests { private static final ObjectMapper MAPPER = new ObjectMapper(); @@ -46,7 +46,7 @@ public class TestCaseDeserializerTests @Mock private ObjectCodec objectCodec; - private final TestCaseDeserializer deserializer = new TestCaseDeserializer(); + private final TestCaseExecutionDeserializer deserializer = new TestCaseExecutionDeserializer(); @BeforeEach void init() @@ -55,7 +55,7 @@ void init() } @Test - void testDeserialize() throws IOException + void testExecutionDeserialize() throws IOException { JsonNode root = MAPPER.readTree("{\"status\" : \"failed\", \"labels\" : [{\"name\" : \"testCaseId\"," + "\"value\" : \"TEST-001\"}, {\"name\" : \"framework\", \"value\" : \"Vividus\"}]}"); @@ -67,7 +67,7 @@ void testDeserialize() throws IOException } @Test - void testDeserializeWithoutTestCaseId() throws IOException + void testExecutionDeserializeWithoutTestCaseId() throws IOException { JsonNode root = MAPPER.readTree("{\"status\" : \"passed\"," + "\"labels\" : [{\"name\" : \"framework\", \"value\" : \"Vividus\"}]}"); @@ -79,7 +79,7 @@ void testDeserializeWithoutTestCaseId() throws IOException } @Test - void testDeserializeWithTwoTestCaseIds() throws IOException + void testExecutionDeserializeWithTwoTestCaseIds() throws IOException { JsonNode root = MAPPER.readTree("{\"status\" : \"broken\", \"labels\" : [{\"name\" : \"testCaseId\"," + "\"value\" : \"TEST-002\"}, {\"name\" : \"testCaseId\",\"value\" : \"TEST-003\"}," diff --git a/vividus-to-zephyr-exporter/src/test/java/org/vividus/zephyr/parser/TestCaseParserTests.java b/vividus-to-zephyr-exporter/src/test/java/org/vividus/zephyr/parser/TestCaseParserTests.java index 7f94c94c53..335c4398e6 100644 --- a/vividus-to-zephyr-exporter/src/test/java/org/vividus/zephyr/parser/TestCaseParserTests.java +++ b/vividus-to-zephyr-exporter/src/test/java/org/vividus/zephyr/parser/TestCaseParserTests.java @@ -51,7 +51,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.vividus.zephyr.configuration.ZephyrExporterProperties; -import org.vividus.zephyr.databind.TestCaseDeserializer; +import org.vividus.zephyr.databind.TestCaseExecutionDeserializer; import org.vividus.zephyr.model.TestCaseExecution; import org.vividus.zephyr.model.TestCaseStatus; @@ -156,6 +156,6 @@ private ObjectMapper configureObjectMapper() .configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true) .build() .registerModule(new SimpleModule() - .addDeserializer(TestCaseExecution.class, new TestCaseDeserializer())); + .addDeserializer(TestCaseExecution.class, new TestCaseExecutionDeserializer())); } }