Iceberg-views: tests against new storage model (#6908)

projectnessie · May 26, 2023 · 0560366 · 0560366
1 parent a8e39c1
commit 0560366
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/integrations/iceberg-views/build.gradle.kts b/integrations/iceberg-views/build.gradle.kts
@@ -45,9 +45,8 @@ dependencies {
   }
   compileOnly(libs.microprofile.openapi)
 
-  testImplementation(nessieProject("nessie-versioned-persist-testextension"))
-  testImplementation(nessieProject("nessie-versioned-persist-in-memory"))
-  testImplementation(nessieProject("nessie-versioned-persist-in-memory-test"))
+  testImplementation(nessieProject("nessie-versioned-storage-testextension"))
+  testImplementation(nessieProject("nessie-versioned-storage-inmemory"))
   testImplementation(nessieProject("nessie-jaxrs-testextension"))
   testImplementation(libs.slf4j.log4j.over.slf4j)
   testCompileOnly(libs.microprofile.openapi)

diff --git a/integrations/iceberg-views/src/test/java/org/apache/iceberg/nessie/BaseIcebergTest.java b/integrations/iceberg-views/src/test/java/org/apache/iceberg/nessie/BaseIcebergTest.java
@@ -16,7 +16,7 @@
 package org.apache.iceberg.nessie;
 
 import static org.apache.iceberg.types.Types.NestedField.required;
-import static org.projectnessie.jaxrs.ext.NessieJaxRsExtension.jaxRsExtensionForDatabaseAdapter;
+import static org.projectnessie.jaxrs.ext.NessieJaxRsExtension.jaxRsExtension;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
@@ -46,23 +46,19 @@
 import org.projectnessie.jaxrs.ext.NessieJaxRsExtension;
 import org.projectnessie.model.Branch;
 import org.projectnessie.model.Tag;
-import org.projectnessie.versioned.persist.adapter.DatabaseAdapter;
-import org.projectnessie.versioned.persist.inmem.InmemoryDatabaseAdapterFactory;
-import org.projectnessie.versioned.persist.inmem.InmemoryTestConnectionProviderSource;
-import org.projectnessie.versioned.persist.tests.extension.DatabaseAdapterExtension;
-import org.projectnessie.versioned.persist.tests.extension.NessieDbAdapter;
-import org.projectnessie.versioned.persist.tests.extension.NessieDbAdapterName;
-import org.projectnessie.versioned.persist.tests.extension.NessieExternalDatabase;
-
-@ExtendWith(DatabaseAdapterExtension.class)
-@NessieDbAdapterName(InmemoryDatabaseAdapterFactory.NAME)
-@NessieExternalDatabase(InmemoryTestConnectionProviderSource.class)
+import org.projectnessie.versioned.storage.common.persist.Persist;
+import org.projectnessie.versioned.storage.inmemory.InmemoryBackendTestFactory;
+import org.projectnessie.versioned.storage.testextension.NessieBackend;
+import org.projectnessie.versioned.storage.testextension.NessiePersist;
+import org.projectnessie.versioned.storage.testextension.PersistExtension;
+
+@ExtendWith(PersistExtension.class)
+@NessieBackend(InmemoryBackendTestFactory.class)
 public class BaseIcebergTest {
 
-  @NessieDbAdapter static DatabaseAdapter databaseAdapter;
+  @NessiePersist static Persist perssit;
 
-  @RegisterExtension
-  static NessieJaxRsExtension server = jaxRsExtensionForDatabaseAdapter(() -> databaseAdapter);
+  @RegisterExtension static NessieJaxRsExtension server = jaxRsExtension(() -> perssit);
 
   @TempDir public Path temp;