phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pr-2656

Browse Source
This commit is contained in:
Andreas Dangel
2020-08-20 09:47:16 +02:00
parent f03fab409a 44b5f9ec17
commit 89140d86ce
225 changed files with 4281 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pmd-scala-modules/pmd-scala-common/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd</artifactId>
<version>6.26.0-SNAPSHOT</version>
<version>6.27.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@ -28,6 +28,10 @@
<testResource>
<directory>../pmd-scala-common/src/test/resources</directory>
</testResource>
<!-- Adding kotlin files to test resources, so that checkstyle verifies the license header -->
<testResource>
<directory>../pmd-scala-common/src/test/kotlin</directory>
</testResource>
</testResources>
<pluginManagement>
@ -140,13 +144,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.kotlintest</groupId>
<artifactId>kotlintest-assertions</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.kotlintest</groupId>
<artifactId>kotlintest-core</artifactId>
<groupId>io.kotest</groupId>
<artifactId>kotest-assertions-core-jvm</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@ -156,7 +155,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<artifactId>kotlin-test-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>

6
pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt
View File

@ -4,15 +4,15 @@
package net.sourceforge.pmd.lang.scala.ast
import io.kotlintest.should
import io.kotlintest.specs.AbstractFunSpec
import io.kotest.core.spec.style.FunSpec
import io.kotest.matchers.should
import net.sourceforge.pmd.lang.LanguageRegistry
import net.sourceforge.pmd.lang.ast.Node
import net.sourceforge.pmd.lang.ast.test.matchNode
import net.sourceforge.pmd.lang.ast.test.shouldBe
import java.io.StringReader
class ScalaTreeTests : AbstractFunSpec({
class ScalaTreeTests : FunSpec({
test("Test line/column numbers") {