Skip to content

Commit

Permalink
Adjust asserts for Spark 3.4.0 snapshot
Browse files Browse the repository at this point in the history
  • Loading branch information
EnricoMi committed Sep 12, 2022
1 parent da2a446 commit 1770fdc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>uk.co.gresearch.spark</groupId>
<artifactId>spark-extension_2.13</artifactId>
<version>2.3.0-3.3-SNAPSHOT</version>
<artifactId>spark-extension_2.12</artifactId>
<version>2.3.0-3.4-SNAPSHOT</version>
<name>Spark Extension</name>
<description>A library that provides useful extensions to Apache Spark.</description>
<inceptionYear>2020</inceptionYear>
Expand Down Expand Up @@ -37,11 +37,11 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<encoding>UTF-8</encoding>
<scala.compat.version>2.13</scala.compat.version>
<scala.version>${scala.compat.version}.8</scala.version>
<scala.compat.version>2.12</scala.compat.version>
<scala.version>${scala.compat.version}.16</scala.version>
<!-- keep in-sync with python/requirements-3.3_2.13.txt -->
<spark.compat.version>3.3</spark.compat.version>
<spark.version>${spark.compat.version}.0</spark.version>
<spark.compat.version>3.4</spark.compat.version>
<spark.version>${spark.compat.version}.0-SNAPSHOT</spark.version>
</properties>

<dependencies>
Expand Down
8 changes: 5 additions & 3 deletions src/test/scala/uk/co/gresearch/spark/HistogramSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ 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] 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`]")
)
}

Expand All @@ -194,8 +195,9 @@ 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`]") ||
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`, `≤-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`]")
)
}

Expand Down

0 comments on commit 1770fdc

Please sign in to comment.