qa: refactor catalog conformance tests with clear exception type expe…

…ctations
geoserver · Dec 7, 2023 · fe24c66 · fe24c66
1 parent 4fcd6c6
commit fe24c66
Show file tree

Hide file tree

Showing 3 changed files with 256 additions and 310 deletions.
diff --git a/...rg/geoserver/cloud/autoconfigure/security/EnvironmentAdminAuthenticationProviderTest.java b/...rg/geoserver/cloud/autoconfigure/security/EnvironmentAdminAuthenticationProviderTest.java
@@ -144,7 +144,8 @@ void default_admin_bad_credentials() {
                         context -> {
                             assertThat(context).hasNotFailed();
                             Authentication token = userNamePasswordToken("admin", "badPWD");
-							EnvironmentAdminAuthenticationProvider envAuthProvider = envAuthProvider(context);
+                            EnvironmentAdminAuthenticationProvider envAuthProvider =
+                                    envAuthProvider(context);
 
                             assertThrows(
                                     InternalAuthenticationServiceException.class,

diff --git a/...plugin/src/main/java/org/geoserver/catalog/plugin/validation/DefaultCatalogValidator.java b/...plugin/src/main/java/org/geoserver/catalog/plugin/validation/DefaultCatalogValidator.java
@@ -127,8 +127,10 @@ public void validate(StoreInfo store, boolean isNew) {
         if (isNew) {
             newObjectPropertiesResolver.resolve(store);
         }
-        checkNotEmpty(store.getName(), "Store name must not be null");
-        checkNotNull(store.getWorkspace(), "Store must be part of a workspace");
+        // note: throwing IAE if null to match CatalogImpl's behavior, though it should be NPE
+        checkArgument(null != store.getName(), "Store name must not be null");
+        checkNotEmpty(store.getName(), "Store name must not be empty");
+        checkArgument(null != store.getWorkspace(), "Store must be part of a workspace");
 
         WorkspaceInfo workspace = store.getWorkspace();
         StoreInfo existing = catalog.getStoreByName(workspace, store.getName(), StoreInfo.class);
@@ -154,8 +156,8 @@ public void validate(ResourceInfo resource, boolean isNew) {
                         && coverage.getNativeCoverageName() != null)) {
             throw new NullPointerException("Resource native name must not be null");
         }
-        checkNotNull(resource.getStore(), "Resource must be part of a store");
-        checkNotNull(resource.getNamespace(), "Resource must be part of a namespace");
+        checkArgument(null != resource.getStore(), "Resource must be part of a store");
+        checkArgument(null != resource.getNamespace(), "Resource must be part of a namespace");
 
         StoreInfo store = resource.getStore();
         ResourceInfo existing =