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
01a33adf
Commit
01a33adf
authored
3 years ago
by
Rucha Deshpande
Browse files
Options
Downloads
Patches
Plain Diff
bug fix
parent
f71ef981
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!137
Aws xuserid fix
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java
+8
-5
8 additions, 5 deletions
...engroup/osdu/notification/api/TestPubsubEndpointHMAC.java
with
8 additions
and
5 deletions
testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java
+
8
−
5
View file @
01a33adf
...
...
@@ -24,6 +24,7 @@ import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import
org.opengroup.osdu.core.common.model.notification.HmacSecret
;
import
org.opengroup.osdu.core.common.model.notification.Subscription
;
import
org.opengroup.osdu.core.common.notification.ISubscriptionService
;
import
org.opengroup.osdu.core.common.notification.SubscriptionAPIConfig
;
import
org.opengroup.osdu.core.common.notification.SubscriptionException
;
import
org.opengroup.osdu.core.common.notification.SubscriptionFactory
;
import
org.opengroup.osdu.notification.util.*
;
...
...
@@ -37,11 +38,13 @@ public class TestPubsubEndpointHMAC extends PubsubEndpointHMACTests {
private
String
subscriptionId
=
null
;
private
String
notificationId
=
null
;
private
ISubscriptionService
subscriptionService
;
private
static
SubscriptionFactory
factory
;
private
ISubscriptionService
aws
subscriptionService
;
private
static
SubscriptionFactory
aws
factory
;
@BeforeClass
public
static
void
classSetup
()
throws
Exception
{
PubsubEndpointHMACTests
.
classSetup
();
SubscriptionAPIConfig
config
=
SubscriptionAPIConfig
.
builder
().
rootUrl
(
Config
.
Instance
().
RegisterServicePath
).
build
();
awsfactory
=
new
SubscriptionFactory
(
config
);
}
@AfterClass
...
...
@@ -90,7 +93,7 @@ public class TestPubsubEndpointHMAC extends PubsubEndpointHMACTests {
//hardcoding user here for 200 response tests. This is just initializing the subscription creation
headers
.
put
(
"x-user-id"
,
AwsConfig
.
getAWSCognitoUser
());
DpsHeaders
dpsHeaders
=
DpsHeaders
.
createFromMap
(
headers
);
subscriptionService
=
factory
.
create
(
dpsHeaders
);
aws
subscriptionService
=
aws
factory
.
create
(
dpsHeaders
);
System
.
out
.
println
(
"****NOTIFICATION Created subscriptionService using following headers*******"
);
Map
<
String
,
String
>
h
=
dpsHeaders
.
getHeaders
();
...
...
@@ -110,7 +113,7 @@ public class TestPubsubEndpointHMAC extends PubsubEndpointHMACTests {
subscription
.
setSecret
(
secret
);
try
{
Subscription
subscriptionCreated
=
subscriptionService
.
create
(
subscription
);
Subscription
subscriptionCreated
=
aws
subscriptionService
.
create
(
subscription
);
notificationId
=
subscriptionCreated
.
getNotificationId
();
subscriptionId
=
subscriptionCreated
.
getId
();
Config
.
Instance
().
NotificationId
=
notificationId
;
...
...
@@ -122,7 +125,7 @@ public class TestPubsubEndpointHMAC extends PubsubEndpointHMACTests {
@Override
protected
void
deleteResource
()
throws
Exception
{
subscriptionService
.
delete
(
subscriptionId
);
aws
subscriptionService
.
delete
(
subscriptionId
);
}
}
\ No newline at end of file
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