From bc5e93d5a479943c37cdca5cfaafecd1782234d2 Mon Sep 17 00:00:00 2001
From: Bhushan Rade <bhusrad1@in.ibm.com>
Date: Tue, 6 Oct 2020 19:50:08 +0530
Subject: [PATCH] resolved conflicts
---
testing/notification-test-ibm/pom.xml | 2 +-
.../osdu/notification/util/IBMTestUtils.java | 14 +++++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/testing/notification-test-ibm/pom.xml b/testing/notification-test-ibm/pom.xml
index 48630238e..c34117e97 100644
--- a/testing/notification-test-ibm/pom.xml
+++ b/testing/notification-test-ibm/pom.xml
@@ -27,7 +27,7 @@
<java.version>8</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
- <os-core-lib-ibm.version>0.3.6-SNAPSHOT</os-core-lib-ibm.version>
+ <os-core-lib-ibm.version>0.3.8-SNAPSHOT</os-core-lib-ibm.version>
</properties>
<repositories>
diff --git a/testing/notification-test-ibm/src/test/java/org/opengroup/osdu/notification/util/IBMTestUtils.java b/testing/notification-test-ibm/src/test/java/org/opengroup/osdu/notification/util/IBMTestUtils.java
index 88e6e845f..b42eada47 100644
--- a/testing/notification-test-ibm/src/test/java/org/opengroup/osdu/notification/util/IBMTestUtils.java
+++ b/testing/notification-test-ibm/src/test/java/org/opengroup/osdu/notification/util/IBMTestUtils.java
@@ -21,17 +21,19 @@ public class IBMTestUtils extends TestUtils {
@Override
public synchronized String getAdminToken() throws Exception {
if(Strings.isNullOrEmpty(adminToken)) {
- adminToken = IdentityClient.getTokenForUserWithAccess();
+ adminToken = IdentityClient.getTokenForUserWithAdminsAccess();
}
- return adminToken;
+ return "Bearer " + adminToken;
+
}
@Override
public synchronized String getEditorToken() throws Exception {
if(Strings.isNullOrEmpty(editorToken)) {
- editorToken = IdentityClient.getTokenForUserWithAccess();
+ editorToken = IdentityClient.getTokenForUserWithEditorsAccess();
}
- return editorToken;
+ return "Bearer " + editorToken;
+
}
@Override
@@ -39,7 +41,9 @@ public class IBMTestUtils extends TestUtils {
if(Strings.isNullOrEmpty(noAccessToken)) {
noAccessToken = IdentityClient.getTokenForUserWithNoAccess();
}
- return noAccessToken;
+
+ return "Bearer " + noAccessToken;
+
}
}
--
GitLab