test: update test

Signed-off-by: Otavio Santana <otaviopolianasantana@gmail.com>
eclipse · Mar 2, 2024 · 85d3b7d · 85d3b7d
1 parent 59250fa
commit 85d3b7d
Show file tree

Hide file tree

Showing 9 changed files with 112 additions and 124 deletions.
diff --git a/...sql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnManagerMock.java b/...sql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnManagerMock.java
@@ -15,30 +15,15 @@
 package org.eclipse.jnosql.mapping.column;
 
 import org.eclipse.jnosql.communication.Settings;
-import org.eclipse.jnosql.communication.column.ColumnConfiguration;
-import org.eclipse.jnosql.communication.column.ColumnManager;
-import org.eclipse.jnosql.communication.column.ColumnManagerFactory;
+import org.eclipse.jnosql.communication.semistructured.DatabaseConfiguration;
+import org.eclipse.jnosql.communication.semistructured.DatabaseManagerFactory;
 import org.mockito.Mockito;
 
-public class ColumnManagerMock implements ColumnConfiguration {
-
+public class ColumnManagerMock implements DatabaseConfiguration {
 
 
     @Override
-    public MockFamilyManager apply(Settings settings) {
-        return new MockFamilyManager(settings);
+    public DatabaseManagerFactory apply(Settings settings) {
+        return Mockito.mock(DatabaseManagerFactory.class);
     }
-
-    public record MockFamilyManager(Settings settings) implements ColumnManagerFactory {
-
-        @Override
-            public ColumnManager apply(String database) {
-                return Mockito.mock(ColumnManager.class);
-            }
-
-            @Override
-            public void close() {
-
-            }
-        }
 }
diff --git a/...ql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnTemplateTest.java b/...ql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnTemplateTest.java
@@ -21,6 +21,7 @@
 import org.eclipse.jnosql.mapping.column.spi.ColumnExtension;
 import org.eclipse.jnosql.mapping.reflection.Reflections;
 import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension;
+import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -30,7 +31,7 @@
 import static org.eclipse.jnosql.mapping.DatabaseType.COLUMN;
 
 @EnableAutoWeld
-@AddPackages(value = {Converters.class, ColumnEntityConverter.class})
+@AddPackages(value = {Converters.class, EntityConverter.class})
 @AddPackages(MockProducer.class)
 @AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class, ColumnExtension.class})

diff --git a/...mn/src/test/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplateProducerTest.java b/...mn/src/test/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplateProducerTest.java
@@ -15,12 +15,12 @@
 package org.eclipse.jnosql.mapping.column;
 
 import jakarta.inject.Inject;
-import jakarta.nosql.column.ColumnTemplate;
-import org.eclipse.jnosql.communication.column.ColumnManager;
+import org.eclipse.jnosql.communication.semistructured.DatabaseManager;
 import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.column.spi.ColumnExtension;
 import org.eclipse.jnosql.mapping.reflection.Reflections;
 import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension;
+import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -31,7 +31,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @EnableAutoWeld
-@AddPackages(value = {Converters.class, ColumnEntityConverter.class})
+@AddPackages(value = {Converters.class, EntityConverter.class})
 @AddPackages(MockProducer.class)
 @AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class, ColumnExtension.class})
