Skip to content

Commit

Permalink
Scalafmt
Browse files Browse the repository at this point in the history
  • Loading branch information
raboof committed Oct 31, 2017
1 parent 4ab552f commit 6283df4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package sbt.internal.inc.javac

import sbt.util.{Level, Logger}
import sbt.util.{ Level, Logger }

class CollectingLogger extends Logger {
var messages: Map[Level.Value, Seq[String]] = Map.empty.withDefaultValue(Seq.empty)

override def trace(t: =>Throwable): Unit = ???
override def success(message: =>String): Unit = ???
override def trace(t: => Throwable): Unit = ???
override def success(message: => String): Unit = ???
override def log(level: Level.Value, message: => String): Unit =
synchronized {
messages = messages.updated(level, messages(level) :+ message)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import xsbti.Problem

class CollectingReporter extends Reporter {
var problems: Array[Problem] = Array[Problem]()

def reset() = problems = Array[Problem]()
def hasErrors() = ???
def hasWarnings(): Boolean = ???
def printSummary(): Unit = ???
def log(problem: xsbti.Problem): Unit = problems :+= problem
def comment(pos: xsbti.Position, msg: String): Unit = ???

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,19 @@ class JavaProcessLoggerSpec extends UnitSpec {
val reporter = new CollectingReporter()
val errorLogger = new CollectingLogger()
val javacLogger = new JavacLogger(errorLogger, reporter, cwd = new File("."))
javacLogger.err(Seq("""Test.java:4: cannot find symbol
javacLogger.err(
Seq(
"""Test.java:4: cannot find symbol
|symbol : method baz()
|location: class Foo
|return baz();
| ^
|""", """Test.java:8: warning: [deprecation] RMISecurityException(java.lang.String) in java.rmi.RMISecurityException has been deprecated
|""",
"""Test.java:8: warning: [deprecation] RMISecurityException(java.lang.String) in java.rmi.RMISecurityException has been deprecated
|throw new java.rmi.RMISecurityException("O NOES");
|^
|""").mkString("\n"))
|"""
).mkString("\n"))

javacLogger.flush("javac", 0)

Expand All @@ -42,12 +46,13 @@ class JavaProcessLoggerSpec extends UnitSpec {
|return baz();
| ^
|""")
javacLogger.err("""Test.java:8: warning: [deprecation] RMISecurityException(java.lang.String) in java.rmi.RMISecurityException has been deprecated
javacLogger.err(
"""Test.java:8: warning: [deprecation] RMISecurityException(java.lang.String) in java.rmi.RMISecurityException has been deprecated
|throw new java.rmi.RMISecurityException("O NOES");
|^
|""")

javacLogger.flush("javac", 0)
javacLogger.flush("javac", 0)

errorLogger.messages shouldBe Map.empty
reporter.problems.length shouldBe 2
Expand All @@ -62,7 +67,9 @@ class JavaProcessLoggerSpec extends UnitSpec {
javacLogger.flush("javadoc", -1)

errorLogger.messages(Level.Warn).length shouldBe 2
errorLogger.messages(Level.Warn)(0).contains("javadoc: error - invalid flag: -target") shouldBe true
errorLogger
.messages(Level.Warn)(0)
.contains("javadoc: error - invalid flag: -target") shouldBe true
errorLogger.messages(Level.Warn)(1).contains("javadoc exited with exit code -1") shouldBe true
}
}
}

0 comments on commit 6283df4

Please sign in to comment.