Skip to content

Commit f1e50bd

Browse files
committed
Fix new warnings reported by Scala 2.13.0-RC1
There are two kinds of warnings: 1. [warn] .../scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala:102:26: method assert in class SymbolTable is deprecated (since 2.12.5): consider supplying an explanatory message [warn] def assertNoErrors() = assert(!reporter.hasErrors) [warn] ^ 2. code_snippet3799296259402470632.scala:2: warning: symbol literal is deprecated; use Symbol("boo") instead object Bammy { def foo = 'boo } ^
1 parent 7ae649b commit f1e50bd

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

scalac-scoverage-plugin/src/test/scala/scoverage/LocationTest.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class LocationTest extends FreeSpec with Matchers {
1919
}
2020
"for objects" in {
2121
val compiler = ScoverageCompiler.locationCompiler
22-
compiler.compile("package com.test\nobject Bammy { def foo = 'boo } ")
22+
compiler.compile("package com.test\nobject Bammy { def foo = Symbol(\"boo\") } ")
2323
val loc = compiler.locations.result().find(_._1 == "Template").get._2
2424
loc.packageName shouldBe "com.test"
2525
loc.className shouldBe "Bammy"
@@ -30,7 +30,7 @@ class LocationTest extends FreeSpec with Matchers {
3030
}
3131
"for traits" in {
3232
val compiler = ScoverageCompiler.locationCompiler
33-
compiler.compile("package com.test\ntrait Gammy { def goo = 'hoo } ")
33+
compiler.compile("package com.test\ntrait Gammy { def goo = Symbol(\"hoo\") } ")
3434
val loc = compiler.locations.result().find(_._1 == "Template").get._2
3535
loc.packageName shouldBe "com.test"
3636
loc.className shouldBe "Gammy"
@@ -42,7 +42,7 @@ class LocationTest extends FreeSpec with Matchers {
4242
}
4343
"should correctly process methods" in {
4444
val compiler = ScoverageCompiler.locationCompiler
45-
compiler.compile("package com.methodtest \n class Hammy { def foo = 'boo } ")
45+
compiler.compile("package com.methodtest \n class Hammy { def foo = Symbol(\"boo\") } ")
4646
val loc = compiler.locations.result().find(_._2.method == "foo").get._2
4747
loc.packageName shouldBe "com.methodtest"
4848
loc.className shouldBe "Hammy"
@@ -150,7 +150,7 @@ class LocationTest extends FreeSpec with Matchers {
150150
"should use <none> method name" - {
151151
"for class constructor body" in {
152152
val compiler = ScoverageCompiler.locationCompiler
153-
compiler.compile("package com.b \n class Tammy { val name = 'sam } ")
153+
compiler.compile("package com.b \n class Tammy { val name = Symbol(\"sam\") } ")
154154
val loc = compiler.locations.result().find(_._1 == "ValDef").get._2
155155
loc.packageName shouldBe "com.b"
156156
loc.className shouldBe "Tammy"
@@ -161,7 +161,7 @@ class LocationTest extends FreeSpec with Matchers {
161161
}
162162
"for object constructor body" in {
163163
val compiler = ScoverageCompiler.locationCompiler
164-
compiler.compile("package com.b \n object Yammy { val name = 'sam } ")
164+
compiler.compile("package com.b \n object Yammy { val name = Symbol(\"sam\") } ")
165165
val loc = compiler.locations.result().find(_._1 == "ValDef").get._2
166166
loc.packageName shouldBe "com.b"
167167
loc.className shouldBe "Yammy"
@@ -172,7 +172,7 @@ class LocationTest extends FreeSpec with Matchers {
172172
}
173173
"for trait constructor body" in {
174174
val compiler = ScoverageCompiler.locationCompiler
175-
compiler.compile("package com.b \n trait Wammy { val name = 'sam } ")
175+
compiler.compile("package com.b \n trait Wammy { val name = Symbol(\"sam\") } ")
176176
val loc = compiler.locations.result().find(_._1 == "ValDef").get._2
177177
loc.packageName shouldBe "com.b"
178178
loc.className shouldBe "Wammy"
@@ -209,7 +209,7 @@ class LocationTest extends FreeSpec with Matchers {
209209
}
210210
"doubly nested classes should report correct fullClassName" in {
211211
val compiler = ScoverageCompiler.locationCompiler
212-
compiler.compile("package com.a \n object Foo { object Boo { object Moo { val name = 'sam } } }")
212+
compiler.compile("package com.a \n object Foo { object Boo { object Moo { val name = Symbol(\"sam\") } } }")
213213
val loc = compiler.locations.result().find(_._1 == "ValDef").get._2
214214
loc.packageName shouldBe "com.a"
215215
loc.className shouldBe "Moo"

scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,10 @@ class ScoverageCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tool
9999
compileSourceFiles(urls.map(_.getFile).map(new File(_)): _*)
100100
}
101101

102-
def assertNoErrors() = assert(!reporter.hasErrors)
102+
def assertNoErrors() = assert(!reporter.hasErrors, "There are compilation errors")
103103

104-
def assertNoCoverage() = assert(!testStore.sources.mkString(" ").contains(s"scoverage.Invoker.invoked"))
104+
def assertNoCoverage() = assert(!testStore.sources.mkString(" ").contains(s"scoverage.Invoker.invoked"),
105+
"There are scoverage.Invoker.invoked instructions added to the code")
105106

106107
def assertNMeasuredStatements(n: Int): Unit = {
107108
for (k <- 1 to n) {

0 commit comments

Comments
 (0)