Skip to content

Commit be7e1cf

Browse files
author
Sergey Shelomentsev
committed
fix: functional tests
1 parent d469db7 commit be7e1cf

File tree

4 files changed

+36
-51
lines changed

4 files changed

+36
-51
lines changed

examples/examples.gradle.kts

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
import org.gradle.internal.declarativedsl.parsing.main
2-
import org.gradle.jvm.tasks.Jar
3-
41
val projectVersion: String by project
52

63
group = "com.fingerprint"
74
version = projectVersion
85

96
plugins {
10-
alias(libs.plugins.jvm)
11-
`java-library`
7+
application
8+
java
129
}
1310

1411
repositories {
@@ -24,3 +21,22 @@ tasks.withType<JavaCompile> {
2421
dependencies {
2522
implementation(project(":sdk"))
2623
}
24+
25+
sourceSets {
26+
main {
27+
java {
28+
srcDir("src/main/java")
29+
}
30+
}
31+
}
32+
33+
tasks.register<JavaExec>("runFunctionalTests") {
34+
group = "execute"
35+
description = "Run the Functional Tests"
36+
mainClass = "com.fingerprint.example.FunctionalTests"
37+
classpath = sourceSets["main"].runtimeClasspath
38+
}
39+
40+
tasks.named("runFunctionalTests") {
41+
dependsOn("build")
42+
}

sdk/sdk.gradle.kts

Lines changed: 15 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import org.gradle.internal.declarativedsl.parsing.main
2-
import org.gradle.jvm.tasks.Jar
3-
41
val projectVersion: String by project
52

63
group = "com.fingerprint"
@@ -13,13 +10,6 @@ plugins {
1310
`maven-publish`
1411
}
1512

16-
buildscript {
17-
repositories {
18-
mavenLocal()
19-
mavenCentral()
20-
}
21-
}
22-
2313
repositories {
2414
mavenLocal()
2515
mavenCentral()
@@ -60,21 +50,11 @@ dependencies {
6050
testRuntimeOnly(libs.junit.jupiter.engine)
6151
testImplementation(libs.mockito)
6252
}
63-
//
64-
//test {
65-
// useJUnitPlatform()
66-
//}
67-
//
68-
//javadoc {
69-
// options.tags = [ "http.response.details:a:Http Response Details" ]
70-
//}
71-
//
7253

7354
sourceSets {
7455
main {
7556
java {
7657
srcDir("src/main/java")
77-
srcDir("src/examples/java")
7858
}
7959
}
8060
}
@@ -99,20 +79,16 @@ openApiGenerate {
9979
}
10080

10181
tasks.register<Copy>("copyDocs") {
102-
//dependsOn(openApiGenerate)
103-
dependencies { openApiGenerate }
10482
from(layout.buildDirectory.dir("generated/docs"))
10583
into("docs")
10684
}
10785

10886
tasks.register<Copy>("copyClasses") {
109-
dependsOn(openApiGenerate)
11087
from(layout.buildDirectory.dir("generated/src/main/java"))
11188
into("src/main/java")
11289
}
11390

11491
tasks.register("removeWrongDocumentationLinks") {
115-
dependsOn("copyDocs")
11692
doLast {
11793
fileTree("./docs").files
11894
.filter { it.isFile }
@@ -125,26 +101,19 @@ tasks.register("removeWrongDocumentationLinks") {
125101
}
126102
}
127103

128-
//compileJava.dependsOn tasks.openApiGenerate
129-
// processResources.dependsOn tasks.openApiGenerate
130-
//
131-
132-
//
133-
//tasks.register('copyDocs', Copy) {
134-
// into "docs"
135-
// from layout.buildDirectory.dir("generated/docs")
136-
//}
137-
//copyDocs.dependsOn tasks.openApiGenerate
138-
//
139-
//copyClasses.dependsOn tasks.openApiGenerate
140-
// compileJava.dependsOn tasks.copyClasses
104+
tasks.named("copyDocs") {
105+
dependsOn(tasks.openApiGenerate)
106+
}
107+
tasks.named("copyClasses") {
108+
dependsOn(tasks.openApiGenerate)
109+
}
110+
tasks.named("removeWrongDocumentationLinks") {
111+
dependsOn("copyDocs")
112+
}
113+
tasks.named("build") {
114+
finalizedBy("removeWrongDocumentationLinks")
115+
}
141116

142-
//removeWrongDocumentationLinks.dependsOn tasks.copyDocs
143-
//
144-
// tasks.register('runFunctionalTests', JavaExec) {
145-
// group = "execute"
146-
// description = "Run the Functional Tests"
147-
// classpath = sourceSets.main.runtimeClasspath
148-
// main = 'com.fingerprint.example.FunctionalTests'
149-
// }
150-
//runFunctionalTests.dependsOn tasks.compileJava
117+
tasks.compileJava {
118+
dependsOn(tasks.withType<Copy>())
119+
}

0 commit comments

Comments
 (0)