Skip to content

Commit 542de25

Browse files
AngersZhuuuuAngersZhuuuu
committed
follow comment
1 parent 661a5f9 commit 542de25

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

‎core/src/test/scala/org/apache/spark/SparkContextSuite.scala‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,17 +1067,17 @@ class SparkContextSuite extends SparkFunSuite with LocalSparkContext with Eventu
10671067
dependencyJars.foreach(jar => assert(sc.listJars().exists(_.contains(jar))))
10681068

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

10731073
// test dependency jars exist
10741074
sc.addJar("ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true")
10751075
assert(logAppender.loggingEvents.count(_.getRenderedMessage.contains(
1076-
"The dependency jars of Ivy URI" +
1077-
" ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true")) == 1)
1076+
"The dependency jars of Ivy URI " +
1077+
"ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true")) == 1)
10781078
val existMsg = logAppender.loggingEvents.filter(_.getRenderedMessage.contains(
1079-
"The dependency jars of Ivy URI" +
1080-
" ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true"))
1079+
"The dependency jars of Ivy URI " +
1080+
"ivy://org.apache.hive:hive-storage-api:2.7.0?transitive=true"))
10811081
.head.getRenderedMessage
10821082
dependencyJars.foreach(jar => assert(existMsg.contains(jar)))
10831083
}
@@ -1109,8 +1109,8 @@ class SparkContextSuite extends SparkFunSuite with LocalSparkContext with Eventu
11091109
"invalidParam1=foo&invalidParam2=boo")
11101110
assert(sc.listJars().exists(_.contains("org.apache.hive_hive-storage-api-2.7.0.jar")))
11111111
assert(logAppender.loggingEvents.exists(_.getRenderedMessage.contains(
1112-
"Invalid parameters `invalidParam1,invalidParam2` found in Ivy URI query" +
1113-
" `invalidParam1=foo&invalidParam2=boo`.")))
1112+
"Invalid parameters `invalidParam1,invalidParam2` found in Ivy URI query " +
1113+
"`invalidParam1=foo&invalidParam2=boo`.")))
11141114
}
11151115
}
11161116

‎core/src/test/scala/org/apache/spark/util/DependencyUtilsSuite.scala‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,29 @@ class DependencyUtilsSuite extends SparkFunSuite {
3232
val e2 = intercept[IllegalArgumentException] {
3333
DependencyUtils.resolveMavenDependencies(URI.create("ivy://org.apache.test:test-test"))
3434
}.getMessage
35-
assert(e2.contains("Invalid Ivy URI authority in uri ivy://org.apache.test:test-test:" +
36-
" Expected 'org:module:version', found org.apache.test:test-test."))
35+
assert(e2.contains("Invalid Ivy URI authority in uri ivy://org.apache.test:test-test: " +
36+
"Expected 'org:module:version', found org.apache.test:test-test."))
3737

3838
val e3 = intercept[IllegalArgumentException] {
3939
DependencyUtils.resolveMavenDependencies(
4040
URI.create("ivy://org.apache.test:test-test:1.0.0?foo="))
4141
}.getMessage
42-
assert(e3.contains("Invalid query string in Ivy URI" +
43-
" ivy://org.apache.test:test-test:1.0.0?foo=:"))
42+
assert(e3.contains("Invalid query string in Ivy URI " +
43+
"ivy://org.apache.test:test-test:1.0.0?foo=:"))
4444

4545
val e4 = intercept[IllegalArgumentException] {
4646
DependencyUtils.resolveMavenDependencies(
4747
URI.create("ivy://org.apache.test:test-test:1.0.0?bar=&baz=foo"))
4848
}.getMessage
49-
assert(e4.contains("Invalid query string in Ivy URI" +
50-
" ivy://org.apache.test:test-test:1.0.0?bar=&baz=foo: bar=&baz=foo"))
49+
assert(e4.contains("Invalid query string in Ivy URI " +
50+
"ivy://org.apache.test:test-test:1.0.0?bar=&baz=foo: bar=&baz=foo"))
5151

5252
val e5 = intercept[IllegalArgumentException] {
5353
DependencyUtils.resolveMavenDependencies(
5454
URI.create("ivy://org.apache.test:test-test:1.0.0?exclude=org.apache"))
5555
}.getMessage
56-
assert(e5.contains("Invalid exclude string in Ivy URI" +
57-
" ivy://org.apache.test:test-test:1.0.0?exclude=org.apache:" +
58-
" expected 'org:module,org:module,..', found org.apache"))
56+
assert(e5.contains("Invalid exclude string in Ivy URI " +
57+
"ivy://org.apache.test:test-test:1.0.0?exclude=org.apache: " +
58+
"expected 'org:module,org:module,..', found org.apache"))
5959
}
6060
}

0 commit comments

Comments
 (0)