From 9e255e3352a0be1cb6991d9282c960bc364ffaa5 Mon Sep 17 00:00:00 2001
From: Yash Dholakia <ysdholak@amazon.com>
Date: Tue, 11 Jul 2023 10:38:41 -0700
Subject: [PATCH] Fix notification tests
---
.../osdu/notification/subscriptions/RecordUtils.java | 3 +--
.../subscriptions/TestNotificationsEndpoint.java | 9 +++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/RecordUtils.java b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/RecordUtils.java
index 3c14f0b4d..adef2dece 100644
--- a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/RecordUtils.java
+++ b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/RecordUtils.java
@@ -76,11 +76,10 @@ public class RecordUtils {
return record;
}
- public static final String getAclSuffix(boolean isTestPartition) {
+ public static String getAclSuffix(boolean isTestPartition) {
String environment = getEnvironment();
//build.gradle currently throws exception if a variable is set to empty or not set at all
//workaround by setting it to an "empty" string to construct the url
- if (environment.equalsIgnoreCase("empty")) environment = "";
if (!environment.isEmpty())
environment = "." + environment;
diff --git a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java
index 1e4f99832..d12632fa7 100644
--- a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java
+++ b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java
@@ -52,8 +52,7 @@ public class TestNotificationsEndpoint extends TestBase {
@After
@Override
- public void tearDown() throws Exception {
- //LegalTagUtils.delete(LEGAL_TAG, testUtils.getOpsToken());
+ public void tearDown() {
this.testUtils = null;
}
@@ -124,10 +123,9 @@ public class TestNotificationsEndpoint extends TestBase {
int exitValue = process.exitValue();
assertEquals(exitValue, 1);
} catch (Exception e) {
- System.out.println("Error while verifying notification service" + Arrays.toString(e.getStackTrace()));
+ System.out.println("Error while verifying notification service. Error = " + e.getMessage() + " Stack Trace= " + Arrays.toString(e.getStackTrace()));
} finally {
awssubscriptionService.delete(subscriptionId);
- LegalTagUtils.delete(LEGAL_TAG_TEST, testUtils.getOpsToken(), true);
}
}
@@ -149,10 +147,9 @@ public class TestNotificationsEndpoint extends TestBase {
int exitValue = process.exitValue();
assertEquals(exitValue, 0);
} catch (Exception e) {
- System.out.println("Error while verifying notification service" + Arrays.toString(e.getStackTrace()));
+ System.out.println("Error while verifying notification service. Error = " + e.getMessage() + " Stack Trace= " + Arrays.toString(e.getStackTrace()));
} finally {
awssubscriptionService.delete(subscriptionId);
- LegalTagUtils.delete(LEGAL_TAG_TEST, testUtils.getOpsToken(), false);
}
}
}
--
GitLab