Skip to content

Commit 602d88d

Browse files
committed
addressing PR comments
1 parent 37af7bc commit 602d88d

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

service/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ tasks.withType(Test) {
133133
}
134134

135135
check.dependsOn integrationTest
136-
integrationTest.mustRunAfter test
137136

138137
spotbugsTest.enabled = false
139138
spotbugsIntegrationTest.enabled = false

service/src/test/java/uk/nhs/adaptors/gp2gp/common/configuration/CustomTrustStoreTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import io.findify.s3mock.S3Mock;
44
import org.junit.jupiter.api.AfterAll;
55
import org.junit.jupiter.api.BeforeAll;
6-
import org.junit.jupiter.api.BeforeEach;
76
import org.junit.jupiter.api.Test;
87
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
98
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -24,7 +23,7 @@ class CustomTrustStoreTest {
2423
private static final String BUCKET_NAME = "test-bucket";
2524
private static final String TRUSTSTORE_PATH = "test.jks";
2625
private static final String TRUSTSTORE_PASSWORD = "password";
27-
private CustomTrustStore customTrustStore;
26+
private static CustomTrustStore customTrustStore;
2827

2928
@BeforeAll
3029
static void setUp() {
@@ -47,14 +46,15 @@ static void setUp() {
4746
software.amazon.awssdk.core.sync.RequestBody.fromFile(trustStoreFile));
4847
}
4948

50-
@BeforeEach
51-
void prepare() {
49+
@BeforeAll
50+
static void setup() {
5251
customTrustStore = new CustomTrustStore(s3Client);
5352
}
5453

5554
@AfterAll
5655
static void tearDown() {
5756
s3Mock.shutdown();
57+
customTrustStore = null;
5858
}
5959

6060
@Test

0 commit comments

Comments
 (0)