Skip to content

Commit 28932fe

Browse files
FeliTamFeliTam
authored
DTSPB-4854 fix pipeline, set renovate schedule (#1299)
1 parent f4a0aa6 commit 28932fe

22 files changed

+80
-76
lines changed

‎.github/renovate.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
"local>hmcts/.github:renovate-config",
55
"local>hmcts/.github//renovate/automerge-all"
66
],
7+
"automergeSchedule": ["after 8am and before 2pm every weekday"],
8+
"schedule": ["after 8am and before 2pm every weekday"],
79
"ignoreDeps": [
8-
"com.github.hmcts:probate-commons"
10+
"com.github.hmcts:probate-commons",
11+
"com.github.hmcts:probate-pact-commons"
912
]
1013
}

‎build.gradle‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,20 @@ processContractTestResources {
107107
duplicatesStrategy = DuplicatesStrategy.INCLUDE
108108
}
109109

110-
task integration(type: Test) {
110+
tasks.register('integration', Test) {
111111
description = "Runs integration tests"
112112
testClassesDirs = sourceSets.testIntegration.output.classesDirs
113113
classpath = sourceSets.testIntegration.runtimeClasspath
114114
}
115115

116-
task smoke(type: Test) {
116+
tasks.register('smoke', Test) {
117117
description = "Runs Smoke Tests"
118118
testClassesDirs = sourceSets.testSmoke.output.classesDirs
119119
classpath = sourceSets.testSmoke.runtimeClasspath
120120
environment("APPINSIGHTS_INSTRUMENTATIONKEY", "test-key")
121121
}
122122

123-
task functional(type: Test) {
123+
tasks.register('functional', Test) {
124124
description = "Runs functional Tests"
125125
testClassesDirs = sourceSets.testFunctional.output.classesDirs
126126
classpath = sourceSets.testFunctional.runtimeClasspath
@@ -129,7 +129,7 @@ task functional(type: Test) {
129129
}
130130

131131
functional.finalizedBy(aggregate)
132-
task runProviderPactVerification(type: Test) {
132+
tasks.register('runProviderPactVerification', Test) {
133133
testClassesDirs = sourceSets.contractTest.output.classesDirs
134134
classpath = sourceSets.contractTest.runtimeClasspath
135135
if (project.hasProperty('pact.verifier.publishResults')) {
@@ -138,23 +138,23 @@ task runProviderPactVerification(type: Test) {
138138
systemProperty 'pact.provider.version', project.pactVersion
139139
}
140140

141-
task runProviderPactTests(type: Test) {
141+
tasks.register('runProviderPactTests', Test) {
142142
description = "Runs Provider Contract Tests"
143143
println 'runProviderPactTests-PACT_BROKER_FULL_URL=' + System.getenv("PACT_BROKER_FULL_URL")
144144
useJUnitPlatform()
145145
testClassesDirs = sourceSets.contractTest.output.classesDirs
146146
classpath = sourceSets.contractTest.runtimeClasspath
147147
}
148148

149-
task runConsumerPactTests(type: Test) {
149+
tasks.register('runConsumerPactTests', Test) {
150150
description = "Runs Contract Tests"
151151
println 'runProviderPactTests-PACT_BROKER_FULL_URL=' + System.getenv("PACT_BROKER_FULL_URL")
152152
useJUnitPlatform()
153153
testClassesDirs = sourceSets.contractTest.output.classesDirs
154154
classpath = sourceSets.contractTest.runtimeClasspath
155155
}
156156

157-
tasks.withType(Test) {
157+
tasks.withType(Test).configureEach {
158158
maxHeapSize = "1024m"
159159
useJUnitPlatform()
160160
}
@@ -168,10 +168,10 @@ def versions = [
168168
fortifyClient : '1.4.9',
169169
hmctsJavaLogging : '6.1.9',
170170
jacksonDatabind : '2.19.1',
171-
junitJupiter : '5.13.1',
171+
junitJupiter : '5.12.2',
172172
lombok : '1.18.38',
173-
mapStruct : '1.6.3',
174-
pact_version : '4.6.17',
173+
mapStruct : '1.3.0.Final',
174+
pact_version : '4.1.34',
175175
piTest : '1.20.0',
176176
probateCommonsVersion : '2.2.2',
177177
restAssured : '5.5.5',
@@ -241,7 +241,7 @@ dependencies {
241241
implementation group: 'commons-io', name: 'commons-io', version: versions.commonsIO
242242
implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: versions.springDocOpenUi
243243
implementation group: 'org.projectlombok', name: 'lombok', version: versions.lombok
244-
implementation group: 'org.mapstruct', name: 'mapstruct', version: '1.6.3'
244+
implementation group: 'org.mapstruct', name: 'mapstruct', version: '1.5.5.Final'
245245
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: versions.jacksonDatabind
246246
implementation group: 'org.pitest', name: 'pitest', version: versions.piTest
247247
implementation group: 'com.atlassian.commonmark', name: 'commonmark', version: versions.commonMark
@@ -322,21 +322,21 @@ dependencies {
322322
}
323323
}
324324

325-
task fortifyScan(type: JavaExec) {
325+
tasks.register('fortifyScan', JavaExec) {
326326
mainClass.set("uk.gov.hmcts.fortifyclient.FortifyClientMainApp")
327327
classpath += sourceSets.test.runtimeClasspath
328328
jvmArgs = ['--add-opens=java.base/java.lang.reflect=ALL-UNNAMED']
329329
}
330330

331-
def getCheckedOutGitCommitHash() {
331+
static def getCheckedOutGitCommitHash() {
332332
'git rev-parse --verify --short HEAD'.execute().text.trim()
333333
}
334334

335335
project.ext {
336336
pactVersion = getCheckedOutGitCommitHash()
337337
}
338338

339-
task runAndPublishConsumerPactTests(type: Test){
339+
tasks.register('runAndPublishConsumerPactTests', Test) {
340340
logger.lifecycle("Runs PublishConsumer pact tests")
341341
systemProperty 'pact.rootDir', "pacts"
342342
println 'runAndPublishConsumerPactTests-PACT_BROKER_FULL_URL=' + System.getenv("PACT_BROKER_FULL_URL")
@@ -360,7 +360,7 @@ pact {
360360
}
361361
}
362362

363-
tasks.withType(JavaCompile) {
363+
tasks.withType(JavaCompile).configureEach {
364364
options.compilerArgs << "-parameters"
365365
}
366366

@@ -377,7 +377,7 @@ bootJar {
377377
}
378378
}
379379

380-
task generateAatEnvFile() {
380+
tasks.register('generateAatEnvFile') {
381381
doFirst {
382382
print 'Generating AAT env var file'
383383
"sh bin/generate-aat-env-file.sh".execute()

‎src/contractTest/java/uk/gov/hmcts/probate/contract/tests/ControllerProviderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.springframework.beans.factory.annotation.Autowired;
1616
import org.springframework.beans.factory.annotation.Value;
1717
import org.springframework.boot.test.context.SpringBootTest;
18-
import org.springframework.boot.test.mock.mockito.MockBean;
18+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1919
import org.springframework.test.context.junit.jupiter.SpringExtension;
2020
import org.springframework.util.ResourceUtils;
2121
import uk.gov.hmcts.reform.auth.checker.core.RequestAuthorizer;
@@ -60,13 +60,13 @@ public abstract class ControllerProviderTest {
6060

6161
private static final String AUTHORIZATION = "Authorization";
6262

63-
@MockBean
63+
@MockitoBean
6464
private SubjectResolver<Service> serviceResolver;
6565

66-
@MockBean
66+
@MockitoBean
6767
private RequestAuthorizer<User> userRequestAuthorizer;
6868

69-
@MockBean
69+
@MockitoBean
7070
private SecurityConfiguration securityConfiguration;
7171

7272
private Service service;

‎src/contractTest/java/uk/gov/hmcts/probate/contract/tests/IntestacyDraftsFormsControllerProviderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import au.com.dius.pact.provider.junitsupport.Provider;
44
import au.com.dius.pact.provider.junitsupport.State;
55
import org.json.JSONException;
6-
import org.springframework.boot.test.mock.mockito.MockBean;
6+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
77
import uk.gov.hmcts.probate.client.submit.SubmitServiceApi;
88
import uk.gov.hmcts.probate.core.service.SecurityUtils;
99
import uk.gov.hmcts.reform.probate.model.cases.ProbateCaseDetails;
@@ -15,11 +15,11 @@
1515
@Provider("probate_orchestrator_service_intestacy_forms")
1616
public class IntestacyDraftsFormsControllerProviderTest extends ControllerProviderTest {
1717

18-
@MockBean
18+
@MockitoBean
1919
private SubmitServiceApi submitServiceApi;
20-
@MockBean
20+
@MockitoBean
2121
private SecurityUtils securityUtils;
22-
@MockBean
22+
@MockitoBean
2323
private ProbateCaseDetails probateCaseDetails;
2424

2525

‎src/contractTest/java/uk/gov/hmcts/probate/contract/tests/IntestacySubmissionsFormsControllerProviderTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import au.com.dius.pact.provider.junitsupport.Provider;
44
import au.com.dius.pact.provider.junitsupport.State;
55
import org.json.JSONException;
6-
import org.springframework.boot.test.mock.mockito.MockBean;
6+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
77
import uk.gov.hmcts.probate.client.submit.SubmitServiceApi;
88
import uk.gov.hmcts.probate.core.service.SecurityUtils;
99
import uk.gov.hmcts.reform.probate.model.cases.ProbateCaseDetails;
@@ -16,9 +16,9 @@
1616
@Provider("probate_orchestrator_service_intestacy_submit")
1717
public class IntestacySubmissionsFormsControllerProviderTest extends ControllerProviderTest {
1818

19-
@MockBean
19+
@MockitoBean
2020
private SubmitServiceApi submitServiceApi;
21-
@MockBean
21+
@MockitoBean
2222
private SecurityUtils securityUtils;
2323

2424
@State({"probate_orchestrator_service submits intestacy formdata with success",

‎src/contractTest/java/uk/gov/hmcts/probate/contract/tests/InviteAllAgreedControllerProviderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import au.com.dius.pact.provider.junitsupport.Provider;
44
import au.com.dius.pact.provider.junitsupport.State;
55
import org.json.JSONException;
6-
import org.springframework.boot.test.mock.mockito.MockBean;
6+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
77
import uk.gov.hmcts.probate.client.business.BusinessServiceApi;
88
import uk.gov.hmcts.probate.client.submit.SubmitServiceApi;
99
import uk.gov.hmcts.probate.core.service.SecurityUtils;
@@ -17,11 +17,11 @@
1717
@Provider("probate_orchestrator_service_invite_allagreed")
1818
public class InviteAllAgreedControllerProviderTest extends ControllerProviderTest {
1919

20-
@MockBean
20+
@MockitoBean
2121
private BusinessServiceApi businessServiceApi;
22-
@MockBean
22+
@MockitoBean
2323
private SubmitServiceApi submitServiceApi;
24-
@MockBean
24+
@MockitoBean
2525
private SecurityUtils securityUtils;
2626

2727

‎src/contractTest/java/uk/gov/hmcts/probate/contract/tests/InviteDataControllerProviderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import au.com.dius.pact.provider.junitsupport.Provider;
44
import au.com.dius.pact.provider.junitsupport.State;
55
import org.json.JSONException;
6-
import org.springframework.boot.test.mock.mockito.MockBean;
6+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
77
import uk.gov.hmcts.probate.client.business.BusinessServiceApi;
88
import uk.gov.hmcts.probate.client.submit.SubmitServiceApi;
99
import uk.gov.hmcts.probate.core.service.SecurityUtils;
@@ -17,11 +17,11 @@
1717
@Provider("probate_orchestrator_service_invitedata")
1818
public class InviteDataControllerProviderTest extends ControllerProviderTest {
1919

20-
@MockBean
20+
@MockitoBean
2121
private BusinessServiceApi businessServiceApi;
22-
@MockBean
22+
@MockitoBean
2323
private SubmitServiceApi submitServiceApi;
24-
@MockBean
24+
@MockitoBean
2525
private SecurityUtils securityUtils;
2626

2727

‎src/contractTest/java/uk/gov/hmcts/probate/contract/tests/InviteLinkControllerProviderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import au.com.dius.pact.provider.junitsupport.State;
55
import org.json.JSONException;
66
import org.mockito.ArgumentMatchers;
7-
import org.springframework.boot.test.mock.mockito.MockBean;
7+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
88
import uk.gov.hmcts.probate.client.business.BusinessServiceApi;
99
import uk.gov.hmcts.probate.client.submit.SubmitServiceApi;
1010
import uk.gov.hmcts.probate.core.service.SecurityUtils;
@@ -21,11 +21,11 @@
2121
@Provider("probate_orchestrator_service_invitelink")
2222
public class InviteLinkControllerProviderTest extends ControllerProviderTest {
2323

24-
@MockBean
24+
@MockitoBean
2525
private BusinessServiceApi businessServiceApi;
26-
@MockBean
26+
@MockitoBean
2727
private SubmitServiceApi submitServiceApi;
28-
@MockBean
28+
@MockitoBean
2929
private SecurityUtils securityUtils;
3030

3131

‎src/contractTest/java/uk/gov/hmcts/probate/contract/tests/InvitePinNumberControllerProviderTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import au.com.dius.pact.provider.junitsupport.Provider;
44
import au.com.dius.pact.provider.junitsupport.State;
55
import org.json.JSONException;
6-
import org.springframework.boot.test.mock.mockito.MockBean;
6+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
77
import uk.gov.hmcts.probate.client.business.BusinessServiceApi;
88
import uk.gov.hmcts.probate.core.service.SecurityUtils;
99
import uk.gov.hmcts.reform.probate.model.PhonePin;
@@ -17,9 +17,9 @@
1717
@Provider("probate_orchestrator_service_invite_pinnumber")
1818
public class InvitePinNumberControllerProviderTest extends ControllerProviderTest {
1919

20-
@MockBean
20+
@MockitoBean
2121
private BusinessServiceApi businessServiceApi;
22-
@MockBean
22+
@MockitoBean
2323
private SecurityUtils securityUtils;
2424

2525

‎src/contractTest/java/uk/gov/hmcts/probate/contract/tests/ProbateDocumentsControllerCheckAnswersProviderTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import au.com.dius.pact.provider.junitsupport.Provider;
44
import au.com.dius.pact.provider.junitsupport.State;
55
import org.json.JSONException;
6-
import org.springframework.boot.test.mock.mockito.MockBean;
6+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
77
import uk.gov.hmcts.probate.client.business.BusinessServiceApi;
88
import uk.gov.hmcts.probate.core.service.SecurityUtils;
99
import uk.gov.hmcts.reform.probate.model.documents.CheckAnswersSummary;
@@ -18,9 +18,9 @@
1818
@Provider("probate_orchestrator_service_documents_check_answers")
1919
public class ProbateDocumentsControllerCheckAnswersProviderTest extends ControllerProviderTest {
2020

21-
@MockBean
21+
@MockitoBean
2222
private BusinessServiceApi businessServiceApi;
23-
@MockBean
23+
@MockitoBean
2424
private SecurityUtils securityUtils;
2525

2626
@State({"probate_orchestrator_service generates check answers byte[] with success",

0 commit comments

Comments
 (0)