Skip to content

Commit 80ed58d

Browse files
SethTisueSethTisue
committed
unshade and add deps
1 parent 23376c8 commit 80ed58d

File tree

14 files changed

+51
-45
lines changed

14 files changed

+51
-45
lines changed

‎build.sbt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ organization := "com.lihaoyi"
33
scalaVersion := "2.13.16"
44
libraryDependencies += "org.portable-scala" %% "portable-scala-reflect" % "0.1.0"
55
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
6+
libraryDependencies += "com.lihaoyi" %% "pprint" % "0.9.3"
7+
libraryDependencies += "com.lihaoyi" %% "fansi" % "0.5.1"
8+
libraryDependencies += "app.tulz" %% "stringdiff" % "0.3.4"
69
testFrameworks += new TestFramework("test.utest.CustomFramework")
710
Compile / unmanagedSourceDirectories += baseDirectory.value / "utest" / "src"
811
Compile / unmanagedSourceDirectories += baseDirectory.value / "utest" / "src-2"
912
Compile / unmanagedSourceDirectories += baseDirectory.value / "utest" / "src-2.13"
10-
Compile / unmanagedSourceDirectories += baseDirectory.value / "utest" / "jvm" / "src"
11-
Compile / unmanagedSourceDirectories += baseDirectory.value / "utest" / "jvm" / "src-2"
13+
Compile / unmanagedSourceDirectories += baseDirectory.value / "utest" / "src-jvm" / "utest"
14+
Compile / unmanagedSourceDirectories += baseDirectory.value / "utest" / "src-2-jvm" / "utest"
1215
Test / unmanagedSourceDirectories += baseDirectory.value / "utest" / "jvm" / "test" / "src"
1316
Test / unmanagedSourceDirectories += baseDirectory.value / "utest" / "test" / "src"
1417
Test / unmanagedSourceDirectories += baseDirectory.value / "utest" / "test" / "src-2"

