Skip to content

Commit 07f37d0

Browse files
ali-inceali-ince
authored
test: rely on environment variable for tests (#798)
1 parent 05d6043 commit 07f37d0

File tree

18 files changed

+91
-101
lines changed

18 files changed

+91
-101
lines changed

‎.teamcity/builds/Build.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ class Build(
111111

112112
SNYK_PROFILES.forEach { snykProfile ->
113113
dependentBuildType(
114-
SnykTest(id = "$name-snyk-test-${snykProfile.name}",
114+
SnykTest(
115+
id = "$name-snyk-test-${snykProfile.name}",
115116
name = "$name snyk test ${snykProfile.name}",
116-
snykProfile = snykProfile)
117-
)
117+
snykProfile = snykProfile))
118118
}
119119
}
120120

‎.teamcity/builds/Common.kt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,17 @@ enum class Neo4jVersion(val version: String, val dockerImage: String) {
127127
),
128128
}
129129

130-
data class SnykProfile(val name: String, val mavenArgs: String, val dockerImage: String = "snyk/snyk:maven-3-jdk-17")
131-
132-
val SNYK_PROFILES = setOf(
133-
SnykProfile("scala-2-13", "-Pscala-2.13"),
130+
data class SnykProfile(
131+
val name: String,
132+
val mavenArgs: String,
133+
val dockerImage: String = "snyk/snyk:maven-3-jdk-17"
134134
)
135135

136+
val SNYK_PROFILES =
137+
setOf(
138+
SnykProfile("scala-2-13", "-Pscala-2.13"),
139+
)
140+
136141
fun <S, T, Y> Iterable<S>.cartesianProduct(
137142
other1: Collection<T>,
138143
other2: Collection<Y>

‎.teamcity/builds/JavaIntegrationTests.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class JavaIntegrationTests(
3737
maven {
3838
this.goals = "verify"
3939
this.runnerArgs =
40-
"$MAVEN_DEFAULT_ARGS -Djava.version=${javaVersion.version} -Dscala-${scalaVersion.version} -Dneo4j-${neo4jVersion.version} -DskipUnitTests"
40+
"$MAVEN_DEFAULT_ARGS -Djava.version=${javaVersion.version} -Dscala-${scalaVersion.version} -DskipUnitTests"
4141

4242
dockerImagePlatform = MavenBuildStep.ImagePlatform.Linux
4343
dockerImage = javaVersion.dockerImage

‎.teamcity/builds/SnykTest.kt‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
package builds
22

33
import jetbrains.buildServer.configs.kotlin.BuildType
4-
import jetbrains.buildServer.configs.kotlin.ParameterDisplay
54
import jetbrains.buildServer.configs.kotlin.buildFeatures.buildCache
65
import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
76
import jetbrains.buildServer.configs.kotlin.buildSteps.script
87
import jetbrains.buildServer.configs.kotlin.toId
98

10-
class SnykTest(id: String, name: String, snykProfile: SnykProfile) : BuildType(
11-
{
9+
class SnykTest(id: String, name: String, snykProfile: SnykProfile) :
10+
BuildType({
1211
this.id(id.toId())
1312
this.name = name
1413

15-
params {
16-
password("env.SNYK_TOKEN", "%snyk-token%")
17-
}
14+
params { password("env.SNYK_TOKEN", "%snyk-token%") }
1815

1916
steps {
2017
script {
21-
scriptContent = """
18+
scriptContent =
19+
"""
2220
#!/bin/bash
2321
set -eux
2422
snyk test --severity-threshold=high --all-projects --policy-path=. -- ${snykProfile.mavenArgs}
25-
""".trimIndent()
23+
"""
24+
.trimIndent()
2625

2726
dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
2827
dockerImage = snykProfile.dockerImage
@@ -41,5 +40,4 @@ class SnykTest(id: String, name: String, snykProfile: SnykProfile) : BuildType(
4140
}
4241

4342
requirements { runOnLinux(LinuxSize.SMALL) }
44-
}
45-
)
43+
})

‎common/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,12 @@
8585
</dependency>
8686
</dependencies>
8787
<build>
88+
<resources>
89+
<resource>
90+
<filtering>true</filtering>
91+
<directory>src/main/resources</directory>
92+
</resource>
93+
</resources>
8894
<plugins>
8995
<plugin>
9096
<groupId>net.alchim31.maven</groupId>

‎common/src/test/resources/neo4j-spark-connector.properties‎

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

‎common/src/test/scala/org/neo4j/spark/service/Neo4jQueryServiceIT.scala‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,18 @@ import org.apache.spark.sql.connector.expressions.aggregate.Max
2121
import org.apache.spark.sql.connector.expressions.aggregate.Min
2222
import org.apache.spark.sql.connector.expressions.aggregate.Sum
2323
import org.junit.After
24-
import org.junit.Assert
2524
import org.junit.FixMethodOrder
2625
import org.junit.Test
2726
import org.junit.runners.MethodSorters
28-
import org.neo4j.caniuse.Neo4j
29-
import org.neo4j.caniuse.Neo4jDeploymentType
30-
import org.neo4j.caniuse.Neo4jEdition
31-
import org.neo4j.caniuse.Neo4jVersion
3227
import org.neo4j.spark.SparkConnectorScalaSuiteWithGdsBase
3328
import org.neo4j.spark.SparkConnectorScalaSuiteWithGdsBase.neo4j
3429
import org.neo4j.spark.util.DriverCache
3530
import org.neo4j.spark.util.DummyNamedReference
3631
import org.neo4j.spark.util.Neo4jOptions
32+
import org.scalatest.matchers.must.Matchers.convertToAnyMustWrapper
33+
import org.scalatest.matchers.must.Matchers.endWith
34+
35+
import scala.language.postfixOps
3736

3837
@FixMethodOrder(MethodSorters.JVM)
3938
class Neo4jQueryServiceIT extends SparkConnectorScalaSuiteWithGdsBase {
@@ -81,13 +80,12 @@ class Neo4jQueryServiceIT extends SparkConnectorScalaSuiteWithGdsBase {
8180
)
8281
).createQuery()
8382

84-
Assert.assertEquals(
83+
query must endWith(
8584
"""CALL gds.pageRank.stream($graphName)
8685
|YIELD nodeId, score
8786
|RETURN nodeId AS nodeId, max(score) AS `MAX(score)`, min(score) AS `MIN(score)`, count(score) AS `COUNT(score)`, count(DISTINCT score) AS `COUNT(DISTINCT score)`, sum(score) AS `SUM(score)`, sum(DISTINCT score) AS `SUM(DISTINCT score)`"""
8887
.stripMargin
89-
.replaceAll("\n", " "),
90-
query
88+
.replaceAll("\n", " ")
9189
)
9290
}
9391

‎pom.xml‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -203,18 +203,6 @@
203203
</dependencies>
204204
</dependencyManagement>
205205
<build>
206-
<resources>
207-
<resource>
208-
<filtering>true</filtering>
209-
<directory>src/main/resources</directory>
210-
</resource>
211-
</resources>
212-
<testResources>
213-
<testResource>
214-
<filtering>true</filtering>
215-
<directory>src/test/resources</directory>
216-
</testResource>
217-
</testResources>
218206
<pluginManagement>
219207
<plugins>
220208
<plugin>
@@ -569,32 +557,6 @@
569557
<!-- end scala profiles -->
570558
<!-- spark profiles -->
571559
<!-- end spark profiles -->
572-
<!-- neo4j profiles -->
573-
<profile>
574-
<id>neo4j-4.4</id>
575-
<activation>
576-
<property>
577-
<name>neo4j-4</name>
578-
</property>
579-
</activation>
580-
<properties>
581-
<neo4j.experimental>false</neo4j.experimental>
582-
<neo4j.version>4.4.34</neo4j.version>
583-
</properties>
584-
</profile>
585-
<profile>
586-
<id>neo4j-5</id>
587-
<activation>
588-
<property>
589-
<name>!neo4j-4</name>
590-
</property>
591-
</activation>
592-
<properties>
593-
<neo4j.experimental>false</neo4j.experimental>
594-
<neo4j.version>5.20.0</neo4j.version>
595-
</properties>
596-
</profile>
597-
<!-- end neo4j profiles -->
598560
<profile>
599561
<id>has-sources</id>
600562
<activation>

‎spark-3/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@
6565
</dependency>
6666
</dependencies>
6767
<build>
68+
<resources>
69+
<resource>
70+
<filtering>true</filtering>
71+
<directory>src/main/resources</directory>
72+
</resource>
73+
</resources>
6874
<plugins>
6975
<plugin>
7076
<groupId>net.alchim31.maven</groupId>

‎spark-3/src/test/resources/neo4j-spark-connector.properties‎

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

0 commit comments

Comments
 (0)