SpreadsheetStorageTestCase was SpreadsheetStorageSharedTestCase

src/test/java/walkingkooka/spreadsheet/storage/SpreadsheetStorageRouterTest.java

@@ -18,14 +18,12 @@
 package walkingkooka.spreadsheet.storage;
 
 import org.junit.jupiter.api.Test;
-import walkingkooka.ToStringTesting;
 import walkingkooka.collect.map.Maps;
 import walkingkooka.convert.Converters;
 import walkingkooka.environment.AuditInfo;
 import walkingkooka.environment.MissingEnvironmentValueException;
 import walkingkooka.math.DecimalNumberContext;
 import walkingkooka.net.email.EmailAddress;
-import walkingkooka.reflect.JavaVisibility;
 import walkingkooka.spreadsheet.SpreadsheetContext;
 import walkingkooka.spreadsheet.SpreadsheetContextSupplier;
 import walkingkooka.spreadsheet.SpreadsheetContexts;
@@ -60,7 +58,6 @@
 import walkingkooka.spreadsheet.value.SpreadsheetCell;
 import walkingkooka.storage.Storage;
 import walkingkooka.storage.StoragePath;
-import walkingkooka.storage.StorageTesting;
 import walkingkooka.storage.StorageValue;
 import walkingkooka.storage.StorageValueInfo;
 import walkingkooka.storage.Storages;