@@ -47,7 +47,7 @@ void shouldReturnErrorWhenColumnManagerNull() {
 
     @Test
     void shouldReturn() {
-        ColumnManager manager = Mockito.mock(ColumnManager.class);
+        DatabaseManager manager = Mockito.mock(DatabaseManager.class);
         ColumnTemplate columnTemplate = producer.apply(manager);
         assertNotNull(columnTemplate);
     }

diff --git a/...g/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MockProducer.java b/...g/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MockProducer.java
@@ -20,9 +20,9 @@
 import jakarta.enterprise.inject.Alternative;
 import jakarta.enterprise.inject.Produces;
 import jakarta.interceptor.Interceptor;
-import org.eclipse.jnosql.communication.column.Column;
-import org.eclipse.jnosql.communication.column.ColumnEntity;
-import org.eclipse.jnosql.communication.column.ColumnManager;
+import org.eclipse.jnosql.communication.semistructured.CommunicationEntity;
+import org.eclipse.jnosql.communication.semistructured.DatabaseManager;
+import org.eclipse.jnosql.communication.semistructured.Element;
 import org.eclipse.jnosql.mapping.Database;
 import org.eclipse.jnosql.mapping.DatabaseType;
 import org.mockito.Mockito;
@@ -35,29 +35,29 @@
 @ApplicationScoped
 @Alternative
 @Priority(Interceptor.Priority.APPLICATION)
-public class MockProducer implements Supplier<ColumnManager> {
+public class MockProducer implements Supplier<DatabaseManager> {
 
 
     @Produces
     @Override
-    public ColumnManager get() {
-        ColumnEntity entity = ColumnEntity.of("Person");
-        entity.add(Column.of("name", "Default"));
-        entity.add(Column.of("age", 10));
-        ColumnManager manager = mock(ColumnManager.class);
-        when(manager.insert(Mockito.any(ColumnEntity.class))).thenReturn(entity);
+    public DatabaseManager get() {
+        CommunicationEntity entity = CommunicationEntity.of("Person");
+        entity.add(Element.of("name", "Default"));
+        entity.add(Element.of("age", 10));
+        DatabaseManager manager = mock(DatabaseManager.class);
+        when(manager.insert(Mockito.any(CommunicationEntity.class))).thenReturn(entity);
         return manager;
 
     }
 
     @Produces
     @Database(value = DatabaseType.COLUMN, provider = "columnRepositoryMock")
-    public ColumnManager getColumnManagerMock() {
-        ColumnEntity entity = ColumnEntity.of("Person");
-        entity.add(Column.of("name", "columnRepositoryMock"));
-        entity.add(Column.of("age", 10));
-        ColumnManager manager = mock(ColumnManager.class);
-        when(manager.insert(Mockito.any(ColumnEntity.class))).thenReturn(entity);
+    public DatabaseManager getColumnManagerMock() {
+        CommunicationEntity entity = CommunicationEntity.of("Person");
+        entity.add(Element.of("name", "columnRepositoryMock"));
+        entity.add(Element.of("age", 10));
+        DatabaseManager manager = mock(DatabaseManager.class);
+        when(manager.insert(Mockito.any(CommunicationEntity.class))).thenReturn(entity);
         return manager;
 
     }

diff --git a/...rc/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnConfigurationMock.java b/...rc/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnConfigurationMock.java
@@ -15,17 +15,17 @@
 package org.eclipse.jnosql.mapping.column.configuration;
 
 import org.eclipse.jnosql.communication.Settings;
-import org.eclipse.jnosql.communication.column.ColumnConfiguration;
-import org.eclipse.jnosql.communication.column.ColumnDeleteQuery;
-import org.eclipse.jnosql.communication.column.ColumnEntity;
-import org.eclipse.jnosql.communication.column.ColumnManager;
-import org.eclipse.jnosql.communication.column.ColumnManagerFactory;
-import org.eclipse.jnosql.communication.column.ColumnQuery;
+import org.eclipse.jnosql.communication.semistructured.CommunicationEntity;
+import org.eclipse.jnosql.communication.semistructured.DatabaseConfiguration;
+import org.eclipse.jnosql.communication.semistructured.DatabaseManager;
+import org.eclipse.jnosql.communication.semistructured.DatabaseManagerFactory;
+import org.eclipse.jnosql.communication.semistructured.DeleteQuery;
+import org.eclipse.jnosql.communication.semistructured.SelectQuery;
 
 import java.time.Duration;
 import java.util.stream.Stream;
 
-class ColumnConfigurationMock implements ColumnConfiguration {
+class ColumnConfigurationMock implements DatabaseConfiguration {
 
 
     @Override
@@ -34,7 +34,7 @@ public ColumnManagerFactoryMock apply(Settings settings) {
     }
 
 
-    public record ColumnManagerFactoryMock(Settings settings) implements ColumnManagerFactory {
+    public record ColumnManagerFactoryMock(Settings settings) implements DatabaseManagerFactory {
 
         @Override
         public ColumnManagerMock apply(String database) {
@@ -47,50 +47,51 @@ public void close() {
         }
     }
 
-    public record ColumnManagerMock(String name) implements ColumnManager {
+    public record ColumnManagerMock(String name) implements DatabaseManager {
+
 
         @Override
-        public ColumnEntity insert(ColumnEntity entity) {
+        public CommunicationEntity insert(CommunicationEntity entity) {
             return null;
         }
 
         @Override
-        public ColumnEntity update(ColumnEntity entity) {
+        public CommunicationEntity insert(CommunicationEntity entity, Duration ttl) {
             return null;
         }
 
         @Override
-        public Iterable<ColumnEntity> update(Iterable<ColumnEntity> entities) {
+        public Iterable<CommunicationEntity> insert(Iterable<CommunicationEntity> entities) {
             return null;
         }
 
         @Override
-        public ColumnEntity insert(ColumnEntity entity, Duration ttl) {
+        public Iterable<CommunicationEntity> insert(Iterable<CommunicationEntity> entities, Duration ttl) {
             return null;
         }
 
         @Override
-        public Iterable<ColumnEntity> insert(Iterable<ColumnEntity> entities) {
+        public CommunicationEntity update(CommunicationEntity entity) {
             return null;
         }
 
         @Override
-        public Iterable<ColumnEntity> insert(Iterable<ColumnEntity> entities, Duration ttl) {
+        public Iterable<CommunicationEntity> update(Iterable<CommunicationEntity> entities) {
             return null;
         }
 
         @Override
-        public void delete(ColumnDeleteQuery query) {
+        public void delete(DeleteQuery query) {
 
         }
 
         @Override
-        public Stream<ColumnEntity> select(ColumnQuery query) {
+        public Stream<CommunicationEntity> select(SelectQuery query) {
             return null;
         }
 
         @Override
-        public long count(String columnFamily) {
+        public long count(String entity) {
             return 0;
         }
 

diff --git a/...c/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnConfigurationMock2.java b/...c/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnConfigurationMock2.java
@@ -15,17 +15,17 @@
 package org.eclipse.jnosql.mapping.column.configuration;
 
 import org.eclipse.jnosql.communication.Settings;
-import org.eclipse.jnosql.communication.column.ColumnConfiguration;
-import org.eclipse.jnosql.communication.column.ColumnDeleteQuery;
-import org.eclipse.jnosql.communication.column.ColumnEntity;
-import org.eclipse.jnosql.communication.column.ColumnManager;
-import org.eclipse.jnosql.communication.column.ColumnManagerFactory;
-import org.eclipse.jnosql.communication.column.ColumnQuery;
+import org.eclipse.jnosql.communication.semistructured.CommunicationEntity;
+import org.eclipse.jnosql.communication.semistructured.DatabaseConfiguration;
+import org.eclipse.jnosql.communication.semistructured.DatabaseManager;
+import org.eclipse.jnosql.communication.semistructured.DatabaseManagerFactory;
+import org.eclipse.jnosql.communication.semistructured.DeleteQuery;
+import org.eclipse.jnosql.communication.semistructured.SelectQuery;
 
 import java.time.Duration;
 import java.util.stream.Stream;
 
-public class ColumnConfigurationMock2 implements ColumnConfiguration {
+class ColumnConfigurationMock2 implements DatabaseConfiguration {
 
 
     @Override
@@ -34,69 +34,70 @@ public ColumnManagerFactoryMock apply(Settings settings) {
     }
 
 
-    public record ColumnManagerFactoryMock(Settings settings) implements ColumnManagerFactory {
+    public record ColumnManagerFactoryMock(Settings settings) implements DatabaseManagerFactory {
 
         @Override
-            public ColumnManagerMock apply(String database) {
-                return new ColumnManagerMock(database);
-            }
+        public ColumnManagerMock apply(String database) {
+            return new ColumnManagerMock(database);
+        }
 
-            @Override
-            public void close() {
+        @Override
+        public void close() {
 
-            }
         }
+    }
 
-    public record ColumnManagerMock(String name) implements ColumnManager {
+    public record ColumnManagerMock(String name) implements DatabaseManager {
 
-            @Override
-            public ColumnEntity insert(ColumnEntity entity) {
-                return null;
-            }
 
-            @Override
-            public ColumnEntity update(ColumnEntity entity) {
-                return null;
-            }
+        @Override
+        public CommunicationEntity insert(CommunicationEntity entity) {
+            return null;
+        }
+
+        @Override
+        public CommunicationEntity insert(CommunicationEntity entity, Duration ttl) {
+            return null;
+        }
 
-            @Override
-            public Iterable<ColumnEntity> update(Iterable<ColumnEntity> entities) {
-                return null;
-            }
+        @Override
+        public Iterable<CommunicationEntity> insert(Iterable<CommunicationEntity> entities) {
+            return null;
+        }
 
-            @Override
-            public ColumnEntity insert(ColumnEntity entity, Duration ttl) {
-                return null;
-            }
+        @Override
+        public Iterable<CommunicationEntity> insert(Iterable<CommunicationEntity> entities, Duration ttl) {
+            return null;
+        }
 
-            @Override
-            public Iterable<ColumnEntity> insert(Iterable<ColumnEntity> entities) {
-                return null;
-            }
+        @Override
+        public CommunicationEntity update(CommunicationEntity entity) {
+            return null;
+        }
 
-            @Override
-            public Iterable<ColumnEntity> insert(Iterable<ColumnEntity> entities, Duration ttl) {
-                return null;
-            }
+        @Override
+        public Iterable<CommunicationEntity> update(Iterable<CommunicationEntity> entities) {
+            return null;
+        }
 
-            @Override
-            public void delete(ColumnDeleteQuery query) {
+        @Override
+        public void delete(DeleteQuery query) {
 
-            }
+        }
 
-            @Override
-            public Stream<ColumnEntity> select(ColumnQuery query) {
-                return null;
-            }
+        @Override
+        public Stream<CommunicationEntity> select(SelectQuery query) {
+            return null;
+        }
 
-            @Override
-            public long count(String columnFamily) {
-                return 0;
-            }
+        @Override
+        public long count(String entity) {
+            return 0;
+        }
 
-            @Override
-            public void close() {
+        @Override
+        public void close() {
 
-            }
         }
+    }
 }