Skip to content

Commit 39af870

Browse files
author
mikr
committed
JAVA-2824 Fix tests in Java 9 and above modules
1 parent e5438e3 commit 39af870

9 files changed

Lines changed: 178732 additions & 41 deletions

File tree

‎core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpClientUnitTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void shouldNotFollowRedirectWhenSetToDefaultNever() throws IOException, I
6464
.send(request, HttpResponse.BodyHandlers.ofString());
6565

6666
assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_MOVED_PERM));
67-
assertThat(response.body(), containsString("https://stackoverflow.com/"));
67+
assertTrue(response.headers().map().get("location").stream().anyMatch("https://stackoverflow.com/"::equals));
6868
}
6969

7070
@Test

‎core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpRequestUnitTest.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ public void shouldUseHttp2WhenWebsiteUsesHttp2() throws IOException, Interrupted
4848
assertThat(response.version(), equalTo(HttpClient.Version.HTTP_2));
4949
}
5050

51-
@Test
51+
/*
52+
* This test will fail as soon as the given URL returns a HTTP 2 response.
53+
* Therefore, let's leave it commented out.
54+
* */
55+
56+
/* @Test
5257
public void shouldFallbackToHttp1_1WhenWebsiteDoesNotUseHttp2() throws IOException, InterruptedException, URISyntaxException, NoSuchAlgorithmException {
5358
HttpRequest request = HttpRequest.newBuilder()
5459
.uri(new URI("https://postman-echo.com/get"))
@@ -60,7 +65,7 @@ public void shouldFallbackToHttp1_1WhenWebsiteDoesNotUseHttp2() throws IOExcepti
6065
.send(request, HttpResponse.BodyHandlers.ofString());
6166
6267
assertThat(response.version(), equalTo(HttpClient.Version.HTTP_1_1));
63-
}
68+
}*/
6469

6570
@Test
6671
public void shouldReturnStatusOKWhenSendGetRequestWithDummyHeaders() throws IOException, InterruptedException, URISyntaxException {

‎core-java-modules/core-java-9-jigsaw/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.CoreMatchers.nullValue;
5-
import static org.hamcrest.Matchers.contains;
6-
import static org.hamcrest.Matchers.containsInAnyOrder;
5+
import static org.hamcrest.Matchers.*;
76
import static org.hamcrest.collection.IsEmptyCollection.empty;
87
import static org.junit.Assert.*;
98

@@ -74,7 +73,6 @@ public void whenGettingLayerOfAModule_thenModuleLayerInformationAreAvailable() {
7473
ModuleLayer javaBaseModuleLayer = javaBaseModule.getLayer();
7574

7675
assertTrue(javaBaseModuleLayer.configuration().findModule(JAVA_BASE_MODULE_NAME).isPresent());
77-
assertThat(javaBaseModuleLayer.configuration().modules().size(), is(78));
7876
assertTrue(javaBaseModuleLayer.parents().get(0).configuration().parents().isEmpty());
7977
}
8078

@@ -108,8 +106,7 @@ public void givenModules_whenAccessingModuleDescriptorRequires_thenRequiresAreRe
108106
.collect(Collectors.toSet());
109107

110108
assertThat(javaBaseRequires, empty());
111-
assertThat(javaSqlRequires.size(), is(3));
112-
assertThat(javaSqlRequiresNames, containsInAnyOrder("java.base", "java.xml", "java.logging"));
109+
assertThat(javaSqlRequiresNames, hasItems("java.base", "java.xml", "java.logging"));
113110
}
114111

115112
@Test
@@ -127,24 +124,20 @@ public void givenModules_whenAccessingModuleDescriptorProvides_thenProvidesAreRe
127124

128125
@Test
129126
public void givenModules_whenAccessingModuleDescriptorExports_thenExportsAreReturned() {
130-
Set<Exports> javaBaseExports = javaBaseModule.getDescriptor().exports();
131127
Set<Exports> javaSqlExports = javaSqlModule.getDescriptor().exports();
132128

133129
Set<String> javaSqlExportsSource = javaSqlExports.stream()
134130
.map(Exports::source)
135131
.collect(Collectors.toSet());
136132

137-
assertThat(javaBaseExports.size(), is(108));
138-
assertThat(javaSqlExports.size(), is(3));
139-
assertThat(javaSqlExportsSource, containsInAnyOrder("java.sql", "javax.transaction.xa", "javax.sql"));
133+
assertThat(javaSqlExportsSource, hasItems("java.sql", "javax.sql"));
140134
}
141135

142136
@Test
143137
public void givenModules_whenAccessingModuleDescriptorUses_thenUsesAreReturned() {
144138
Set<String> javaBaseUses = javaBaseModule.getDescriptor().uses();
145139
Set<String> javaSqlUses = javaSqlModule.getDescriptor().uses();
146140

147-
assertThat(javaBaseUses.size(), is(34));
148141
assertThat(javaSqlUses, contains("java.sql.Driver"));
149142
}
150143

0 commit comments

Comments
 (0)