Skip to content

Commit ef046f7

Browse files
HardNorthHardNorth
committed
Fix build
1 parent 66a0569 commit ef046f7

11 files changed

+20
-18
lines changed

‎src/main/java/com/epam/reportportal/junit/ReportPortalListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ protected List<ParameterResource> getMethodParameters(@Nonnull final FrameworkMe
953953
Object target = getTargetFor(runner, method);
954954
if (target instanceof ArtifactParams) {
955955
//noinspection Guava
956-
com.google.common.base.Optional<Map<String, Object>> params = ((ArtifactParams) target).getParameters();
956+
Optional<Map<String, Object>> params = ((ArtifactParams) target).getParameters();
957957
if (params.isPresent()) {
958958
for (Map.Entry<String, Object> param : params.get().entrySet()) {
959959
ParameterResource parameter = new ParameterResource();

‎src/test/java/com/epam/reportportal/junit/features/callback/RetrieveByDescriptionFeatureTest.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.epam.reportportal.service.tree.TestItemTree;
2424
import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
2525
import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
26-
import com.google.common.collect.Sets;
2726
import org.junit.AfterClass;
2827
import org.junit.Rule;
2928
import org.junit.Test;
@@ -36,6 +35,7 @@
3635
import javax.annotation.Nonnull;
3736
import java.util.ArrayList;
3837
import java.util.Calendar;
38+
import java.util.Collections;
3939
import java.util.List;
4040

4141
import static java.util.Optional.ofNullable;
@@ -51,7 +51,8 @@ public class RetrieveByDescriptionFeatureTest {
5151
public TestRule rule = new TestWatcher() {
5252
@Override
5353
protected void finished(@Nonnull Description description) {
54-
ofNullable(ItemTreeUtils.retrieveLeaf(description,
54+
ofNullable(ItemTreeUtils.retrieveLeaf(
55+
description,
5556
ParallelRunningContext.getCurrent().getItemTree()
5657
)).ifPresent(testItemLeaves::add);
5758
}
@@ -71,8 +72,9 @@ private static void addSaucelabsAttribute() {
7172
FinishTestItemRQ request = new FinishTestItemRQ();
7273
request.setEndTime(Calendar.getInstance().getTime());
7374
request.setStatus("PASSED");
74-
request.setAttributes(Sets.newHashSet(new ItemAttributesRQ(SLID, SLID_VALUE)));
75-
ItemTreeReporter.finishItem(ReportPortalListener.getReportPortal().getClient(),
75+
request.setAttributes(Collections.singleton(new ItemAttributesRQ(SLID, SLID_VALUE)));
76+
ItemTreeReporter.finishItem(
77+
ReportPortalListener.getReportPortal().getClient(),
7678
request,
7779
ParallelRunningContext.getCurrent().getItemTree().getLaunchId(),
7880
testItemLeaves.get(0)

‎src/test/java/com/epam/reportportal/junit/features/ignore/ParameterizedIgnoredTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.epam.reportportal.junit.features.ignore;
1818

1919
import com.epam.reportportal.annotations.ParameterKey;
20-
import com.google.common.base.Optional;
2120
import com.nordstrom.automation.junit.ArtifactParams;
2221
import com.nordstrom.automation.junit.AtomIdentity;
2322
import org.junit.Ignore;
@@ -30,6 +29,7 @@
3029

3130
import java.util.Collections;
3231
import java.util.Map;
32+
import java.util.Optional;
3333

3434
@RunWith(Parameterized.class)
3535
public class ParameterizedIgnoredTest implements ArtifactParams {

‎src/test/java/com/epam/reportportal/junit/features/parameters/JUnitParamsNullValueTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.epam.reportportal.junit.features.parameters;
1818

19-
import com.google.common.base.Optional;
2019
import com.nordstrom.automation.junit.ArtifactParams;
2120
import com.nordstrom.automation.junit.AtomIdentity;
2221
import com.nordstrom.automation.junit.AtomicTest;
@@ -30,6 +29,7 @@
3029
import org.junit.runner.RunWith;
3130

3231
import java.util.Map;
32+
import java.util.Optional;
3333

3434
@RunWith(JUnitParamsRunner.class)
3535
public class JUnitParamsNullValueTest implements ArtifactParams {
@@ -66,7 +66,7 @@ public Optional<Map<String, Object>> getParameters() {
6666
String param = (String) params[0];
6767
return Param.mapOf(Param.param("param", param));
6868
} catch (IllegalAccessException | NoSuchFieldException e) {
69-
return Optional.absent();
69+
return Optional.empty();
7070
}
7171
}
7272
}

‎src/test/java/com/epam/reportportal/junit/features/parameters/JUnitParamsSimpleTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.epam.reportportal.junit.features.parameters;
1818

19-
import com.google.common.base.Optional;
2019
import com.nordstrom.automation.junit.ArtifactParams;
2120
import com.nordstrom.automation.junit.AtomIdentity;
2221
import com.nordstrom.automation.junit.AtomicTest;
@@ -30,6 +29,7 @@
3029
import org.junit.runner.RunWith;
3130

3231
import java.util.Map;
32+
import java.util.Optional;
3333

3434
@RunWith(JUnitParamsRunner.class)
3535
public class JUnitParamsSimpleTest implements ArtifactParams {
@@ -62,7 +62,7 @@ public Optional<Map<String, Object>> getParameters() {
6262
String param = (String) params[0];
6363
return Param.mapOf(Param.param("param", param));
6464
} catch (IllegalAccessException | NoSuchFieldException e) {
65-
return Optional.absent();
65+
return Optional.empty();
6666
}
6767
}
6868
}

‎src/test/java/com/epam/reportportal/junit/features/parameters/JUnitParamsTwoParamsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.epam.reportportal.junit.features.parameters;
1818

19-
import com.google.common.base.Optional;
2019
import com.nordstrom.automation.junit.ArtifactParams;
2120
import com.nordstrom.automation.junit.AtomIdentity;
2221
import com.nordstrom.automation.junit.AtomicTest;
@@ -30,6 +29,7 @@
3029
import org.junit.runner.RunWith;
3130

3231
import java.util.Map;
32+
import java.util.Optional;
3333

3434
@RunWith(JUnitParamsRunner.class)
3535
public class JUnitParamsTwoParamsTest implements ArtifactParams {
@@ -61,7 +61,7 @@ public Optional<Map<String, Object>> getParameters() {
6161
Object[] params = LifecycleHooks.getFieldValue(callable, "val$params");
6262
return Param.mapOf(Param.param("param1", params[0]), Param.param("param2", params[1]));
6363
} catch (IllegalAccessException | NoSuchFieldException e) {
64-
return Optional.absent();
64+
return Optional.empty();
6565
}
6666
}
6767
}

‎src/test/java/com/epam/reportportal/junit/features/parameters/StandardParametersNullValueTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.epam.reportportal.junit.features.parameters;
1818

19-
import com.google.common.base.Optional;
2019
import com.nordstrom.automation.junit.ArtifactParams;
2120
import com.nordstrom.automation.junit.AtomIdentity;
2221
import org.junit.Rule;
@@ -28,6 +27,7 @@
2827

2928
import java.util.Collections;
3029
import java.util.Map;
30+
import java.util.Optional;
3131

3232
@RunWith(Parameterized.class)
3333
public class StandardParametersNullValueTest implements ArtifactParams {

‎src/test/java/com/epam/reportportal/junit/features/parameters/StandardParametersSimpleTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.epam.reportportal.junit.features.parameters;
1818

19-
import com.google.common.base.Optional;
2019
import com.nordstrom.automation.junit.ArtifactParams;
2120
import com.nordstrom.automation.junit.AtomIdentity;
2221
import org.junit.Rule;
@@ -28,6 +27,7 @@
2827

2928
import java.util.Collections;
3029
import java.util.Map;
30+
import java.util.Optional;
3131

3232
@RunWith(Parameterized.class)
3333
public class StandardParametersSimpleTest implements ArtifactParams {

‎src/test/java/com/epam/reportportal/junit/features/parameters/StandardParametersTwoParamsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.epam.reportportal.junit.features.parameters;
1818

19-
import com.google.common.base.Optional;
2019
import com.nordstrom.automation.junit.ArtifactParams;
2120
import com.nordstrom.automation.junit.AtomIdentity;
2221
import org.junit.Rule;
@@ -28,6 +27,7 @@
2827

2928
import java.util.HashMap;
3029
import java.util.Map;
30+
import java.util.Optional;
3131

3232
@RunWith(Parameterized.class)
3333
public class StandardParametersTwoParamsTest implements ArtifactParams {

‎src/test/java/com/epam/reportportal/junit/features/retry/StandardParametersRetryTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.epam.reportportal.junit.features.retry;
1818

19-
import com.google.common.base.Optional;
2019
import com.nordstrom.automation.junit.ArtifactParams;
2120
import com.nordstrom.automation.junit.AtomIdentity;
2221
import org.junit.Rule;
@@ -28,6 +27,7 @@
2827

2928
import java.util.Collections;
3029
import java.util.Map;
30+
import java.util.Optional;
3131
import java.util.concurrent.atomic.AtomicInteger;
3232

3333
@RunWith(Parameterized.class)

‎src/test/java/com/epam/reportportal/junit/utils/SystemAttributesFetcherTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
package com.epam.reportportal.junit.utils;
1818

1919
import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
20-
import com.google.common.collect.Lists;
2120
import org.apache.commons.collections.CollectionUtils;
2221
import org.junit.Assert;
2322
import org.junit.Test;
2423

24+
import java.util.Arrays;
2525
import java.util.List;
2626
import java.util.Objects;
2727
import java.util.Set;
@@ -34,7 +34,7 @@
3434
*/
3535
public class SystemAttributesFetcherTest {
3636

37-
private static List<String> expectedKeys = Lists.newArrayList("jvm", "os", "agent", "skippedIssue");
37+
private static final List<String> expectedKeys = Arrays.asList("jvm", "os", "agent", "skippedIssue");
3838

3939
@Test
4040
public void systemAttributesFetchingTest() {

0 commit comments

Comments
 (0)