@@ -75,10 +72,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SpreadsheetStorageRouterTest implements StorageTesting<SpreadsheetStorageRouter, SpreadsheetStorageContext>,
-    SpreadsheetStorageContextTesting,
-    ToStringTesting<SpreadsheetStorageRouter>,
-    SpreadsheetMetadataTesting {
+public final class SpreadsheetStorageRouterTest extends SpreadsheetStorageTestCase<SpreadsheetStorageRouter>
+    implements SpreadsheetStorageContextTesting {
 
     private final static SpreadsheetId SPREADSHEET_ID1 = SpreadsheetId.with(0x111);
 
@@ -1622,9 +1617,4 @@ public void testToString() {
     public Class<SpreadsheetStorageRouter> type() {
         return SpreadsheetStorageRouter.class;
     }
-
-    @Override
-    public JavaVisibility typeVisibility() {
-        return JavaVisibility.PACKAGE_PRIVATE;
-    }
 }

src/test/java/walkingkooka/spreadsheet/storage/SpreadsheetStorageSpreadsheetCellTest.java

@@ -30,7 +30,6 @@
 import walkingkooka.net.email.EmailAddress;
 import walkingkooka.plugin.ProviderContext;
 import walkingkooka.plugin.ProviderContexts;
-import walkingkooka.reflect.JavaVisibility;
 import walkingkooka.spreadsheet.SpreadsheetContext;
 import walkingkooka.spreadsheet.SpreadsheetContexts;
 import walkingkooka.spreadsheet.compare.provider.SpreadsheetComparatorAliasSet;
@@ -52,7 +51,6 @@
 import walkingkooka.spreadsheet.meta.SpreadsheetId;
 import walkingkooka.spreadsheet.meta.SpreadsheetMetadata;
 import walkingkooka.spreadsheet.meta.SpreadsheetMetadataPropertyName;
-import walkingkooka.spreadsheet.meta.SpreadsheetMetadataTesting;
 import walkingkooka.spreadsheet.meta.store.SpreadsheetMetadataStore;
 import walkingkooka.spreadsheet.meta.store.SpreadsheetMetadataStores;
 import walkingkooka.spreadsheet.net.SpreadsheetMediaTypes;
@@ -64,7 +62,6 @@
 import walkingkooka.spreadsheet.store.repo.SpreadsheetStoreRepositories;
 import walkingkooka.spreadsheet.value.SpreadsheetCell;
 import walkingkooka.storage.StoragePath;
-import walkingkooka.storage.StorageTesting;
 import walkingkooka.storage.StorageValue;
 import walkingkooka.storage.StorageValueInfo;
 import walkingkooka.storage.Storages;
@@ -82,8 +79,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SpreadsheetStorageSpreadsheetCellTest implements StorageTesting<SpreadsheetStorageSpreadsheetCell, SpreadsheetStorageContext>,
-    SpreadsheetMetadataTesting {
+public final class SpreadsheetStorageSpreadsheetCellTest extends SpreadsheetStorageTestCase<SpreadsheetStorageSpreadsheetCell> {
 
     @Test
     public void testLoadMissingCellReference() {
@@ -595,9 +591,4 @@ private SpreadsheetContext createSpreadsheetContext() {
     public Class<SpreadsheetStorageSpreadsheetCell> type() {
         return SpreadsheetStorageSpreadsheetCell.class;
     }
-
-    @Override
-    public JavaVisibility typeVisibility() {
-        return JavaVisibility.PACKAGE_PRIVATE;
-    }
 }

src/test/java/walkingkooka/spreadsheet/storage/SpreadsheetStorageSpreadsheetLabelTest.java

@@ -28,7 +28,6 @@
 import walkingkooka.net.email.EmailAddress;
 import walkingkooka.plugin.ProviderContext;
 import walkingkooka.plugin.ProviderContexts;
-import walkingkooka.reflect.JavaVisibility;
 import walkingkooka.spreadsheet.SpreadsheetContext;
 import walkingkooka.spreadsheet.SpreadsheetContexts;
 import walkingkooka.spreadsheet.compare.provider.SpreadsheetComparatorProviders;
@@ -43,7 +42,6 @@
 import walkingkooka.spreadsheet.meta.SpreadsheetId;
 import walkingkooka.spreadsheet.meta.SpreadsheetMetadata;
 import walkingkooka.spreadsheet.meta.SpreadsheetMetadataPropertyName;
-import walkingkooka.spreadsheet.meta.SpreadsheetMetadataTesting;
 import walkingkooka.spreadsheet.meta.store.SpreadsheetMetadataStore;
 import walkingkooka.spreadsheet.meta.store.SpreadsheetMetadataStores;
 import walkingkooka.spreadsheet.net.SpreadsheetMediaTypes;
@@ -55,7 +53,6 @@
 import walkingkooka.spreadsheet.store.repo.SpreadsheetStoreRepositories;
 import walkingkooka.storage.Storage;
 import walkingkooka.storage.StoragePath;
-import walkingkooka.storage.StorageTesting;
 import walkingkooka.storage.StorageValue;
 import walkingkooka.storage.StorageValueInfo;
 import walkingkooka.storage.Storages;
@@ -70,8 +67,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SpreadsheetStorageSpreadsheetLabelTest implements StorageTesting<SpreadsheetStorageSpreadsheetLabel, SpreadsheetStorageContext>,
-    SpreadsheetMetadataTesting {
+public final class SpreadsheetStorageSpreadsheetLabelTest extends SpreadsheetStorageTestCase<SpreadsheetStorageSpreadsheetLabel> {
 
     private final static SpreadsheetLabelName LABEL1 = SpreadsheetSelection.labelName("Label111");
 
@@ -467,9 +463,4 @@ private SpreadsheetContext createSpreadsheetContext() {
     public Class<SpreadsheetStorageSpreadsheetLabel> type() {
         return SpreadsheetStorageSpreadsheetLabel.class;
     }
-
-    @Override
-    public JavaVisibility typeVisibility() {
-        return JavaVisibility.PACKAGE_PRIVATE;
-    }
 }

src/test/java/walkingkooka/spreadsheet/storage/SpreadsheetStorageSpreadsheetMetadataTest.java

@@ -20,7 +20,6 @@
 import org.junit.jupiter.api.Test;
 import walkingkooka.Either;
 import walkingkooka.net.email.EmailAddress;
-import walkingkooka.reflect.JavaVisibility;
 import walkingkooka.spreadsheet.SpreadsheetContext;
 import walkingkooka.spreadsheet.SpreadsheetContexts;
 import walkingkooka.spreadsheet.engine.SpreadsheetEngines;
@@ -34,7 +33,6 @@
 import walkingkooka.spreadsheet.net.SpreadsheetMediaTypes;
 import walkingkooka.spreadsheet.store.repo.SpreadsheetStoreRepositories;
 import walkingkooka.storage.StoragePath;
-import walkingkooka.storage.StorageTesting;
 import walkingkooka.storage.StorageValue;
 import walkingkooka.storage.StorageValueInfo;
 
@@ -44,8 +42,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SpreadsheetStorageSpreadsheetMetadataTest implements StorageTesting<SpreadsheetStorageSpreadsheetMetadata, SpreadsheetStorageContext>,
-    SpreadsheetMetadataTesting {
+public final class SpreadsheetStorageSpreadsheetMetadataTest extends SpreadsheetStorageTestCase<SpreadsheetStorageSpreadsheetMetadata> {
 
     @Test
     public void testLoadMissingSpreadsheetMetadata() {
@@ -438,9 +435,4 @@ public Optional<EmailAddress> user() {
     public Class<SpreadsheetStorageSpreadsheetMetadata> type() {
         return SpreadsheetStorageSpreadsheetMetadata.class;
     }
-
-    @Override
-    public JavaVisibility typeVisibility() {
-        return JavaVisibility.PACKAGE_PRIVATE;
-    }
 }

src/test/java/walkingkooka/spreadsheet/storage/SpreadsheetStorageSharedTestCase.java → src/test/java/walkingkooka/spreadsheet/storage/SpreadsheetStorageTestCase.java

@@ -17,14 +17,18 @@
 
 package walkingkooka.spreadsheet.storage;
 
+import walkingkooka.ToStringTesting;
 import walkingkooka.reflect.JavaVisibility;
 import walkingkooka.reflect.TypeNameTesting;
+import walkingkooka.spreadsheet.meta.SpreadsheetMetadataTesting;
 import walkingkooka.storage.StorageTesting;
 
-public abstract class SpreadsheetStorageSharedTestCase<T extends SpreadsheetStorageShared> implements StorageTesting<T, SpreadsheetStorageContext>,
-    TypeNameTesting<T> {
+public abstract class SpreadsheetStorageTestCase<T extends SpreadsheetStorage> implements StorageTesting<T, SpreadsheetStorageContext>,
+    TypeNameTesting<T>,
+    ToStringTesting<T>,
+    SpreadsheetMetadataTesting {
 
-    SpreadsheetStorageSharedTestCase() {
+    SpreadsheetStorageTestCase() {
         super();
     }
 
@@ -37,7 +41,7 @@ public final JavaVisibility typeVisibility() {
 
     @Override
     public final String typeNamePrefix() {
-        return SpreadsheetStorageShared.class.getSimpleName();
+        return SpreadsheetStorage.class.getSimpleName();
     }
 
     @Override