From b8e52354460c75c9bd909f2f156517ecf81fb509 Mon Sep 17 00:00:00 2001
From: Haroon Khan <haroonkhan79@gmail.com>
Date: Wed, 15 Dec 2021 17:53:39 +0000
Subject: [PATCH] [JAVA-8679] Fix test for JDK 17

---
 .../java9/modules/ModuleAPIUnitTest.java      | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/core-java-modules/core-java-9-jigsaw/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java b/core-java-modules/core-java-9-jigsaw/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java
index f6ea266676..ed2dcaf695 100644
--- a/core-java-modules/core-java-9-jigsaw/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java
+++ b/core-java-modules/core-java-9-jigsaw/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java
@@ -2,12 +2,21 @@ package com.baeldung.java9.modules;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.Matchers.*;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.collection.IsEmptyCollection.empty;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.module.ModuleDescriptor;
-import java.lang.module.ModuleDescriptor.*;
+
+import java.lang.module.ModuleDescriptor.Builder;
+import java.lang.module.ModuleDescriptor.Exports;
+import java.lang.module.ModuleDescriptor.Opens;
+import java.lang.module.ModuleDescriptor.Provides;
+import java.lang.module.ModuleDescriptor.Requires;
 import java.sql.Date;
 import java.sql.Driver;
 import java.util.HashMap;
@@ -16,7 +25,7 @@ import java.util.stream.Collectors;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.Ignore;
+
 
 public class ModuleAPIUnitTest {
 
@@ -28,14 +37,9 @@ public class ModuleAPIUnitTest {
 
     @Before
     public void setUp() {
-        Class<HashMap> hashMapClass = HashMap.class;
-        javaBaseModule = hashMapClass.getModule();
-
-        Class<Date> dateClass = Date.class;
-        javaSqlModule = dateClass.getModule();
-
-        Class<Person> personClass = Person.class;
-        module = personClass.getModule();
+        javaBaseModule = HashMap.class.getModule();
+        javaSqlModule = Date.class.getModule();
+        module = Person.class.getModule();
     }
 
     @Test
@@ -111,7 +115,6 @@ public class ModuleAPIUnitTest {
     }
 
     @Test
-    @Ignore // fixing in http://team.baeldung.com/browse/JAVA-8679
     public void givenModules_whenAccessingModuleDescriptorProvides_thenProvidesAreReturned() {
         Set<Provides> javaBaseProvides = javaBaseModule.getDescriptor().provides();
         Set<Provides> javaSqlProvides = javaSqlModule.getDescriptor().provides();
@@ -120,7 +123,7 @@ public class ModuleAPIUnitTest {
                 .map(Provides::service)
                 .collect(Collectors.toSet());
 
-        assertThat(javaBaseProvidesService, contains("java.nio.file.spi.FileSystemProvider"));
+        assertThat(javaBaseProvidesService, hasItem("java.nio.file.spi.FileSystemProvider"));
         assertThat(javaSqlProvides, empty());
     }
 
@@ -132,15 +135,14 @@ public class ModuleAPIUnitTest {
           .map(Exports::source)
           .collect(Collectors.toSet());
 
-        assertThat(javaSqlExportsSource, hasItems("java.sql",  "javax.sql"));
+        assertThat(javaSqlExportsSource, hasItems("java.sql", "javax.sql"));
     }
 
     @Test
     public void givenModules_whenAccessingModuleDescriptorUses_thenUsesAreReturned() {
-        Set<String> javaBaseUses = javaBaseModule.getDescriptor().uses();
         Set<String> javaSqlUses = javaSqlModule.getDescriptor().uses();
 
-        assertThat(javaSqlUses, contains("java.sql.Driver"));
+        assertThat(javaSqlUses, hasItem("java.sql.Driver"));
     }
 
     @Test