Update API on communication tck

Signed-off-by: Otavio Santana <otaviopolianasantana@gmail.com>
jakartaee · Jun 21, 2022 · 4e2e1c7 · 4e2e1c7
1 parent 8151144
commit 4e2e1c7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/...on-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnQueryParserTest.java b/...on-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnQueryParserTest.java
@@ -28,13 +28,15 @@
 import jakarta.nosql.column.ColumnPreparedStatement;
 import jakarta.nosql.column.ColumnQuery;
 import jakarta.nosql.column.ColumnQueryParser;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
 import java.util.Optional;
+import java.util.ServiceLoader;
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -45,10 +47,17 @@
 
 public class ColumnQueryParserTest {
 
-    private ColumnQueryParser parser = ServiceLoaderProvider.get(ColumnQueryParser.class);
+    private ColumnQueryParser parser = ServiceLoaderProvider.get(ColumnQueryParser.class,
+            ()-> ServiceLoader.load(ColumnQueryParser.class));
 
     private ColumnFamilyManager manager = mock(ColumnFamilyManager.class);
 
+    @BeforeEach
+    public void setUp() {
+        Module module = ColumnQueryParserTest.class.getModule();
+        module.addUses(ColumnQueryParser.class);
+    }
+
     @Test
     public void shouldReturnNPEWhenThereIsNullParameter() {
         assertThrows(NullPointerException.class, () -> parser.query(null, manager, ColumnObserverParser.EMPTY));

diff --git a/...ument/src/main/java/jakarta/nosql/communication/tck/document/DocumentQueryParserTest.java b/...ument/src/main/java/jakarta/nosql/communication/tck/document/DocumentQueryParserTest.java
@@ -28,13 +28,15 @@
 import jakarta.nosql.document.DocumentPreparedStatement;
 import jakarta.nosql.document.DocumentQuery;
 import jakarta.nosql.document.DocumentQueryParser;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
 import java.util.Optional;
+import java.util.ServiceLoader;
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -46,10 +48,16 @@
 
 public class DocumentQueryParserTest {
 
-    private DocumentQueryParser parser = ServiceLoaderProvider.get(DocumentQueryParser.class);
+    private DocumentQueryParser parser = ServiceLoaderProvider.get(DocumentQueryParser.class,
+            ()-> ServiceLoader.load(DocumentQueryParser.class));
 
     private DocumentCollectionManager manager = Mockito.mock(DocumentCollectionManager.class);
 
+    @BeforeEach
+    public void setUp() {
+        Module module = DocumentQueryParserTest.class.getModule();
+        module.addUses(DocumentQueryParser.class);
+    }
     @Test
     public void shouldReturnNPEWhenThereIsNullParameter() {
 

diff --git a/...value/src/main/java/jakarta/nosql/communication/tck/keyvalue/KeyValueQueryParserTest.java b/...value/src/main/java/jakarta/nosql/communication/tck/keyvalue/KeyValueQueryParserTest.java
@@ -25,6 +25,7 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentCaptor;
@@ -33,17 +34,24 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
+import java.util.ServiceLoader;
 import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class KeyValueQueryParserTest {
 
-    private KeyValueQueryParser parser = ServiceLoaderProvider.get(KeyValueQueryParser.class);;
+    private KeyValueQueryParser parser = ServiceLoaderProvider.get(KeyValueQueryParser.class,
+            () -> ServiceLoader.load(KeyValueQueryParser.class));
 
     private BucketManager manager = Mockito.mock(BucketManager.class);
 
+    @BeforeEach
+    public void setUp() {
+        Module module = KeyValueQueryParserTest.class.getModule();
+        module.addUses(KeyValueQueryParser.class);
+    }
     @ParameterizedTest(name = "Should parser the query {0}")
     @ValueSource(strings = {"get \"Diana\""})
     public void shouldReturnParserQuery1(String query) {