Skip to content

[SPARK-33084][CORE][SQL] Rename Unit test file and use fake ivy link #31118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-33084][CORE][SQL] Rename Unit test file and use fake ivy link #31118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
661a5f9
follow comment
AngersZhuuuu Jan 11, 2021
542de25
follow comment
AngersZhuuuu Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions core/src/test/scala/org/apache/spark/SparkContextSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,17 +1067,17 @@ class SparkContextSuite extends SparkFunSuite with LocalSparkContext with Eventu
dependencyJars.foreach(jar => assert(sc.listJars().exists(_.contains(jar))))

assert(logAppender.loggingEvents.count(_.getRenderedMessage.contains(
"Added dependency jars of Ivy URI" +
" ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true")) == 1)
"Added dependency jars of Ivy URI " +
"ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true")) == 1)

// test dependency jars exist
sc.addJar("ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true")
assert(logAppender.loggingEvents.count(_.getRenderedMessage.contains(
"The dependency jars of Ivy URI" +
" ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true")) == 1)
"The dependency jars of Ivy URI " +
"ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true")) == 1)
val existMsg = logAppender.loggingEvents.filter(_.getRenderedMessage.contains(
"The dependency jars of Ivy URI" +
" ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true"))
"The dependency jars of Ivy URI " +
"ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true"))
.head.getRenderedMessage
dependencyJars.foreach(jar => assert(existMsg.contains(jar)))
}
Expand Down Expand Up @@ -1109,8 +1109,8 @@ class SparkContextSuite extends SparkFunSuite with LocalSparkContext with Eventu
"invalidParam1=foo&invalidParam2=boo")
assert(sc.listJars().exists(_.contains("org.apache.hive_hive-storage-api-2.7.0.jar")))
assert(logAppender.loggingEvents.exists(_.getRenderedMessage.contains(
"Invalid parameters `invalidParam1,invalidParam2` found in Ivy URI query" +
" `invalidParam1=foo&invalidParam2=boo`.")))
"Invalid parameters `invalidParam1,invalidParam2` found in Ivy URI query " +
"`invalidParam1=foo&invalidParam2=boo`.")))
}
}

Expand Down
26 changes: 13 additions & 13 deletions ...g/apache/spark/util/DependencyUtils.scala → ...che/spark/util/DependencyUtilsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,31 @@ class DependencyUtilsSuite extends SparkFunSuite {
assert(e1.contains("Expected authority at index 6: ivy://"))

val e2 = intercept[IllegalArgumentException] {
DependencyUtils.resolveMavenDependencies(URI.create("ivy://org.apache.hive:hive-contrib"))
DependencyUtils.resolveMavenDependencies(URI.create("ivy://org.apache.test:test-test"))
}.getMessage
assert(e2.contains("Invalid Ivy URI authority in uri ivy://org.apache.hive:hive-contrib:" +
" Expected 'org:module:version', found org.apache.hive:hive-contrib."))
assert(e2.contains("Invalid Ivy URI authority in uri ivy://org.apache.test:test-test: " +
"Expected 'org:module:version', found org.apache.test:test-test."))

val e3 = intercept[IllegalArgumentException] {
DependencyUtils.resolveMavenDependencies(
URI.create("ivy://org.apache.hive:hive-contrib:2.3.7?foo="))
URI.create("ivy://org.apache.test:test-test:1.0.0?foo="))
}.getMessage
assert(e3.contains("Invalid query string in Ivy URI" +
" ivy://org.apache.hive:hive-contrib:2.3.7?foo=:"))
assert(e3.contains("Invalid query string in Ivy URI " +
"ivy://org.apache.test:test-test:1.0.0?foo=:"))

val e4 = intercept[IllegalArgumentException] {
DependencyUtils.resolveMavenDependencies(
URI.create("ivy://org.apache.hive:hive-contrib:2.3.7?bar=&baz=foo"))
URI.create("ivy://org.apache.test:test-test:1.0.0?bar=&baz=foo"))
}.getMessage
assert(e4.contains("Invalid query string in Ivy URI" +
" ivy://org.apache.hive:hive-contrib:2.3.7?bar=&baz=foo: bar=&baz=foo"))
assert(e4.contains("Invalid query string in Ivy URI " +
"ivy://org.apache.test:test-test:1.0.0?bar=&baz=foo: bar=&baz=foo"))

val e5 = intercept[IllegalArgumentException] {
DependencyUtils.resolveMavenDependencies(
URI.create("ivy://org.apache.hive:hive-contrib:2.3.7?exclude=org.pentaho"))
URI.create("ivy://org.apache.test:test-test:1.0.0?exclude=org.apache"))
}.getMessage
assert(e5.contains("Invalid exclude string in Ivy URI" +
" ivy://org.apache.hive:hive-contrib:2.3.7?exclude=org.pentaho:" +
" expected 'org:module,org:module,..', found org.pentaho"))
assert(e5.contains("Invalid exclude string in Ivy URI " +
"ivy://org.apache.test:test-test:1.0.0?exclude=org.apache: " +
"expected 'org:module,org:module,..', found org.apache"))
}
}