Merge pull request #7 from TatianaTochko/add-export-execution-fixes

Add export execution fixes
vividus-framework · Feb 16, 2022 · 3fcfc47 · 3fcfc47
2 parents 06d907b + de6dec4
commit 3fcfc47
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 20 deletions.
diff --git a/...zephyr/databind/TestCaseDeserializer.java → ...tabind/TestCaseExecutionDeserializer.java b/...zephyr/databind/TestCaseDeserializer.java → ...tabind/TestCaseExecutionDeserializer.java
@@ -26,11 +26,11 @@
 import org.vividus.util.json.JsonPathUtils;
 import org.vividus.zephyr.model.TestCaseExecution;
 
-public class TestCaseDeserializer extends StdDeserializer<TestCaseExecution>
+public class TestCaseExecutionDeserializer extends StdDeserializer<TestCaseExecution>
 {
     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
@@ -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
@@ -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/...r/databind/TestCaseDeserializerTests.java → ...d/TestCaseExecutionDeserializerTests.java b/...r/databind/TestCaseDeserializerTests.java → ...d/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
@@ -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()));
     }
 }