Skip to content

Commit 76e1e99

Browse files
LokowandtgLokowandtg
committed
fix junit tests when jdk11 is used
in cloudfoundry-operations there are 32 JUnit errors when jdk 11 or jdk17 are used. Those are fixed with this change. So far not tested with later jdks.
1 parent 7e0c3c7 commit 76e1e99

File tree

5 files changed

+132
-4
lines changed

5 files changed

+132
-4
lines changed

‎cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DefaultApplicationsTest.java‎

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1532,6 +1532,12 @@ void pushExistingApplication() throws IOException {
15321532
requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
15331533
requestApplications(
15341534
this.cloudFoundryClient, "test-name", TEST_SPACE_ID, "test-application-id");
1535+
requestCreateApplication(
1536+
cloudFoundryClient,
1537+
ApplicationManifest.builder().name("test-name").build(),
1538+
TEST_SPACE_ID,
1539+
null,
1540+
"test-application-id");
15351541
requestUpdateApplication(
15361542
this.cloudFoundryClient,
15371543
"test-application-id",
@@ -1599,6 +1605,15 @@ void pushExistingApplicationWithEnvironmentVariables() throws IOException {
15991605
TEST_SPACE_ID,
16001606
"test-application-id",
16011607
Collections.singletonMap("test-key-1", "test-value-1"));
1608+
requestCreateApplication(
1609+
cloudFoundryClient,
1610+
ApplicationManifest.builder()
1611+
.name("test-name")
1612+
.environmentVariable("test-key-2", "test-value-2")
1613+
.build(),
1614+
TEST_SPACE_ID,
1615+
null,
1616+
"test-application-id");
16021617
requestUpdateApplication(
16031618
this.cloudFoundryClient,
16041619
"test-application-id",
@@ -1669,6 +1684,16 @@ void pushExistingApplicationWithNullEnvironment() throws IOException {
16691684
requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
16701685
requestApplications(
16711686
this.cloudFoundryClient, "test-name", TEST_SPACE_ID, "test-application-id", null);
1687+
requestCreateApplication(
1688+
cloudFoundryClient,
1689+
ApplicationManifest.builder()
1690+
.name("test-name")
1691+
.environmentVariable("test-key-1", "test-value-1")
1692+
.environmentVariable("test-key-2", "test-value-2")
1693+
.build(),
1694+
TEST_SPACE_ID,
1695+
null,
1696+
"test-application-id");
16721697
requestUpdateApplication(
16731698
this.cloudFoundryClient,
16741699
"test-application-id",
@@ -1756,11 +1781,20 @@ void pushExistingRouteWithHost() throws IOException {
17561781
requestSharedDomains(
17571782
this.cloudFoundryClient, "test-shared-domain", "test-shared-domain-id");
17581783
requestApplicationRoutes(this.cloudFoundryClient, "test-application-id", "test-route-id");
1784+
requestCreateRoute(
1785+
this.cloudFoundryClient,
1786+
"test-shared-domain-id",
1787+
"test-host",
1788+
null,
1789+
null,
1790+
"test-space-id",
1791+
"test-route-id");
17591792
requestRoutes(
17601793
this.cloudFoundryClient,
17611794
"test-shared-domain-id",
17621795
"test-host",
17631796
null,
1797+
null,
17641798
"test-route-id");
17651799
requestListMatchingResources(
17661800
this.cloudFoundryClient,
@@ -1817,7 +1851,16 @@ void pushExistingRouteWithNoHost() throws IOException {
18171851
requestSharedDomains(
18181852
this.cloudFoundryClient, "test-shared-domain", "test-shared-domain-id");
18191853
requestApplicationRoutes(this.cloudFoundryClient, "test-application-id", "test-route-id");
1820-
requestRoutes(this.cloudFoundryClient, "test-shared-domain-id", "", null, "test-route-id");
1854+
requestRoutes(
1855+
this.cloudFoundryClient, "test-shared-domain-id", "", null, null, "test-route-id");
1856+
requestCreateRoute(
1857+
this.cloudFoundryClient,
1858+
"test-shared-domain-id",
1859+
"",
1860+
null,
1861+
null,
1862+
"test-space-id",
1863+
"test-route-id");
18211864
requestListMatchingResources(
18221865
this.cloudFoundryClient,
18231866
Arrays.asList(
@@ -2952,6 +2995,7 @@ void pushStartFailsStaging() throws IOException {
29522995
requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STOPPED");
29532996
requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STARTED");
29542997
requestGetApplicationFailing(this.cloudFoundryClient, "test-application-id");
2998+
requestInstancesApplicationFailing(this.cloudFoundryClient, "test-application-id");
29552999

29563000
StepVerifier.withVirtualTime(
29573001
() ->
@@ -3244,6 +3288,7 @@ void restageStagingFailure() {
32443288
"test-metadata-id");
32453289
requestRestageApplication(this.cloudFoundryClient, "test-metadata-id");
32463290
requestGetApplicationFailing(this.cloudFoundryClient, "test-metadata-id");
3291+
requestInstancesApplicationFailing(this.cloudFoundryClient, "test-metadata-id");
32473292

32483293
this.applications
32493294
.restage(RestageApplicationRequest.builder().name("test-application-name").build())
@@ -3317,6 +3362,7 @@ void restageTimeout() {
33173362
"test-metadata-id");
33183363
requestRestageApplication(this.cloudFoundryClient, "test-metadata-id");
33193364
requestGetApplicationTimeout(this.cloudFoundryClient, "test-metadata-id");
3365+
requestInstancesApplicationFailing(this.cloudFoundryClient, "test-metadata-id");
33203366

33213367
this.applications
33223368
.restage(
@@ -4983,6 +5029,29 @@ private static void requestGetApplicationFailing(
49835029
.build()));
49845030
}
49855031

5032+
private static void requestInstancesApplicationFailing(
5033+
CloudFoundryClient cloudFoundryClient, String applicationId) {
5034+
when(cloudFoundryClient
5035+
.applicationsV2()
5036+
.instances(
5037+
ApplicationInstancesRequest.builder()
5038+
.applicationId(applicationId)
5039+
.build()))
5040+
.thenReturn(
5041+
Mono.just(
5042+
fill(
5043+
ApplicationInstancesResponse.builder(),
5044+
"application-instances-")
5045+
.instance(
5046+
"instance-0",
5047+
fill(
5048+
ApplicationInstanceInfo.builder(),
5049+
"application-instance-info-")
5050+
.state("FAILED")
5051+
.build())
5052+
.build()));
5053+
}
5054+
49865055
private static void requestGetApplicationTimeout(
49875056
CloudFoundryClient cloudFoundryClient, String applicationId) {
49885057
when(cloudFoundryClient
@@ -5452,11 +5521,13 @@ private static void requestRoutes(
54525521
CloudFoundryClient cloudFoundryClient,
54535522
String domainId,
54545523
String host,
5524+
Integer port,
54555525
String routePath,
54565526
String routeId) {
54575527
ListRoutesRequest.Builder requestBuilder = ListRoutesRequest.builder();
54585528

54595529
Optional.ofNullable(host).ifPresent(requestBuilder::host);
5530+
Optional.ofNullable(port).ifPresent(requestBuilder::port);
54605531
Optional.ofNullable(routePath).ifPresent(requestBuilder::path);
54615532

54625533
when(cloudFoundryClient.routes().list(requestBuilder.domainId(domainId).page(1).build()))
@@ -5472,6 +5543,7 @@ private static void requestRoutes(
54725543
.entity(
54735544
RouteEntity.builder()
54745545
.host(host)
5546+
.port(port)
54755547
.path(
54765548
routePath == null
54775549
? ""

‎cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/DefaultOrganizationsTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ void createSetRolesByUsernameDisabled() {
112112
@Test
113113
void createWithQuota() {
114114
requestOrganizationQuotaDefinitions(this.cloudFoundryClient, "test-quota-definition-name");
115+
116+
requestCreateOrganization(this.cloudFoundryClient, TEST_ORGANIZATION_NAME, null);
115117
requestCreateOrganization(
116118
this.cloudFoundryClient,
117119
TEST_ORGANIZATION_NAME,

‎cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DefaultRoutesTest.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ void createRouteInvalidDomain() {
214214
void createRouteInvalidSpace() {
215215
requestSpacesEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME);
216216
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
217+
requestSharedDomains(cloudFoundryClient, "test-domain");
217218

218219
this.routes
219220
.create(
@@ -236,6 +237,7 @@ void createRouteInvalidSpace() {
236237
void createRouteNoHost() {
237238
requestSpaces(this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME);
238239
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
240+
requestSharedDomains(cloudFoundryClient, "test-domain");
239241
requestCreateRoute(
240242
this.cloudFoundryClient,
241243
"test-private-domain-metadata-id",
@@ -262,6 +264,7 @@ void createRouteNoHost() {
262264
void createRouteNoPath() {
263265
requestSpaces(this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME);
264266
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
267+
requestSharedDomains(cloudFoundryClient, "test-domain");
265268
requestCreateRoute(
266269
this.cloudFoundryClient,
267270
"test-private-domain-metadata-id",
@@ -288,6 +291,7 @@ void createRouteNoPath() {
288291
void createRoutePrivateDomain() {
289292
requestSpaces(this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME);
290293
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
294+
requestSharedDomains(cloudFoundryClient, "test-domain");
291295
requestCreateRoute(
292296
this.cloudFoundryClient,
293297
"test-private-domain-metadata-id",
@@ -365,6 +369,7 @@ private static void mockDeleteOrphanedRoutes(CloudFoundryClient cloudFoundryClie
365369
@Test
366370
void deleteRoute() {
367371
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
372+
requestSharedDomains(cloudFoundryClient, "test-domain");
368373
requestRoutes(
369374
this.cloudFoundryClient,
370375
"test-private-domain-metadata-id",
@@ -531,6 +536,7 @@ void mapRouteAssignedPort() {
531536
void mapRouteExists() {
532537
requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
533538
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
539+
requestSharedDomains(cloudFoundryClient, "test-domain");
534540
requestRoutes(
535541
this.cloudFoundryClient,
536542
"test-private-domain-metadata-id",
@@ -556,6 +562,7 @@ void mapRouteExists() {
556562
void mapRouteInvalidApplicationName() {
557563
requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
558564
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
565+
requestSharedDomains(cloudFoundryClient, "test-domain");
559566
requestRoutesEmpty(
560567
this.cloudFoundryClient,
561568
"test-private-domain-metadata-id",
@@ -616,6 +623,7 @@ void mapRouteInvalidDomain() {
616623
void mapRouteNoHost() {
617624
requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
618625
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
626+
requestSharedDomains(cloudFoundryClient, "test-domain");
619627
requestRoutesEmpty(
620628
this.cloudFoundryClient,
621629
"test-private-domain-metadata-id",
@@ -648,6 +656,7 @@ void mapRouteNoHost() {
648656
void mapRoutePath() {
649657
requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
650658
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
659+
requestSharedDomains(cloudFoundryClient, "test-domain");
651660
requestRoutesTwo(
652661
this.cloudFoundryClient,
653662
"test-private-domain-metadata-id",
@@ -672,6 +681,7 @@ void mapRoutePath() {
672681
void mapRoutePrivateDomain() {
673682
requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
674683
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
684+
requestSharedDomains(cloudFoundryClient, "test-domain");
675685
requestRoutesEmpty(
676686
this.cloudFoundryClient,
677687
"test-private-domain-metadata-id",
@@ -760,6 +770,7 @@ void unmapRouteAssignedPort() {
760770
void unmapRouteInvalidApplicationName() {
761771
requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
762772
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
773+
requestSharedDomains(cloudFoundryClient, "test-domain");
763774

764775
this.routes
765776
.unmap(
@@ -804,6 +815,7 @@ void unmapRouteInvalidDomain() {
804815
void unmapRouteInvalidRoute() {
805816
requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
806817
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
818+
requestSharedDomains(cloudFoundryClient, "test-domain");
807819
requestRoutesEmpty(
808820
this.cloudFoundryClient,
809821
"test-private-domain-metadata-id",
@@ -832,6 +844,7 @@ void unmapRouteInvalidRoute() {
832844
void unmapRoutePrivateDomain() {
833845
requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
834846
requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
847+
requestSharedDomains(cloudFoundryClient, "test-domain");
835848
requestRoutes(
836849
this.cloudFoundryClient,
837850
"test-private-domain-metadata-id",

‎cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DefaultServiceAdminTest.java‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,8 @@ void enableServiceAccessOrganizationNotFound() {
270270

271271
@Test
272272
void enableServiceAccessServiceNotFound() {
273-
requestListServicesWithNameEmpty(this.cloudFoundryClient, "bogus-service-name");
273+
requestListServicesWithNameAndServiceBrokerIdEmpty(
274+
this.cloudFoundryClient, "bogus-service-name");
274275

275276
this.serviceAdmin
276277
.enableServiceAccess(
@@ -488,6 +489,9 @@ void listServiceAccessSettingsSpecifyOrganizationNotFound() {
488489
requestListServiceBrokers(this.cloudFoundryClient);
489490
requestListServicePlanVisibilities(this.cloudFoundryClient);
490491
requestListOrganizationsEmpty(this.cloudFoundryClient, "bogus-organization-name");
492+
requestListServicesWithNameEmptyAndServiceBrokerIdAndLabelSet(
493+
this.cloudFoundryClient, "bogus-service-name");
494+
requestListServicesWithNameEmptyAndServiceBrokerIdSet(this.cloudFoundryClient);
491495

492496
this.serviceAdmin
493497
.listServiceAccessSettings(
@@ -534,7 +538,11 @@ void listServiceAccessSettingsSpecifyService() {
534538
void listServiceAccessSettingsSpecifyServiceNotFound() {
535539
requestListServiceBrokers(this.cloudFoundryClient);
536540
requestListServicePlanVisibilitiesEmpty(this.cloudFoundryClient);
537-
requestListServicesWithNameEmpty(this.cloudFoundryClient, "bogus-service-name");
541+
requestListServicesWithNameEmptyAndServiceBrokerIdAndLabelSet(
542+
this.cloudFoundryClient, "bogus-service-name");
543+
requestListServicesWithNameEmptyAndServiceBrokerIdSet(this.cloudFoundryClient);
544+
requestListServicesWithNameAndServiceBrokerIdEmpty(
545+
this.cloudFoundryClient, "bogus-service-name");
538546

539547
this.serviceAdmin
540548
.listServiceAccessSettings(
@@ -985,14 +993,39 @@ private static void requestListServicesWithName(
985993
.build()));
986994
}
987995

988-
private static void requestListServicesWithNameEmpty(
996+
private static void requestListServicesWithNameAndServiceBrokerIdEmpty(
989997
CloudFoundryClient cloudFoundryClient, String label) {
990998
when(cloudFoundryClient
991999
.services()
9921000
.list(ListServicesRequest.builder().label(label).page(1).build()))
9931001
.thenReturn(Mono.just(fill(ListServicesResponse.builder()).build()));
9941002
}
9951003

1004+
private static void requestListServicesWithNameEmptyAndServiceBrokerIdAndLabelSet(
1005+
CloudFoundryClient cloudFoundryClient, String label) {
1006+
when(cloudFoundryClient
1007+
.services()
1008+
.list(
1009+
ListServicesRequest.builder()
1010+
.label(label)
1011+
.page(1)
1012+
.serviceBrokerId("test-service-broker-id")
1013+
.build()))
1014+
.thenReturn(Mono.just(fill(ListServicesResponse.builder()).build()));
1015+
}
1016+
1017+
private static void requestListServicesWithNameEmptyAndServiceBrokerIdSet(
1018+
CloudFoundryClient cloudFoundryClient) {
1019+
when(cloudFoundryClient
1020+
.services()
1021+
.list(
1022+
ListServicesRequest.builder()
1023+
.page(1)
1024+
.serviceBrokerId("test-service-broker-id")
1025+
.build()))
1026+
.thenReturn(Mono.just(fill(ListServicesResponse.builder()).build()));
1027+
}
1028+
9961029
private static void requestUpdateServiceBroker(
9971030
CloudFoundryClient cloudFoundryClient,
9981031
String name,

0 commit comments

Comments
 (0)