iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JAVA-2824 Fix tests in Java 9 and above modules

Browse Source
This commit is contained in:
mikr 2020-10-22 22:04:22 +02:00
parent 96c386649d
commit 0e54f859cc
7 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpClientUnitTest.java
View File

@ -64,7 +64,7 @@ public class HttpClientUnitTest {
.send(request, HttpResponse.BodyHandlers.ofString()); .send(request, HttpResponse.BodyHandlers.ofString());
assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_MOVED_PERM)); assertThat(response.statusCode(), equalTo(HttpURLConnection.HTTP_MOVED_PERM));
assertThat(response.body(), containsString("https://stackoverflow.com/")); assertTrue(response.headers().map().get("location").stream().anyMatch("https://stackoverflow.com/"::equals));
} }
@Test @Test

9
core-java-modules/core-java-11/src/test/java/com/baeldung/java11/httpclient/test/HttpRequestUnitTest.java
View File

@ -48,7 +48,12 @@ public class HttpRequestUnitTest {
assertThat(response.version(), equalTo(HttpClient.Version.HTTP_2)); assertThat(response.version(), equalTo(HttpClient.Version.HTTP_2));
} }
@Test /*
* This test will fail as soon as the given URL returns a HTTP 2 response.
* Therefore, let's leave it commented out.
* */
/* @Test
public void shouldFallbackToHttp1_1WhenWebsiteDoesNotUseHttp2() throws IOException, InterruptedException, URISyntaxException, NoSuchAlgorithmException { public void shouldFallbackToHttp1_1WhenWebsiteDoesNotUseHttp2() throws IOException, InterruptedException, URISyntaxException, NoSuchAlgorithmException {
HttpRequest request = HttpRequest.newBuilder() HttpRequest request = HttpRequest.newBuilder()
.uri(new URI("https://postman-echo.com/get")) .uri(new URI("https://postman-echo.com/get"))
@ -60,7 +65,7 @@ public class HttpRequestUnitTest {
.send(request, HttpResponse.BodyHandlers.ofString()); .send(request, HttpResponse.BodyHandlers.ofString());
assertThat(response.version(), equalTo(HttpClient.Version.HTTP_1_1)); assertThat(response.version(), equalTo(HttpClient.Version.HTTP_1_1));
} }*/
@Test @Test
public void shouldReturnStatusOKWhenSendGetRequestWithDummyHeaders() throws IOException, InterruptedException, URISyntaxException { public void shouldReturnStatusOKWhenSendGetRequestWithDummyHeaders() throws IOException, InterruptedException, URISyntaxException {

13
core-java-modules/core-java-9-jigsaw/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java
View File

@ -2,8 +2,7 @@ package com.baeldung.java9.modules;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.*;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.hamcrest.collection.IsEmptyCollection.empty;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -74,7 +73,6 @@ public class ModuleAPIUnitTest {
ModuleLayer javaBaseModuleLayer = javaBaseModule.getLayer(); ModuleLayer javaBaseModuleLayer = javaBaseModule.getLayer();
assertTrue(javaBaseModuleLayer.configuration().findModule(JAVA_BASE_MODULE_NAME).isPresent()); assertTrue(javaBaseModuleLayer.configuration().findModule(JAVA_BASE_MODULE_NAME).isPresent());
assertThat(javaBaseModuleLayer.configuration().modules().size(), is(78));
assertTrue(javaBaseModuleLayer.parents().get(0).configuration().parents().isEmpty()); assertTrue(javaBaseModuleLayer.parents().get(0).configuration().parents().isEmpty());
} }
@ -108,8 +106,7 @@ public class ModuleAPIUnitTest {
.collect(Collectors.toSet()); .collect(Collectors.toSet());
assertThat(javaBaseRequires, empty()); assertThat(javaBaseRequires, empty());
assertThat(javaSqlRequires.size(), is(3)); assertThat(javaSqlRequiresNames, hasItems("java.base", "java.xml", "java.logging"));
assertThat(javaSqlRequiresNames, containsInAnyOrder("java.base", "java.xml", "java.logging"));
} }
@Test @Test
@ -127,16 +124,13 @@ public class ModuleAPIUnitTest {
@Test @Test
public void givenModules_whenAccessingModuleDescriptorExports_thenExportsAreReturned() { public void givenModules_whenAccessingModuleDescriptorExports_thenExportsAreReturned() {
Set<Exports> javaBaseExports = javaBaseModule.getDescriptor().exports();
Set<Exports> javaSqlExports = javaSqlModule.getDescriptor().exports(); Set<Exports> javaSqlExports = javaSqlModule.getDescriptor().exports();
Set<String> javaSqlExportsSource = javaSqlExports.stream() Set<String> javaSqlExportsSource = javaSqlExports.stream()
.map(Exports::source) .map(Exports::source)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
assertThat(javaBaseExports.size(), is(108)); assertThat(javaSqlExportsSource, hasItems("java.sql", "javax.sql"));
assertThat(javaSqlExports.size(), is(3));
assertThat(javaSqlExportsSource, containsInAnyOrder("java.sql", "javax.transaction.xa", "javax.sql"));
} }
@Test @Test
@ -144,7 +138,6 @@ public class ModuleAPIUnitTest {
Set<String> javaBaseUses = javaBaseModule.getDescriptor().uses(); Set<String> javaBaseUses = javaBaseModule.getDescriptor().uses();
Set<String> javaSqlUses = javaSqlModule.getDescriptor().uses(); Set<String> javaSqlUses = javaSqlModule.getDescriptor().uses();
assertThat(javaBaseUses.size(), is(34));
assertThat(javaSqlUses, contains("java.sql.Driver")); assertThat(javaSqlUses, contains("java.sql.Driver"));
} }

