Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add functional tests for diktat #312

Merged
merged 96 commits into from
Sep 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
b3f1394
Create functional_tests.yml
aktsay6 Sep 21, 2020
f1e5d2e
Update functional_tests.yml
aktsay6 Sep 21, 2020
8149288
Update functional_tests.yml
aktsay6 Sep 21, 2020
a79f312
Update functional_tests.yml
aktsay6 Sep 21, 2020
f045df0
feature/functional-tests-on-diktat
aktsay6 Sep 21, 2020
22f5238
Update functional_tests.yml
aktsay6 Sep 21, 2020
4cb01a2
Update functional_tests.yml
aktsay6 Sep 21, 2020
633918f
Update functional_tests.yml
aktsay6 Sep 21, 2020
02e70aa
Merge remote-tracking branch 'origin/feature/functional-tests-on-dikt…
aktsay6 Sep 21, 2020
4f67fa9
Update functional_tests.yml
aktsay6 Sep 21, 2020
da62c3a
feature/functional-tests-on-diktat
aktsay6 Sep 22, 2020
b18b093
Merge remote-tracking branch 'origin/feature/functional-tests-on-dikt…
aktsay6 Sep 22, 2020
0ccefa8
Update functional_tests.yml
aktsay6 Sep 22, 2020
392a6a3
Update functional_tests.yml
aktsay6 Sep 22, 2020
8d154fa
Update functional_tests.yml
aktsay6 Sep 22, 2020
94a647d
Merge branch 'master' into feature/functional-tests-on-diktat
aktsay6 Sep 22, 2020
957d431
Merge branch 'master' into feature/functional-tests-on-diktat
aktsay6 Sep 22, 2020
5f8cb1d
Update functional_tests.yml
aktsay6 Sep 23, 2020
42d9825
Update functional_tests.yml
aktsay6 Sep 23, 2020
2c58b78
Update functional_tests.yml
aktsay6 Sep 23, 2020
5aa8af3
Update functional_tests.yml
aktsay6 Sep 23, 2020
3f7854a
Update functional_tests.yml
aktsay6 Sep 23, 2020
8f1d9c9
Update functional_tests.yml
aktsay6 Sep 23, 2020
3012116
Update functional_tests.yml
aktsay6 Sep 23, 2020
926d0b5
Update functional_tests.yml
aktsay6 Sep 23, 2020
db6ba92
Update functional_tests.yml
aktsay6 Sep 23, 2020
cbdedaf
Update functional_tests.yml
aktsay6 Sep 23, 2020
80da0ed
Update functional_tests.yml
aktsay6 Sep 23, 2020
b0f0dbc
Update functional_tests.yml
aktsay6 Sep 23, 2020
6ea8d3f
Update functional_tests.yml
aktsay6 Sep 23, 2020
9d9667d
Update functional_tests.yml
aktsay6 Sep 23, 2020
65d31b7
Update functional_tests.yml
aktsay6 Sep 23, 2020
aea86e6
Update functional_tests.yml
aktsay6 Sep 23, 2020
f8897df
Update functional_tests.yml
aktsay6 Sep 23, 2020
3a819d4
Update functional_tests.yml
aktsay6 Sep 23, 2020
11602fe
Update functional_tests.yml
aktsay6 Sep 23, 2020
dae340f
Update functional_tests.yml
aktsay6 Sep 23, 2020
a82a8fe
Update functional_tests.yml
aktsay6 Sep 23, 2020
3c22c11
Update functional_tests.yml
aktsay6 Sep 23, 2020
9516edd
Update functional_tests.yml
aktsay6 Sep 23, 2020
c518bb4
Update functional_tests.yml
aktsay6 Sep 23, 2020
31160c3
Update functional_tests.yml
aktsay6 Sep 23, 2020
b12ea9c
Update functional_tests.yml
aktsay6 Sep 23, 2020
08652a6
Update functional_tests.yml
aktsay6 Sep 23, 2020
8f30eac
Update functional_tests.yml
aktsay6 Sep 23, 2020
e12a813
Update functional_tests.yml
aktsay6 Sep 23, 2020
100143e
Update functional_tests.yml
aktsay6 Sep 23, 2020
d58d21e
Update functional_tests.yml
aktsay6 Sep 23, 2020
ff28062
Update functional_tests.yml
aktsay6 Sep 23, 2020
5a0d9f3
Update functional_tests.yml
aktsay6 Sep 23, 2020
7e25590
Update functional_tests.yml
aktsay6 Sep 23, 2020
86cd41d
Update functional_tests.yml
aktsay6 Sep 23, 2020
a10ca09
Update functional_tests.yml
aktsay6 Sep 23, 2020
facfdc6
Update functional_tests.yml
aktsay6 Sep 23, 2020
74b96a2
Update functional_tests.yml
aktsay6 Sep 23, 2020
34e6b1d
Update functional_tests.yml
aktsay6 Sep 23, 2020
6a45967
Update functional_tests.yml
aktsay6 Sep 23, 2020
a96f67c
Update functional_tests.yml
aktsay6 Sep 23, 2020
d69a78e
Update functional_tests.yml
aktsay6 Sep 23, 2020
8245a25
Update functional_tests.yml
aktsay6 Sep 23, 2020
82dd9bf
Update functional_tests.yml
aktsay6 Sep 23, 2020
adb6378
Update functional_tests.yml
aktsay6 Sep 23, 2020
0b5b808
Update functional_tests.yml
aktsay6 Sep 23, 2020
e269b87
Update functional_tests.yml
aktsay6 Sep 23, 2020
01cf276
Update functional_tests.yml
aktsay6 Sep 23, 2020
5d3388e
Update functional_tests.yml
aktsay6 Sep 23, 2020
c3f3523
Update functional_tests.yml
aktsay6 Sep 23, 2020
2f583d1
Update functional_tests.yml
aktsay6 Sep 23, 2020
c7524a1
Update functional_tests.yml
aktsay6 Sep 23, 2020
e95bef3
Update .github/workflows/functional_tests.yml
aktsay6 Sep 23, 2020
48d9b85
Update functional_tests.yml
aktsay6 Sep 25, 2020
1c39e01
Update functional_tests.yml
aktsay6 Sep 25, 2020
67aa867
Update functional_tests.yml
aktsay6 Sep 25, 2020
467ff6f
Update functional_tests.yml
aktsay6 Sep 25, 2020
e646a10
Update functional_tests.yml
aktsay6 Sep 25, 2020
9ad859b
Update functional_tests.yml
aktsay6 Sep 25, 2020
9a1905d
Update functional_tests.yml
aktsay6 Sep 25, 2020
aee56d7
feature/functional-tests-on-diktat
aktsay6 Sep 25, 2020
bce19fe
Merge remote-tracking branch 'origin/feature/functional-tests-on-dikt…
aktsay6 Sep 25, 2020
1048d2a
feature/functional-tests-on-diktat
aktsay6 Sep 25, 2020
4fd9815
Update functional_tests.yml
aktsay6 Sep 25, 2020
25111e9
Update functional_tests.yml
aktsay6 Sep 25, 2020
3107fb7
Update functional_tests.yml
aktsay6 Sep 25, 2020
c926f8b
Update functional_tests.yml
aktsay6 Sep 25, 2020
504a14e
Update functional_tests.yml
aktsay6 Sep 25, 2020
ccee5f4
Update functional_tests.yml
aktsay6 Sep 25, 2020
b5c0f6b
Update functional_tests.yml
aktsay6 Sep 25, 2020
603de55
Update functional_tests.yml
aktsay6 Sep 25, 2020
043a17d
feature/functional-tests-on-diktat
aktsay6 Sep 25, 2020
d3e1820
Merge remote-tracking branch 'origin/feature/functional-tests-on-dikt…
aktsay6 Sep 25, 2020
664c227
feature/functional-tests-on-diktat
aktsay6 Sep 25, 2020
613e6f5
Merge branch 'master' into feature/functional-tests-on-diktat
aktsay6 Sep 25, 2020
9bc0ed6
feature/functional-tests-on-diktat
aktsay6 Sep 25, 2020
49d0ce3
Update functional_tests.yml
aktsay6 Sep 25, 2020
17a9924
Update functional_tests.yml
aktsay6 Sep 25, 2020
f812d20
feature/functional-tests-on-diktat
aktsay6 Sep 25, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions .github/workflows/functional_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Run functional tests

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

