Fix contains

sbt · Dec 26, 2024 · dd532cf · dd532cf
1 parent 7c1f840
commit dd532cf
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/src/sbt-test/sbt-buildinfo/caseclassrenderer/build.sbt b/src/sbt-test/sbt-buildinfo/caseclassrenderer/build.sbt
@@ -120,7 +120,7 @@ lazy val root = (project in file("."))
           """  val get = apply()""" ::
           """  val value = apply()""" ::
           """}""" ::
-          """// $COVERAGE-ON$""" :: Nil if (targetInfo contains "target = new java.io.File(") &&
+          """// $COVERAGE-ON$""" :: Nil if (targetInfo.contains("target = new java.io.File(")) &&
             (apiMappingsDecl.contains("apiMappings")) =>
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }

diff --git a/src/sbt-test/sbt-buildinfo/constantvalue/build.sbt b/src/sbt-test/sbt-buildinfo/constantvalue/build.sbt
@@ -85,8 +85,8 @@ lazy val root = (project in file(".")).
           """    )""" ::
           """  }""" ::
           """}""" ::
-          """// $COVERAGE-ON$""" :: Nil  if (targetInfo contains "target: java.io.File = new java.io.File(") &&
-          (scalaVersionInfo.trim == s"""final val scalaVersion = "$sv"""") => ()
+          """// $COVERAGE-ON$""" :: Nil  if targetInfo.contains("target = new java.io.File(") &&
+            (scalaVersionInfo.trim == s"""final val scalaVersion = "$sv"""") => ()
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }
       ()

diff --git a/src/sbt-test/sbt-buildinfo/javasingletonrenderer/build.sbt b/src/sbt-test/sbt-buildinfo/javasingletonrenderer/build.sbt
@@ -151,7 +151,8 @@ lazy val root = (project in file("."))
           """""" ::
           """  public final String toJson = toJsonValue(toMap());""" ::
           """}""" ::
-          """// $COVERAGE-ON$""" :: Nil if ((targetInfo contains "public final java.io.File target = new java.io.File(") && (targetInfoComment contains "/** The value is new java.io.File(")) =>
+          """// $COVERAGE-ON$""" :: Nil if (targetInfo.contains("target = new java.io.File(") &&
+            targetInfoComment.contains("/** The value is new java.io.File(") => ()
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }
       ()

diff --git a/src/sbt-test/sbt-buildinfo/javastaticfieldsrenderer/build.sbt b/src/sbt-test/sbt-buildinfo/javastaticfieldsrenderer/build.sbt
@@ -149,7 +149,8 @@ lazy val root = (project in file("."))
           """""" ::
           """  public static final String makeJson = toJsonValue(makeMap());""" ::
           """}""" ::
-          """// $COVERAGE-ON$""" :: Nil if ((targetInfo contains "public static final java.io.File target = new java.io.File(") && (targetInfoComment contains "/** The value is new java.io.File(")) =>
+          """// $COVERAGE-ON$""" :: Nil if targetInfo.contains("target = new java.io.File(") &&
+            targetInfoComment.contains("/** The value is new java.io.File(") => ()
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }
       ()

diff --git a/src/sbt-test/sbt-buildinfo/simple/build.sbt b/src/sbt-test/sbt-buildinfo/simple/build.sbt
@@ -83,10 +83,10 @@ lazy val root = (project in file("."))
              """    )""" ::
              """  }""" ::
              """}""" ::
-             """// $COVERAGE-ON$""" :: Nil if (targetInfo contains "val target: java.io.File = new java.io.File(") &&
-             (scalaVersionInfo.trim == s"""val scalaVersion: String = "$sv"""") &&
-             (someCpInfo.contains("/tmp/f.txt")) &&
-             (projectVer.contains("val projectVersion")) => ()
+             """// $COVERAGE-ON$""" :: Nil if targetInfo.contains("target = new java.io.File(") &&
+               (scalaVersionInfo.trim == s"""val scalaVersion: String = "$sv"""") &&
+               (someCpInfo.contains("/tmp/f.txt")) &&
+               (projectVer.contains("val projectVersion")) => ()
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }
       ()

diff --git a/src/sbt-test/sbt-buildinfo/skipimportscaseclass/build.sbt b/src/sbt-test/sbt-buildinfo/skipimportscaseclass/build.sbt
@@ -106,7 +106,7 @@ lazy val root = (project in file("."))
           """  val get = apply()""" ::
           """  val value = apply()""" ::
           """}""" ::
-          """// $COVERAGE-ON$""" :: Nil if (targetInfo contains "target = new java.io.File(") =>
+          """// $COVERAGE-ON$""" :: Nil if targetInfo.contains("target = new java.io.File(") => ()
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }
       ()

diff --git a/src/sbt-test/sbt-buildinfo/usepackageaspath/build.sbt b/src/sbt-test/sbt-buildinfo/usepackageaspath/build.sbt
@@ -69,7 +69,7 @@ lazy val root = (project in file("."))
              """    )""" ::
              """  }""" ::
              """}""" ::
-             """// $COVERAGE-ON$""" :: Nil if (targetInfo contains "val target: java.io.File = new java.io.File(") =>
+             """// $COVERAGE-ON$""" :: Nil if targetInfo.contains("target = new java.io.File(") => ()
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }
       ()