Skip to content

Commit ef3ac1a

Browse files
committed
fixed and re-enabled core-driver-it tests
1 parent 9a5eb82 commit ef3ac1a

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

core-tests/integration-tests/core-driver-it/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
<groupId>org.springdoc</groupId>
3232
<artifactId>springdoc-openapi-ui</artifactId>
3333
</dependency>
34-
<dependency>
35-
<groupId>org.springdoc</groupId>
36-
<artifactId>springdoc-openapi-security</artifactId>
37-
</dependency>
34+
<!-- <dependency>-->
35+
<!-- <groupId>org.springdoc</groupId>-->
36+
<!-- <artifactId>springdoc-openapi-security</artifactId>-->
37+
<!-- </dependency>-->
3838
<dependency>
3939
<groupId>org.springdoc</groupId>
4040
<artifactId>springdoc-openapi-kotlin</artifactId>

core-tests/integration-tests/core-driver-it/src/test/kotlin/com/foo/base/BaseIT.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import org.junit.jupiter.api.Assertions.*
1010
import java.io.File
1111

1212

13-
@Disabled("No CI (Travis, CircleCI and GitHub) likes this test... :( ")
1413
class BaseIT {
1514

1615

@@ -19,25 +18,27 @@ class BaseIT {
1918
private val starter = InstrumentedSutStarter(driver)
2019
private lateinit var remote: RemoteController
2120

21+
2222
private fun setupJarAgent(){
2323

24-
val path = File("../client-java/instrumentation/target").walk()
24+
val folder = File("../../../client-java/instrumentation/target")
25+
if(!folder.exists()){
26+
throw IllegalStateException("Target folder does not exist: ${folder.absolutePath}")
27+
}
28+
29+
val path = folder.walk()
2530
.filter { it.name.endsWith(".jar") }
2631
.find {
2732
it.name.matches(Regex("evomaster-client-java-instrumentation-\\d+\\.\\d+\\.\\d+(-SNAPSHOT)?\\.jar"))
28-
}!!
29-
.absolutePath
33+
}?.absolutePath
34+
?: throw IllegalStateException("evomaster-client-java-instrumentation jar file not found in target folder: ${folder.absolutePath}")
3035

3136
System.setProperty("evomaster.instrumentation.jar.path", path)
3237
}
3338

3439
@JvmStatic
3540
@BeforeAll
3641
fun beforeAll() {
37-
//Travis and CircleCI do not like this test...
38-
CIUtils.skipIfOnTravis()
39-
CIUtils.skipIfOnCircleCI()
40-
4142
setupJarAgent()
4243
driver.controllerPort = 0
4344
starter.start()

core-tests/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
<module>integration-tests</module>
1818
</modules>
1919

20+
<properties>
21+
<springdoc.version>1.6.9</springdoc.version>
22+
</properties>
23+
2024
<dependencyManagement>
2125
<dependencies>
2226
<!-- DropWizard -->

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@
131131
<springboot.version>2.5.4</springboot.version>
132132
<springboot3.version>3.1.5</springboot3.version>
133133
<springfox.version>3.0.0</springfox.version>
134-
<springdoc.version>1.6.9</springdoc.version>
135134
<jetty.version>9.4.29.v20200521</jetty.version>
136135
<slf4j.version>1.7.24</slf4j.version>
137136
<jersey.version>2.33</jersey.version>
@@ -1070,7 +1069,7 @@
10701069
<forkCount>1</forkCount>
10711070
<redirectTestOutputToFile>true</redirectTestOutputToFile>
10721071
<rerunFailingTestsCount>2</rerunFailingTestsCount>
1073-
<argLine>@{argLine} -ea -Xms1024m -Xmx4096m -Djdk.attach.allowAttachSelf=true ${addOpens}</argLine>
1072+
<argLine>@{argLine} -ea -Xms1024m -Xmx4096m -Djdk.attach.allowAttachSelf=true -Duser.language=en -Duser.country=GB ${addOpens}</argLine>
10741073
<useSystemClassLoader>false</useSystemClassLoader>
10751074
</configuration>
10761075
<executions>

0 commit comments

Comments
 (0)