env:
DIKTAT_VERSION: 0.1.0
KTLINT_VERSION: 0.37.1

jobs:
run-functional-tests:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Run diKTat from cli
continue-on-error: true
run: |
cat pom.xml | grep "<diktat-check.version>.*</diktat-check.version>" | head -1 |awk -F'[><]' '{ENVIRON[DIKTAT_VERSION]=$3 ; print ENVIRON[DIKTAT_VERSION]}'
cat pom.xml | grep "<ktlint.version>.*</ktlint.version>" | head -1 |awk -F'[><]' '{ENVIRON[KTLINE_VERSION]=$3 ; print ENVIRON[KTLINE_VERSION]}'
curl -sSLO https://github.com/pinterest/ktlint/releases/download/$KTLINT_VERSION/ktlint && chmod a+x ktlint
curl -sSLO https://github.com/cqfn/diKTat/releases/download/v$DIKTAT_VERSION/diktat-$DIKTAT_VERSION.jar
./ktlint -R diktat-$DIKTAT_VERSION.jar "diktat-rules/src/test/resources/test/funcTest/FunctionalTestFile.kt" > out

- name: Check output
id: cli-check
run: |
cat out
grep -E "[VARIABLE_NAME_INCORRECT_FORMAT]" out

- name: Run diKTat from gradle
continue-on-error: true
run: gradle diktatCheck > out 2> err