‎utest/src-2/utest/asserts/Tracer.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ object Tracer{
2727
val $tempName = $tree
2828
$loggerName(utest.TestValue.Single(
2929
${textRange(c)(tree)},
30-
Some(implicitly[utest.shaded.pprint.TPrint[$tpe]].render(utest.shaded.pprint.TPrintColors.Colors)),
30+
Some(implicitly[pprint.TPrint[$tpe]].render(pprint.TPrintColors.Colors)),
3131
$tempName
3232
))
3333
$tempName

‎utest/src-3/utest/asserts/Tracer.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ object Tracer {
120120
val tmp: t = $x
121121
$logger(TestValue.Single(
122122
${Expr(expr.asTerm.pos.sourceCode.get)},
123-
Some(shaded.pprint.TPrint.default[T].render(shaded.pprint.TPrintColors.Colors)),
123+
Some(pprint.TPrint.default[T].render(pprint.TPrintColors.Colors)),
124124
tmp
125125
))
126126
tmp

‎utest/src/utest/BuildInfo.scala‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package utest
2+
3+
object BuildInfo {
4+
val scalaVersion = "2.13"
5+
}

‎utest/src/utest/Errors.scala‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package utest
22

3-
import utest.shaded._
4-
import utest.shaded.fansi.{Attrs, Str}
3+
import fansi.{Attrs, Str}
54

65
//import acyclic.file
76

@@ -108,8 +107,8 @@ object AssertionError {
108107
}
109108

110109
def render(msgPrefix: String, captured: Seq[TestValue], pprinter: AssertionError.Printer) = {
111-
shaded.fansi.Str.join(
112-
Seq[shaded.fansi.Str](msgPrefix) ++
110+
fansi.Str.join(
111+
Seq[fansi.Str](msgPrefix) ++
113112
captured.flatMap{
114113
case x: TestValue.Single =>
115114
Seq[fansi.Str](

‎utest/src/utest/TestRunner.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ object TestRunner {
1515
formatter: Formatter = Formatter,
1616
showSummaryThreshold: Int = 30,
1717
resultsHeader: String = DefaultFormatters.resultsHeader,
18-
failureHeader: String = DefaultFormatters.failureHeader): (utest.shaded.fansi.Str, Int, Int) = {
18+
failureHeader: String = DefaultFormatters.failureHeader): (fansi.Str, Int, Int) = {
1919

2020
val (successes, failures) = results.flatMap(_._2.leaves).partition(_.value.isSuccess)
2121

@@ -25,16 +25,16 @@ object TestRunner {
2525
val frags = for {
2626
(topLevelName, tree) <- results
2727
str <- formatter.formatSummary(topLevelName, tree).toSeq
28-
frag <- Seq[utest.shaded.fansi.Str]("\n", str)
28+
frag <- Seq[fansi.Str]("\n", str)
2929
} yield frag
30-
utest.shaded.fansi.Str.join(frags.drop(1))
30+
fansi.Str.join(frags.drop(1))
3131
},
3232
failureMsg = {
3333
val frags = for{
3434
f <- failures
3535
str <- formatter.formatSingle(Nil, f)
3636
} yield str
37-
utest.shaded.fansi.Str.join(frags)
37+
fansi.Str.join(frags)
3838
},
3939
successes.length,
4040
failures.length,

‎utest/src/utest/framework/DefaultFormatters.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ package framework
44
//import acyclic.file
55

66
object DefaultFormatters{
7-
def formatSummary(resultsHeader: utest.shaded.fansi.Str,
8-
body: utest.shaded.fansi.Str,
9-
failureMsg: utest.shaded.fansi.Str,
7+
def formatSummary(resultsHeader: fansi.Str,
8+
body: fansi.Str,
9+
failureMsg: fansi.Str,
1010
successCount: Int,
1111
failureCount: Int,
12-
showSummaryThreshold: Int): utest.shaded.fansi.Str = {
12+
showSummaryThreshold: Int): fansi.Str = {
1313
val totalCount = successCount + failureCount
14-
val summary: utest.shaded.fansi.Str =
14+
val summary: fansi.Str =
1515
if (totalCount < showSummaryThreshold) ""
16-
else utest.shaded.fansi.Str.join(Seq(
16+
else fansi.Str.join(Seq(
1717
resultsHeader, "\n",
1818
body, "\n",
1919
failureMsg, "\n"
2020
))
21-
utest.shaded.fansi.Str.join(Seq(
21+
fansi.Str.join(Seq(
2222
summary,
2323
s"Tests: ", totalCount.toString, ", ",
2424
s"Passed: ", successCount.toString, ", ",

‎utest/src/utest/framework/Formatter.scala‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ package framework
44

55
import scala.collection.mutable
66
import scala.util.{Failure, Success}
7-
import utest.shaded._
8-
import utest.shaded.fansi.{Attrs, Str}
7+
import fansi.{Attrs, Str}
98

109
object Formatter extends Formatter
1110
/**

‎utest/src/utest/runner/MasterRunner.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ final class MasterRunner(args: Array[String],
5656
body = summaryOutputLines.get.mkString("\n"),
5757
failureMsg =
5858
if (failureOutputLines.get() == Nil) ""
59-
else utest.shaded.fansi.Str(failureHeader) ++ utest.shaded.fansi.Str.join(
59+
else fansi.Str(failureHeader) ++ fansi.Str.join(
6060
// reverse, because the list gets accumulated backwards
61-
failureOutputLines.get().reverse.flatMap(Seq[utest.shaded.fansi.Str]("\n", _))
61+
failureOutputLines.get().reverse.flatMap(Seq[fansi.Str]("\n", _))
6262
),
6363
successCount = success.get(),
6464
failureCount = failure.get(),

‎utest/test/src-2.12-jvm/test/utest/FormatterTests.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ object FormatterTests extends utest.TestSuite {
4242
)
4343

4444
utest.framework.Formatter.formatSummary("MyTestSuite", results).foreach(printStream.println)
45-
val trimmedOutput = trim(utest.shaded.fansi.Str(new String(boa.toByteArray)).plainText)
45+
val trimmedOutput = trim(fansi.Str(new String(boa.toByteArray)).plainText)
4646

4747
// This is very confusing to debug, with all the inner and outer test
4848
// traces being printed everywhere. Easier to paste it into the test `main`
@@ -106,7 +106,7 @@ object FormatterTests extends utest.TestSuite {
106106
printStream = printStream
107107
)
108108
wrappingFormatter.formatSummary("MyTestSuite", results).foreach(printStream.println)
109-
val trimmedOutput = trim(utest.shaded.fansi.Str(new String(boa.toByteArray)).plainText)
109+
val trimmedOutput = trim(fansi.Str(new String(boa.toByteArray)).plainText)
110110

111111
// This is very confusing to debug, with all the inner and outer test
112112
// traces being printed everywhere. Easier to paste it into the test `main`

0 commit comments

Comments
 (0)