Merge pull request #93 from Ciscoadmin/rp5

Basic RP v5 support
Invictum · Apr 2, 2020 · e2dfdf5 · e2dfdf5
2 parents e5c9827 + 177c163
commit e2dfdf5
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -59,12 +59,12 @@
         <dependency>
             <groupId>com.epam.reportportal</groupId>
             <artifactId>client-java</artifactId>
-            <version>4.0.19</version>
+            <version>5.0.0-BETA-9</version>
         </dependency>
         <dependency>
             <groupId>com.epam.reportportal</groupId>
             <artifactId>commons-model</artifactId>
-            <version>4.2.0</version>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/src/main/java/com/github/invictum/reportportal/FileStorage.java b/src/main/java/com/github/invictum/reportportal/FileStorage.java
@@ -69,11 +69,11 @@ public long count() {
     /**
      * Collects the set of launches and removes storage
      */
-    public Set<String> loadAndClean() {
-        Set<String> ids = new HashSet<>();
+    public Set<Long> loadAndClean() {
+        Set<Long> ids = new HashSet<>();
         try {
             Files.list(root).filter(VALID).forEach(path -> {
-                ids.add(path.getFileName().toString());
+                ids.add(Long.valueOf(path.getFileName().toString()));
                 secureRemove(path);
             });
             Files.delete(root);
@@ -90,4 +90,4 @@ private static void secureRemove(Path path) {
             LOG.debug("Unable to remove file at {}", path);
         }
     }
-}
+}
diff --git a/src/main/java/com/github/invictum/reportportal/LogUnitsHolder.java b/src/main/java/com/github/invictum/reportportal/LogUnitsHolder.java
@@ -38,7 +38,8 @@ public void proceed(TestStep step) {
         units.forEach(item -> {
             Collection<SaveLogRQ> logs = item.apply(step);
             logs.forEach(log -> ReportPortal.emitLog(id -> {
-                log.setTestItemId(id);
+//                log.setTestItemId(id);
+                log.setItemUuid(id);
                 return log;
             }));
         });

diff --git a/src/main/java/com/github/invictum/reportportal/StartEventBuilder.java b/src/main/java/com/github/invictum/reportportal/StartEventBuilder.java
@@ -54,7 +54,7 @@ public StartEventBuilder withParameters(DataTable.RowValueAccessor data) {
     public StartEventBuilder withTags(Set<TestTag> tags) {
         Set<String> result = tags.stream().filter(t -> !t.getType().contentEquals("story"))
                 .map(tag -> tag.getType() + ":" + tag.getName()).collect(Collectors.toSet());
-        startEvent.setTags(result);
+//        startEvent.setTags(result);
         return this;
     }
 

diff --git a/src/main/java/com/github/invictum/reportportal/injector/ReportLaunchProvider.java b/src/main/java/com/github/invictum/reportportal/injector/ReportLaunchProvider.java
@@ -57,15 +57,16 @@ private StartLaunchRQ buildStartLaunchEvent(ListenerParameters parameters) {
         event.setName(parameters.getLaunchName());
         event.setStartTime(Calendar.getInstance().getTime());
         event.setMode(parameters.getLaunchRunningMode());
-        event.setTags(parameters.getTags());
+//        As I understood Tags functionality moved to somewhere in RP 5. Unfortunately, I can't find right way to use Tags
+//        event.setTags(parameters.getTags());
         event.setDescription(parameters.getDescription());
         return event;
     }
 
     private MergeLaunchesRQ buildMergeLaunchesEvent(ListenerParameters parameters) {
         MergeLaunchesRQ merge = new MergeLaunchesRQ();
         merge.setName(parameters.getLaunchName());
-        merge.setTags(parameters.getTags());
+//        merge.setTags(parameters.getTags());
         merge.setExtendSuitesDescription(true);
         merge.setMergeStrategyType("DEEP");
         merge.setLaunches(fileStorage.loadAndClean());

diff --git a/src/main/java/com/github/invictum/reportportal/recorder/Regular.java b/src/main/java/com/github/invictum/reportportal/recorder/Regular.java
@@ -68,7 +68,8 @@ public void record(TestOutcome out) {
     private void recordNonStepFailure(TestOutcome out){
         Collection<SaveLogRQ> logs = Error.errorInTest().apply(out);
         logs.forEach(l -> ReportPortal.emitLog(id -> {
-            l.setTestItemId(id);
+//            l.setTestItemId(id);
+            l.setItemUuid(id);
             return l;
         }));
     }

diff --git a/src/test/java/com/github/invictum/reportportal/FileStorageTest.java b/src/test/java/com/github/invictum/reportportal/FileStorageTest.java
@@ -42,10 +42,10 @@ public void count() throws IOException {
     public void loadAndClean() throws IOException {
         directory.newFile("1");
         directory.newFile("2");
-        Set<String> actual = fileStorage.loadAndClean();
-        Set<String> expected = new HashSet<>();
-        expected.add("1");
-        expected.add("2");
+        Set<Long> actual = fileStorage.loadAndClean();
+        Set<Long> expected = new HashSet<>();
+        expected.add(Long.valueOf("1"));
+        expected.add(Long.valueOf("2"));
         Assert.assertEquals(expected, actual);
     }
 }
diff --git a/src/test/java/com/github/invictum/reportportal/StartEventBuilderTest.java b/src/test/java/com/github/invictum/reportportal/StartEventBuilderTest.java
@@ -92,6 +92,6 @@ public void withTagsTest() {
                 .withName("name")
                 .withTags(tags)
                 .build();
-        Assert.assertEquals(Collections.singleton("type:name"), event.getTags());
+//        Assert.assertEquals(Collections.singleton("type:name"), event.getTags());
     }
 }