Fix broken assertion in AbstractNessieSparkSqlExtensionTest

The assertion was modified in projectnessie#7308 with a workaround to avoid compilation failures. This commit reintroduces the right assertion, which became possible when Iceberg updated Nessie to 0.61+.
snazy · Oct 9, 2023 · 2be4bc4 · 2be4bc4
1 parent 2787637
commit 2be4bc4
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/...src/main/java/org/projectnessie/spark/extensions/AbstractNessieSparkSqlExtensionTest.java b/...src/main/java/org/projectnessie/spark/extensions/AbstractNessieSparkSqlExtensionTest.java
@@ -300,13 +300,7 @@ additionalRefName, defaultBranch(), currentHash))
                     "ASSIGN BRANCH %s TO %s AT %s IN nessie",
                     additionalRefName, defaultBranch(), invalidHash))
         .isInstanceOf(IllegalArgumentException.class)
-        // TODO enable this when Nessie lib will be >= 0.61
-        // .hasMessage(
-        //     Validation.HASH_OR_RELATIVE_COMMIT_SPEC_MESSAGE
-        //         + " - but was: "
-        //         + invalidHash)
-        .hasMessageContaining(Validation.HASH_RULE)
-        .hasMessageContaining(" - but was: " + invalidHash);
+        .hasMessage(Validation.HASH_OR_RELATIVE_COMMIT_SPEC_MESSAGE + " - but was: " + invalidHash);
     assertThatThrownBy(
             () ->
                 sql(
@@ -354,13 +348,7 @@ additionalRefName, defaultBranch(), currentHash))
                     "ASSIGN TAG %s TO %s AT %s IN nessie",
                     additionalRefName, defaultBranch(), invalidHash))
         .isInstanceOf(IllegalArgumentException.class)
-        // TODO enable this when Nessie lib will be >= 0.61
-        // .hasMessage(
-        //     Validation.HASH_OR_RELATIVE_COMMIT_SPEC_MESSAGE
-        //         + " - but was: "
-        //         + invalidHash)
-        .hasMessageContaining(Validation.HASH_RULE)
-        .hasMessageContaining(" - but was: " + invalidHash);
+        .hasMessage(Validation.HASH_OR_RELATIVE_COMMIT_SPEC_MESSAGE + " - but was: " + invalidHash);
     assertThatThrownBy(
             () ->
                 sql(