From bceea911dd7cbcaf426e8f72f41a2f8e7aae11bc Mon Sep 17 00:00:00 2001 From: Enrico Minack Date: Mon, 12 Sep 2022 17:42:59 +0200 Subject: [PATCH] Adjust asserts for Spark 3.4.0 snapshot (#112) --- .github/workflows/ci.yml | 4 +++- src/test/scala/uk/co/gresearch/spark/HistogramSuite.scala | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c99c39f..0d7ff779 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,9 @@ jobs: distribution: 'zulu' - name: Build - run: mvn --batch-mode --update-snapshots compile test-compile package -DskipTests -Dmaven.test.skip=true + run: | + mvn --batch-mode --update-snapshots clean compile test-compile + mvn --batch-mode package -DskipTests -Dmaven.test.skip=true - name: Upload Binaries uses: actions/upload-artifact@v3 diff --git a/src/test/scala/uk/co/gresearch/spark/HistogramSuite.scala b/src/test/scala/uk/co/gresearch/spark/HistogramSuite.scala index c3a7aa7f..d56578b4 100644 --- a/src/test/scala/uk/co/gresearch/spark/HistogramSuite.scala +++ b/src/test/scala/uk/co/gresearch/spark/HistogramSuite.scala @@ -184,7 +184,7 @@ class HistogramSuite extends AnyFunSuite with SparkTestSession { assert( exception.getMessage.startsWith("cannot resolve '`does-not-exist`' given input columns: [id, title, value]") || exception.getMessage.startsWith("Column '`does-not-exist`' does not exist. Did you mean one of the following? [title, id, value]") || - exception.getMessage.startsWith("[UNRESOLVED_COLUMN] A column or function parameter with name `does-not-exist` cannot be resolved. Did you mean one of the following? [`title`, `id`, `value`]") + exception.getMessage.startsWith("[UNRESOLVED_COLUMN.WITH_SUGGESTION] A column or function parameter with name `does-not-exist` cannot be resolved. Did you mean one of the following? [`title`, `id`, `value`]") ) } @@ -194,8 +194,8 @@ class HistogramSuite extends AnyFunSuite with SparkTestSession { } assert( exception.getMessage.startsWith("cannot resolve '`does-not-exist`' given input columns: [") || - exception.getMessage.startsWith("Column '`does-not-exist`' does not exist. Did you mean one of the following? [") || - exception.getMessage.startsWith("[UNRESOLVED_COLUMN] A column or function parameter with name `does-not-exist` cannot be resolved. Did you mean one of the following? [") + exception.getMessage.startsWith("Column '`does-not-exist`' does not exist. Did you mean one of the following? [title, id, value, ≤-100, ≤-200, >200, ≤0, ≤100, ≤200]") || + exception.getMessage.startsWith("[UNRESOLVED_COLUMN.WITH_SUGGESTION] A column or function parameter with name `does-not-exist` cannot be resolved. Did you mean one of the following? [`title`, `id`, `value`, `≤-100`, `≤-200`]") ) }