fix for issue with Jira Plugin (fixes #999, via #1072)

allure-framework · Apr 21, 2020 · b111d96 · b111d96
1 parent e0e7b80
commit b111d96
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/allure-jira-commons/src/main/java/io/qameta/allure/jira/JiraLaunch.java b/allure-jira-commons/src/main/java/io/qameta/allure/jira/JiraLaunch.java
@@ -29,7 +29,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class JiraLaunch {
 
-    private int id;
+    private String externalId;
 
     private List<String> issueKeys;
 

diff --git a/allure-jira-commons/src/main/java/io/qameta/allure/jira/JiraTestResult.java b/allure-jira-commons/src/main/java/io/qameta/allure/jira/JiraTestResult.java
@@ -31,7 +31,7 @@ public class JiraTestResult {
 
     private int id;
 
-    private Integer launchId;
+    private String externalId;
     private List<String> issueKeys;
 
     private String name;

diff --git a/plugins/jira-plugin/src/main/java/io/qameta/allure/jira/JiraExportPlugin.java b/plugins/jira-plugin/src/main/java/io/qameta/allure/jira/JiraExportPlugin.java
@@ -121,7 +121,7 @@ private Optional<JiraTestResult> getJiraTestResult(final JiraLaunch launch,
                     .setUrl(getJiraTestResultUrl(executor.getReportUrl(), testResult.getUid()))
                     .setStatus(testResult.getStatus().toString())
                     .setDate(testResult.getTime().getStop())
-                    .setLaunchId(launch.getId());
+                    .setExternalId(launch.getExternalId());
             return Optional.of(jiraTestResult);
         }
     }
@@ -158,7 +158,7 @@ private JiraLaunch exportLaunchToJira(final JiraService jiraService, final JiraL
         try {
             final JiraLaunch created = jiraService.createJiraLaunch(launch);
             LOGGER.info(String.format("Allure launch '%s' synced with issues '%s' successfully",
-                    created.getId(), created.getIssueKeys()));
+                    created.getExternalId(), created.getIssueKeys()));
             return created;
         } catch (Throwable e) {
             LOGGER.error(String.format("Allure launch sync with issue '%s' error", launch.getIssueKeys()), e);

diff --git a/plugins/jira-plugin/src/test/java/io/qameta/allure/jira/JiraTestResultExportPluginTest.java b/plugins/jira-plugin/src/test/java/io/qameta/allure/jira/JiraTestResultExportPluginTest.java
@@ -86,7 +86,7 @@ void shouldExportTestResultToJira() {
         verify(service).createTestResult(argThat(result -> testResult.getName().equals(result.getName())));
         verify(service).createTestResult(argThat(result -> testResult.getStatus().toString().equals(result.getStatus())));
         verify(service).createTestResult(argThat(result -> result.getUrl().contains(testResult.getUid())));
-        verify(service).createTestResult(argThat(result -> Objects.nonNull(result.getLaunchId())));
+        verify(service).createTestResult(argThat(result -> Objects.nonNull(result.getExternalId())));
 
     }
 

diff --git a/plugins/jira-plugin/src/test/java/io/qameta/allure/jira/TestData.java b/plugins/jira-plugin/src/test/java/io/qameta/allure/jira/TestData.java
@@ -33,7 +33,7 @@ public static JiraService mockJiraService() {
         final JiraService service = mock(JiraService.class);
         when(service.createJiraLaunch(any(JiraLaunch.class))).thenAnswer(i -> {
             final JiraLaunch launch = i.getArgument(0);
-            launch.setId(RandomUtils.nextInt());
+            launch.setExternalId(String.valueOf(RandomUtils.nextInt()));
             return launch;
         });
         when(service.createTestResult(any(JiraTestResult.class))).thenAnswer(i -> {