- name: Check gradle
run: |
cat out
grep -E "[VARIABLE_NAME_INCORRECT_FORMAT]" out

- name: Run diKTat from maven
continue-on-error: true
run: mvn -B antrun:run@functional-test > out

- name: Check maven
run: |
cat out
grep -E "[VARIABLE_NAME_INCORRECT_FORMAT]" out
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ val diktatCheck by tasks.creating(JavaExec::class) {
main = "com.pinterest.ktlint.Main"

// specify proper path to sources that should be checked here
args = listOf("src/main/kotlin/**/*.kt")
args = listOf("**/src/main/kotlin/**/*.kt", "diktat-rules/src/test/resources/test/funcTest/FunctionalTestFile.kt")
}

val diktatFormat by tasks.creating(JavaExec::class) {
Expand All @@ -40,5 +40,5 @@ val diktatFormat by tasks.creating(JavaExec::class) {
main = "com.pinterest.ktlint.Main"

// specify proper path to sources that should be checked here
args = listOf("-F", "src/main/kotlin/**/*.kt")
args = listOf("-F", "**/src/main/kotlin/**/*.kt", "diktat-rules/src/test/resources/test/funcTest/FunctionalTestFile.kt")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package test.funcTest

class FunctionalTestFile {
val AAAA = 5
}
17 changes: 17 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,23 @@
<goal>run</goal>
</goals>
</execution>

<execution>
<id>functional-test</id>
<phase>none</phase>
<configuration>
<target name="ktlint">
<java taskname="ktlint" dir="${maven.multiModuleProjectDirectory}" fork="true"
failonerror="true"
classpathref="maven.plugin.classpath" classname="com.pinterest.ktlint.Main">
<arg value="${project.basedir}/src/test/resources/test/funcTest/*.kt"/>
</java>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
Expand Down