Skip to content

Commit d01eb77

Browse files
committed
Small internal code improvements
No need to call `toSet` method on a set
1 parent 2872e73 commit d01eb77

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class IOUtilsTest extends FreeSpec with MockitoSugar with OneInstancePerTest wit
1616
writer.write("1\n5\n9\n\n10\n")
1717
writer.close()
1818
val invoked = IOUtils.invoked(Seq(file))
19-
assert(invoked.toSet === Set(1, 5, 9, 10))
19+
assert(invoked === Set(1, 5, 9, 10))
2020

2121
file.delete()
2222
}
@@ -37,7 +37,7 @@ class IOUtilsTest extends FreeSpec with MockitoSugar with OneInstancePerTest wit
3737

3838
val files = IOUtils.findMeasurementFiles(file1.getParent)
3939
val invoked = IOUtils.invoked(files.toIndexedSeq)
40-
assert(invoked.toSet === Set(1, 2, 5, 7, 9, 10, 14))
40+
assert(invoked === Set(1, 2, 5, 7, 9, 10, 14))
4141

4242
file1.delete()
4343
file2.delete()
@@ -66,7 +66,7 @@ class IOUtilsTest extends FreeSpec with MockitoSugar with OneInstancePerTest wit
6666

6767
val files = IOUtils.reportFileSearch(base, IOUtils.isReportFile)
6868
val invoked = IOUtils.invoked(files)
69-
assert(invoked.toSet === Set(1, 2, 3, 4, 5, 6, 7, 8, 11, 20, 30, 44))
69+
assert(invoked === Set(1, 2, 3, 4, 5, 6, 7, 8, 11, 20, 30, 44))
7070

7171
file1.delete()
7272
file2.delete()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ class ScoverageCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tool
102102

103103
def assertNoCoverage() = assert(!testStore.sources.mkString(" ").contains(s"scoverage.Invoker.invoked"))
104104

105-
106105
def assertNMeasuredStatements(n: Int): Unit = {
107106
for (k <- 1 to n) {
108107
assert(testStore.sources.mkString(" ").contains(s"scoverage.Invoker.invoked($k,"),

scalac-scoverage-runtime/jvm/src/test/scala/scoverage/InvokerConcurrencyTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class InvokerConcurrencyTest extends FunSuite with BeforeAndAfter {
3838

3939
// Now verify that the measurement file is not corrupted by loading it
4040
val measurementFiles = Invoker.findMeasurementFiles(measurementDir)
41-
val idsFromFile = Invoker.invoked(measurementFiles.toIndexedSeq).toSet
41+
val idsFromFile = Invoker.invoked(measurementFiles.toIndexedSeq)
4242

4343
idsFromFile === testIds
4444
}

scalac-scoverage-runtime/shared/src/test/scala/scoverage/InvokerMultiModuleTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ class InvokerMultiModuleTest extends FunSuite with BeforeAndAfter {
2727

2828
// Verify measurements went to correct directory
2929
val measurementFiles0 = Invoker.findMeasurementFiles(measurementDir(0))
30-
val idsFromFile0 = Invoker.invoked(measurementFiles0.toIndexedSeq).toSet
30+
val idsFromFile0 = Invoker.invoked(measurementFiles0.toIndexedSeq)
3131

3232
idsFromFile0 === testIds.filter { i: Int => i % 2 == 0 }
3333

3434
val measurementFiles1 = Invoker.findMeasurementFiles(measurementDir(0))
35-
val idsFromFile1 = Invoker.invoked(measurementFiles1.toIndexedSeq).toSet
35+
val idsFromFile1 = Invoker.invoked(measurementFiles1.toIndexedSeq)
3636
idsFromFile1 === testIds.filter { i: Int => i % 2 == 1 }
3737
}
3838

0 commit comments

Comments
 (0)