Part 8 - adjust Zinc reporter instead of linenumbers plugin

Author: bishabosha

integration/failure/compile-error/src/CompileErrorTests.scala

@@ -9,13 +9,26 @@ object CompileErrorTests extends UtestIntegrationTestSuite {
     test - integrationTest { tester =>
       val res = tester.eval("foo.scalaVersion")
 
-      assert(res.isSuccess == false)
-      assert(res.err.contains("""bar.mill:15:9: not found: value doesntExist"""))
-      assert(res.err.contains("""println(doesntExist)"""))
-      assert(res.err.contains("""qux.mill:4:34: type mismatch;"""))
-      assert(res.err.contains(
-        """build.mill:9:5: value noSuchMethod is not a member"""
-      ))
+      assert(!res.isSuccess)
+
+      locally {
+        assert(res.err.contains("""bar.mill:15:9"""))
+        assert(res.err.contains("""println(doesntExist)"""))
+        assert(res.err.contains("""Not found: doesntExist"""))
+      }
+
+      locally {
+        assert(res.err.contains("""qux.mill:4:34"""))
+        assert(res.err.contains("""myMsg.substring("0")"""))
+        assert(res.err.contains("""Found:    ("0" : String)"""))
+        assert(res.err.contains("""Required: Int"""))
+      }
+
+      locally {
+        assert(res.err.contains("""build.mill:9:5"""))
+        assert(res.err.contains("""foo.noSuchMethod"""))
+        assert(res.err.contains("""value noSuchMethod is not a member"""))
+      }
     }
   }
 }

integration/failure/root-module-compile-error/src/RootModuleCompileErrorTests.scala

@@ -10,44 +10,69 @@ object RootModuleCompileErrorTests extends UtestIntegrationTestSuite {
       import tester._
       val res = eval("foo.scalaVersion")
 
-      assert(res.isSuccess == false)
-      // For now these error messages still show generated/mangled code; not ideal, but it'll do
-      assert(res.err.contains("""build.mill:7:50: not found: type UnknownRootModule"""))
-      assert(
-        res.err.contains(
-          """abstract class package_  extends RootModule with UnknownRootModule {"""
-        )
-      )
-      assert(
-        res.err.replace('\\', '/').contains(
-          """foo/package.mill:6:60: not found: type UnknownFooModule"""
-        )
-      )
-      assert(
-        res.err.contains(
+      assert(!res.isSuccess)
+
+      locally {
+        // For now these error messages still show generated/mangled code; not ideal, but it'll do
+        assert(res.err.contains("""build.mill:7:50"""))
+        assert(res.err.contains("""Not found: type UnknownRootModule"""))
+        assert(res.err.contains("""abstract class package_  extends RootModule with UnknownRootModule {"""))
+        assert(res.err.contains("""                                                 ^^^^^^^^^^^^^^^^^"""))
+      }
+
+      locally {
+        // For now these error messages still show generated/mangled code; not ideal, but it'll do
+        assert(res.err.replace('\\', '/').contains("""foo/package.mill:6:60"""))
+        assert(res.err.contains("""Not found: type UnknownFooModule"""))
+        assert(res.err.contains(
           """abstract class package_  extends RootModule.Subfolder with UnknownFooModule {"""
-        )
-      )
-
-      assert(res.err.contains("""build.mill:8:22: not found: value unknownRootInternalDef"""))
-      assert(res.err.contains("""def scalaVersion = unknownRootInternalDef"""))
-      assert(res.err.contains("""build.mill:5:23: not found: type UnknownBeforeModule"""))
-      assert(res.err.contains("""object before extends UnknownBeforeModule"""))
-      assert(res.err.contains("""build.mill:11:22: not found: type UnknownAfterModule"""))
-      assert(res.err.contains("""object after extends UnknownAfterModule"""))
-
-      assert(res.err.replace('\\', '/').contains(
-        """foo/package.mill:7:22: not found: value unknownFooInternalDef"""
-      ))
-      assert(res.err.contains("""def scalaVersion = unknownFooInternalDef"""))
-      assert(res.err.replace('\\', '/').contains(
-        """foo/package.mill:4:23: not found: type UnknownBeforeFooModule"""
-      ))
-      assert(res.err.contains("""object before extends UnknownBeforeFooModule"""))
-      assert(res.err.replace('\\', '/').contains(
-        """foo/package.mill:10:22: not found: type UnknownAfterFooModule"""
-      ))
-      assert(res.err.contains("""object after extends UnknownAfterFooModule"""))
+        ))
+        assert(res.err.contains(
+          """                                                           ^^^^^^^^^^^^^^^^"""
+        ))
+      }
+
+      locally {
+        assert(res.err.contains("""build.mill:8:22"""))
+        assert(res.err.contains("""Not found: unknownRootInternalDef"""))
+        assert(res.err.contains("""def scalaVersion = unknownRootInternalDef"""))
+        assert(res.err.contains("""                   ^^^^^^^^^^^^^^^^^^^^^^"""))
+      }
+
+      locally {
+        assert(res.err.contains("""build.mill:5:23"""))
+        assert(res.err.contains("""Not found: type UnknownBeforeModule"""))
+        assert(res.err.contains("""object before extends UnknownBeforeModule"""))
+        assert(res.err.contains("""                      ^^^^^^^^^^^^^^^^^^^"""))
+      }
+
+      locally {
+        assert(res.err.contains("""build.mill:11:22"""))
+        assert(res.err.contains("""Not found: type UnknownAfterModule"""))
+        assert(res.err.contains("""object after extends UnknownAfterModule"""))
+        assert(res.err.contains("""                     ^^^^^^^^^^^^^^^^^^"""))
+      }
+
+      locally {
+        assert(res.err.replace('\\', '/').contains("""foo/package.mill:7:22"""))
+        assert(res.err.contains("""Not found: unknownFooInternalDef"""))
+        assert(res.err.contains("""def scalaVersion = unknownFooInternalDef"""))
+        assert(res.err.contains("""                   ^^^^^^^^^^^^^^^^^^^^^"""))
+      }
+
+      locally {
+        assert(res.err.replace('\\', '/').contains("""foo/package.mill:4:23"""))
+        assert(res.err.contains("""Not found: type UnknownBeforeFooModule"""))
+        assert(res.err.contains("""object before extends UnknownBeforeFooModule"""))
+        assert(res.err.contains("""                      ^^^^^^^^^^^^^^^^^^^^^^"""))
+      }
+
+      locally {
+        assert(res.err.replace('\\', '/').contains("""foo/package.mill:10:22"""))
+        assert(res.err.contains("""Not found: type UnknownAfterFooModule"""))
+        assert(res.err.contains("""object after extends UnknownAfterFooModule"""))
+        assert(res.err.contains("""                     ^^^^^^^^^^^^^^^^^^^^^"""))
+      }
     }
   }
 }

