Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
N
Notification
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSDU
OSDU Data Platform
System
Notification
Commits
1a1b9356
Commit
1a1b9356
authored
4 years ago
by
Anuj Gupta
Browse files
Options
Downloads
Plain Diff
Merge branch 'ibm_int_quick_fix' into 'master'
ibm int test fix See merge request
!27
parents
9af3cc16
bc5e93d5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!27
ibm int test fix
Pipeline
#13643
passed
4 years ago
Stage: build
Stage: scan
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
testing/notification-test-ibm/pom.xml
+1
-1
1 addition, 1 deletion
testing/notification-test-ibm/pom.xml
testing/notification-test-ibm/src/test/java/org/opengroup/osdu/notification/util/IBMTestUtils.java
+9
-5
9 additions, 5 deletions
...va/org/opengroup/osdu/notification/util/IBMTestUtils.java
with
10 additions
and
6 deletions
testing/notification-test-ibm/pom.xml
+
1
−
1
View file @
1a1b9356
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
testing/notification-test-ibm/src/test/java/org/opengroup/osdu/notification/util/IBMTestUtils.java
+
9
−
5
View file @
1a1b9356
...
...
@@ -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
.
getTokenForUserWithA
dminsA
ccess
();
}
return
adminToken
;
return
"Bearer "
+
adminToken
;
}
@Override
public
synchronized
String
getEditorToken
()
throws
Exception
{
if
(
Strings
.
isNullOrEmpty
(
editorToken
))
{
editorToken
=
IdentityClient
.
getTokenForUserWithAccess
();
editorToken
=
IdentityClient
.
getTokenForUserWith
Editors
Access
();
}
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
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment