Skip to content
This repository was archived by the owner on Feb 19, 2020. It is now read-only.

Commit 3ebc1e9

Browse files
committed
fixes for offline XML parsing and verbose logging
1 parent 259943d commit 3ebc1e9

File tree

8 files changed

+38
-30
lines changed

8 files changed

+38
-30
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Dependencies._
22

33
name := "sbt-codacy-coverage"
44

5-
version := "1.0.0"
5+
version := "1.0.1"
66

77
scalaVersion := "2.10.4"
88

project/Dependencies.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import sbt._
22

33
object Dependencies {
44

5-
lazy val playJson = "com.typesafe.play" %% "play-json" % "2.3.6"
6-
lazy val playWs = "com.typesafe.play" %% "play-ws" % "2.3.6"
7-
lazy val jGit = "org.eclipse.jgit" % "org.eclipse.jgit" % "3.4.1.201406201815-r"
8-
lazy val scalaTest = "org.scalatest" %% "scalatest" % "2.2.1" % "test"
5+
lazy val playJson = "com.typesafe.play" %% "play-json" % "2.3.7"
6+
lazy val playWs = "com.typesafe.play" %% "play-ws" % "2.3.7"
7+
lazy val jGit = "org.eclipse.jgit" % "org.eclipse.jgit" % "3.6.2.201501210735-r"
8+
lazy val scalaTest = "org.scalatest" %% "scalatest" % "2.2.4" % "test"
99

1010
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.6
1+
sbt.version=0.13.7

project/plugins.sbt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import sbt._
22

3-
ivyLoggingLevel := UpdateLogging.Full
4-
5-
logLevel := sbt.Level.Error
6-
73
resolvers ++= Seq(
84
DefaultMavenRepository,
95
"Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/",
@@ -12,12 +8,8 @@ resolvers ++= Seq(
128
Classpaths.sbtPluginReleases
139
)
1410

15-
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
16-
17-
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")
18-
1911
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
2012

2113
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
2214

23-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.6")
15+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.8")

src/main/resources/logback-test.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<configuration>
2+
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<!-- encoders are assigned the type
5+
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
6+
<encoder>
7+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
8+
</encoder>
9+
</appender>
10+
11+
<root level="error">
12+
<appender-ref ref="STDOUT"/>
13+
</root>
14+
</configuration>

src/main/resources/logback.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/main/scala/com/codacy/parsers/CoberturaParser.scala

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,21 @@ import java.io.File
44

55
import com.codacy.api.{CodacyCoverageFileReport, CodacyCoverageReport}
66

7-
import scala.xml.{Node, XML}
7+
import scala.xml.factory.XMLLoader
8+
import scala.xml.{SAXParser, Elem, Node}
9+
10+
object XML extends XMLLoader[Elem] {
11+
override def parser: SAXParser = {
12+
val f = javax.xml.parsers.SAXParserFactory.newInstance()
13+
f.setNamespaceAware(false)
14+
f.setValidating(false)
15+
f.setFeature("http://xml.org/sax/features/namespaces", false)
16+
f.setFeature("http://xml.org/sax/features/validation", false)
17+
f.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false)
18+
f.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
19+
f.newSAXParser()
20+
}
21+
}
822

923
class CoberturaParser(coberturaFile: File, rootProject: File) {
1024

src/test/scala/com/codacy/parsers/CoberturaReaderTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import scala.collection.mutable.ArrayBuffer
88

99
class CoberturaReaderTest extends WordSpec with BeforeAndAfterAll with Matchers {
1010

11-
val reader = new CoberturaParser(new File("src/test/resources/test_cobertura.xml"), new File(""), new File(""))
11+
val reader = new CoberturaParser(new File("src/test/resources/test_cobertura.xml"), new File(""))
1212

1313
"CoberturaReader" when {
1414
"reading a Cobertura file" should {
@@ -19,7 +19,7 @@ class CoberturaReaderTest extends WordSpec with BeforeAndAfterAll with Matchers
1919
fileReport.fileReports.map(_.filename).head should endWith("src/test/resources/TestSourceFile.scala")
2020
fileReport.fileReports.map(_.total).head should equal(87)
2121
fileReport.fileReports.map(_.coverage) should equal(
22-
ArrayBuffer(Map("4" -> 1, "9" -> 1, "5" -> 1, "10" -> 1, "6" -> 2), Map("1" -> 1, "2" -> 1, "3" -> 1))
22+
ArrayBuffer(Map(4 -> 1, 9 -> 1, 5 -> 1, 10 -> 1, 6 -> 2), Map(1 -> 1, 2 -> 1, 3 -> 1))
2323
)
2424
}
2525

0 commit comments

Comments
 (0)