merged with origin

scala/src/test/scala/com/gildedrose/GildedRoseApprovalTest.scala

@@ -1,32 +1,38 @@
 package com.gildedrose
 
-import org.scalatest.flatspec.AnyFlatSpec
+import org.approvaltests.Approvals
-import org.scalatest.matchers.should.Matchers
+import org.approvaltests.reporters.DiffReporter
+import org.approvaltests.reporters.UseReporter
+import org.junit.jupiter.api.Test
 
-import java.io.{File, FileOutputStream}
+import java.io.ByteArrayInputStream
-import scala.io.Source
+import java.io.ByteArrayOutputStream
+import java.io.PrintStream
 
-class GildedRoseApprovalTest extends AnyFlatSpec with Matchers {
+@UseReporter(Array(classOf[DiffReporter]))
-  it should "return the result of the golden master" in {
+class GildedRoseApprovalTest {
-    val fileWithTestResult = new File("approvaltests/gildedrose.testresult.txt")
-    val outputStream       = new FileOutputStream(fileWithTestResult)
-    Console.withOut(outputStream) {
 
-      TexttestFixture.main(Array("30"))
+  @Test
-    }
+  def foo(): Unit = {
 
-    val approvedFile          = "approvaltests/gildedrose.approved.txt"
+    val items: Array[Item] = Array(Item("foo", 0, 0))
-    val sourceForTestResults  = Source.fromFile(fileWithTestResult)
+    val app: GildedRose    = new GildedRose(items)
-    val sourceForApprovedFile = Source.fromFile(approvedFile)
+    app.updateQuality()
 
-    val resultingOutput =
+    Approvals.verifyAll("Items", items)
-      try sourceForTestResults.getLines().toVector
-      finally sourceForTestResults.close()
-    val approvedOutput =
-      try sourceForApprovedFile.getLines().toVector
-      finally sourceForTestResults.close()
-
-    resultingOutput should equal(approvedOutput)
   }
 
+  @Test
+  def thirtyDays(): Unit = {
+
+    val fakeoutput: ByteArrayOutputStream = new ByteArrayOutputStream()
+    System.setOut(new PrintStream(fakeoutput))
+    System.setIn(new ByteArrayInputStream("a\n".getBytes()))
+
+    val args: Array[String] = Array("30")
+    TexttestFixture.main(args)
+    val output: String = fakeoutput.toString()
+
+    Approvals.verify(output)
+  }
 }

scala/src/test/scala/com/gildedrose/TexttestFixture.scala

@@ -1,7 +1,6 @@
 package com.gildedrose
 
 object TexttestFixture {
-  @main
   def main(args: Array[String]): Unit = {
     System.out.println("OMGHAI!")