integration/failure/subfolder-helper-module-collision/src/SubfolderHelperModuleCollisionTests.scala

@@ -11,7 +11,7 @@ object SubfolderHelperModuleCollisionTests extends UtestIntegrationTestSuite {
       val res = eval(("resolve", "_"))
       assert(res.isSuccess == false)
       // Not a great error message but it will have to do for now
-      assert(res.err.contains("sub is already defined as object sub"))
+      assert(res.err.contains("Trying to define package with same name as class sub"))
     }
   }
 }

integration/failure/subfolder-missing-build-prefix/src/SubfolderMissingBuildPrefix.scala

@@ -9,8 +9,8 @@ object SubfolderMissingBuildPrefix extends UtestIntegrationTestSuite {
     test("success") - integrationTest { tester =>
       import tester._
       val res = eval(("resolve", "_"))
-      assert(res.isSuccess == false)
-      assert(res.err.contains("object y is not a member of package build_.sub"))
+      assert(!res.isSuccess)
+      assert(res.err.contains("value y is not a member of build_.sub"))
     }
   }
 }

integration/failure/things-outside-top-level-module/src/ThingsOutsideTopLevelModuleTests.scala

@@ -11,7 +11,6 @@ object MillPluginClasspathTest extends UtestIntegrationTestSuite {
     ("com.lihaoyi", "mill-main-api_2.13"),
     ("com.lihaoyi", "mill-main-util_2.13"),
     ("com.lihaoyi", "mill-main-codesig_2.13"),
-    ("com.lihaoyi", "mill-runner-linenumbers_2.13"),
     ("com.lihaoyi", "mill-bsp_2.13"),
     ("com.lihaoyi", "mill-scalanativelib-worker-api_2.13"),
     ("com.lihaoyi", "mill-testrunner-entrypoint"),

integration/feature/plugin-classpath/src/MillPluginClasspathTest.scala

@@ -0,0 +1,13 @@
+import mill.testkit.IntegrationTestSuite
+import utest.{assert, *}
+
+object ThingsOutsideTopLevelModuleTests extends IntegrationTestSuite {
+  val tests: Tests = Tests {
+    initWorkspace()
+
+    test("success") {
+      val res = eval(("resolve", "_"))
+      assert(res.isSuccess)
+    }
+  }
+}