diff --git a/pom.xml b/pom.xml
index 921591b..50f5323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,12 +59,12 @@
com.epam.reportportal
client-java
- 4.0.19
+ 5.0.0-BETA-9
com.epam.reportportal
commons-model
- 4.2.0
+ 5.0.0
junit
diff --git a/src/main/java/com/github/invictum/reportportal/FileStorage.java b/src/main/java/com/github/invictum/reportportal/FileStorage.java
index c62059e..b537c9e 100644
--- 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 loadAndClean() {
- Set ids = new HashSet<>();
+ public Set loadAndClean() {
+ Set 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);
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/invictum/reportportal/LogUnitsHolder.java b/src/main/java/com/github/invictum/reportportal/LogUnitsHolder.java
index d565849..749eeb2 100644
--- 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 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
index 55cae5a..93c2ad9 100644
--- 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 tags) {
Set 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
index ac6d58e..fcecbc3 100644
--- a/src/main/java/com/github/invictum/reportportal/injector/ReportLaunchProvider.java
+++ b/src/main/java/com/github/invictum/reportportal/injector/ReportLaunchProvider.java
@@ -57,7 +57,8 @@ 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;
}
@@ -65,7 +66,7 @@ private StartLaunchRQ buildStartLaunchEvent(ListenerParameters parameters) {
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
index 04df2f6..3ec4b0c 100644
--- 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 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
index 9b81ab2..47b0972 100644
--- 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 actual = fileStorage.loadAndClean();
- Set expected = new HashSet<>();
- expected.add("1");
- expected.add("2");
+ Set actual = fileStorage.loadAndClean();
+ Set 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
index 003fc49..169041b 100644
--- 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());
}
}