removes entity on column argument

Author: otaviojava

cassandra-driver/src/test/java/jakarta/nosql/tck/communication/driver/column/ColumnArgument.java

@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2020 Otávio Santana and others
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Otavio Santana
+ */
 package jakarta.nosql.tck.communication.driver.column;
 
 import java.util.Collections;
@@ -7,32 +21,25 @@ public final class ColumnArgument {
 
     static final ColumnArgument EMPTY = new ColumnArgument();
 
-    private final String entity;
-
     private final List<String> query;
 
     private final String idName;
 
     private final boolean empty;
 
-    ColumnArgument(String entity, List<String> query, String idName) {
-        this.entity = entity;
+    ColumnArgument(List<String> query, String idName) {
         this.query = query;
         this.idName = idName;
         this.empty = true;
     }
+
     ColumnArgument() {
-        this.entity = null;
         this.query = null;
         this.idName = null;
         this.empty = false;
     }
 
 
-    public String getEntity() {
-        return entity;
-    }
-
     public List<String> getQuery() {
         if (query == null) {
             return Collections.emptyList();
@@ -51,9 +58,9 @@ public boolean isEmpty() {
     @Override
     public String toString() {
         return "ColumnArgument{" +
-                "entity='" + entity + '\'' +
-                ", query=" + query +
+                "query=" + query +
                 ", idName='" + idName + '\'' +
+                ", empty=" + empty +
                 '}';
     }
 }

cassandra-driver/src/test/java/jakarta/nosql/tck/communication/driver/column/ColumnArgumentProvider.java

@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2020 Otávio Santana and others
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Otavio Santana
+ */
 package jakarta.nosql.tck.communication.driver.column;
 
 import org.eclipse.jnosql.diana.driver.ConfigurationReader;
@@ -31,13 +45,12 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext extensionCo
         if (map.isEmpty()) {
             return Stream.of(Arguments.of(ColumnArgument.EMPTY));
         }
-        final String entity = map.get("entity");
         final String idName = map.get("id.name");
         final List<String> query = map.entrySet().stream()
                 .filter(s -> s.getKey().startsWith("query"))
                 .map(Map.Entry::getValue)
                 .collect(Collectors.toList());
-        return Stream.of(Arguments.of(new ColumnArgument(entity, query, idName)));
+        return Stream.of(Arguments.of(new ColumnArgument(query, idName)));
     }
 
 

cassandra-driver/src/test/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerTest.java

@@ -1,25 +1,49 @@
+/*
+ *  Copyright (c) 2020 Otávio Santana and others
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Otavio Santana
+ */
 package jakarta.nosql.tck.communication.driver.column;
 
+import jakarta.nosql.ServiceLoaderProvider;
+import jakarta.nosql.column.ColumnEntity;
+import jakarta.nosql.column.ColumnFamilyManager;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ColumnFamilyManagerTest {
 
     @ParameterizedTest
     @ColumnSource("column_insert.properties")
-    public void parameterizedTest(ColumnArgument argument) {
-        Assumptions.assumeFalse(argument.isEmpty());
-        assertNotNull(argument);
+    public void shouldInsert(ColumnArgument argument) {
+        Assumptions.assumeFalse(argument.isEmpty(), "The you put the  file in the resources to activate this test");
+        ColumnFamilyManager manager = getManager();
+        Optional<ColumnEntity> entity = argument.getQuery().stream().flatMap(manager::query)
+                .findFirst();
+
+
     }
 
-    @ParameterizedTest
-    @ColumnSource("empty")
-    public void parameterizedTest3(ColumnArgument argument) {
-        Assumptions.assumeFalse(argument.isEmpty(), "The you put the  file in the resources to activate this test");
-        assertNotNull(argument);
+    private ColumnFamilyManager getManager() {
+        final ColumnFamilyManagerSupplier supplier = ServiceLoaderProvider.get(ColumnFamilyManagerSupplier.class);
+        return supplier.get();
     }
+
 }

cassandra-driver/src/test/resources/column_insert.properties

@@ -1,3 +1,2 @@
-query.1=
-entity=people
-id.name=id
+query.1=insert person {"id": 1, "name": "Diana"}
+id.name=id