2
core-java-modules/core-java-time-measurements/pom.xml
View File

@ -96,7 +96,7 @@
<!-- testing --> <!-- testing -->
<assertj.version>3.6.1</assertj.version> <assertj.version>3.6.1</assertj.version>
<asspectj.version>1.8.9</asspectj.version> <asspectj.version>1.8.9</asspectj.version>
<powermock.version>2.0.0</powermock.version> <powermock.version>2.0.7</powermock.version>
<jmockit.version>1.44</jmockit.version> <jmockit.version>1.44</jmockit.version>
<!-- plugins --> <!-- plugins -->
<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version> <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>

14
core-java-modules/core-java-time-measurements/src/test/java/com/baeldung/time/ElapsedTimeUnitTest.java
View File

@ -50,14 +50,18 @@ public class ElapsedTimeUnitTest {
assertEquals(true, (2000L <= timeElapsed) && (timeElapsed <= 3000L)); assertEquals(true, (2000L <= timeElapsed) && (timeElapsed <= 3000L));
} }
@Test /*
The below test depends on the elapsed time, which isn't ideal in a test.
Also, it slows down test execution artificially.
*/
/*@Test
public void givenRunningTask_whenMeasuringTimeWithInstantClass_thenGetElapsedTime() throws InterruptedException { public void givenRunningTask_whenMeasuringTimeWithInstantClass_thenGetElapsedTime() throws InterruptedException {
Instant start = Instant.now(); Instant start = Instant.now();
System.out.println("start: " + start); System.out.println("start: " + start);
simulateRunningTask(); simulateRunningTask();
Instant finish = Instant.now(); Instant finish = Instant.now();
System.out.println("start: " + start); System.out.println("start: " + start);
@ -66,7 +70,7 @@ public class ElapsedTimeUnitTest {
System.out.println("elapsed: " + timeElapsed); System.out.println("elapsed: " + timeElapsed);
assertEquals(true, (2000L <= timeElapsed) && (timeElapsed <= 3000L)); assertEquals(true, (2000L <= timeElapsed) && (timeElapsed <= 3000L));
} }*/
/** /**
* Simulate task running for 2.5 seconds. * Simulate task running for 2.5 seconds.

2
core-java-modules/core-java-time-measurements/src/test/java/com/baeldung/time/InstantUnitTest.java
View File

@ -10,8 +10,8 @@ import java.time.Instant;
import java.time.ZoneId; import java.time.ZoneId;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;
import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.mockStatic;
import static org.powermock.api.mockito.PowerMockito.when;
@RunWith(PowerMockRunner.class) @RunWith(PowerMockRunner.class)
@PrepareForTest({ Instant.class }) @PrepareForTest({ Instant.class })

38
pom.xml
View File

@ -1368,23 +1368,22 @@
<modules> <modules>
<module>core-java-modules/core-java-9</module> <module>core-java-modules/core-java-9</module>
<module>core-java-modules/core-java-9-improvements</module> <module>core-java-modules/core-java-9-improvements</module>
<!-- <module>core-java-modules/core-java-9-jigsaw</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-9-jigsaw</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<!-- <module>core-java-modules/core-java-9-new-features</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <!-- <module>core-java-modules/core-java-9-new-features</module> --> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<module>core-java-modules/core-java-9-streams</module> <module>core-java-modules/core-java-9-streams</module>
<module>core-java-modules/core-java-10</module> <module>core-java-modules/core-java-10</module>
<!-- <module>core-java-modules/core-java-11</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-11</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<!-- <module>core-java-modules/core-java-12</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <!-- <module>core-java-modules/core-java-12</module> --> <!-- uses preview features, to be decided how to handle -->
<!-- <module>core-java-modules/core-java-13</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <!-- <module>core-java-modules/core-java-13</module> --> <!-- uses preview features, to be decided how to handle -->
<!-- <module>core-java-modules/core-java-14</module> --> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <!-- <module>core-java-modules/core-java-14</module> --> <!-- uses preview features, to be decided how to handle -->
<module>core-java-modules/core-java-collections-set</module> <module>core-java-modules/core-java-collections-set</module>
<module>core-java-modules/core-java-date-operations-1</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-date-operations-1</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<module>core-java-modules/core-java-datetime-conversion</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-datetime-conversion</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<module>core-java-modules/core-java-datetime-string</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-datetime-string</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<module>core-java-modules/core-java-jpms</module> <module>core-java-modules/core-java-jpms</module>
<module>core-java-modules/core-java-os</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-os</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<!-- <module>core-java-modules/core-java-time-measurements</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-time-measurements</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<module>core-java-modules/multimodulemavenproject</module> <module>core-java-modules/multimodulemavenproject</module>
<!-- <module>maven-java-11</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
</modules> </modules>
</profile> </profile>
@ -1413,23 +1412,22 @@
<modules> <modules>
<module>core-java-modules/core-java-9</module> <module>core-java-modules/core-java-9</module>
<module>core-java-modules/core-java-9-improvements</module> <module>core-java-modules/core-java-9-improvements</module>
<!-- <module>core-java-modules/core-java-9-jigsaw</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-9-jigsaw</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<!-- <module>core-java-modules/core-java-9-new-features</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <!-- <module>core-java-modules/core-java-9-new-features</module> --> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<module>core-java-modules/core-java-9-streams</module> <module>core-java-modules/core-java-9-streams</module>
<module>core-java-modules/core-java-10</module> <module>core-java-modules/core-java-10</module>
<!-- <module>core-java-modules/core-java-11</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-11</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<!-- <module>core-java-modules/core-java-12</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <!-- <module>core-java-modules/core-java-12</module> --> <!-- uses preview features, to be decided how to handle -->
<!-- <module>core-java-modules/core-java-13</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <!-- <module>core-java-modules/core-java-13</module> --> <!-- uses preview features, to be decided how to handle -->
<!-- <module>core-java-modules/core-java-14</module> --> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <!-- <module>core-java-modules/core-java-14</module> --> <!-- uses preview features, to be decided how to handle -->
<module>core-java-modules/core-java-collections-set</module> <module>core-java-modules/core-java-collections-set</module>
<!-- <module>core-java-modules/core-java-date-operations-1</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-date-operations-1</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<!-- <module>core-java-modules/core-java-datetime-conversion</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-datetime-conversion</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<!-- <module>core-java-modules/core-java-datetime-string</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-datetime-string</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<module>core-java-modules/core-java-jpms</module> <module>core-java-modules/core-java-jpms</module>
<!-- <module>core-java-modules/core-java-os</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-os</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<!-- <module>core-java-modules/core-java-time-measurements</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 --> <module>core-java-modules/core-java-time-measurements</module> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
<module>core-java-modules/multimodulemavenproject</module> <module>core-java-modules/multimodulemavenproject</module>
<!-- <module>maven-java-11</module>--> <!-- to be fixed in http://team.baeldung.com/browse/JAVA-2824 -->
</modules> </modules>
</profile> </profile>
</profiles> </profiles>