Skip to content

Commit aa97fba

Browse files
Tests: support Windows, move to test source set.
1 parent 71d5263 commit aa97fba

33 files changed

+8
-49
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pipeline {
3131

3232
stage('build-java') {
3333
steps {
34-
sh './test-with-asan.sh -Dextensive-tests=true clean build'
34+
sh './test-with-asan.sh -Dextensive-tests=true clean test --tests io.objectbox.FunctionalTestSuite --tests io.objectbox.test.proguard.ObfuscatedEntityTest assemble'
3535
}
3636
}
3737

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ buildscript {
66
ext {
77
isLinux = System.getProperty("os.name").contains("Linux")
88
isMac = !isLinux && System.getProperty("os.name").toLowerCase().contains("mac")
9+
isWin = System.getProperty("os.name").toLowerCase().contains("windows")
910
is64 = System.getProperty("sun.arch.data.model") == "64"
1011
isLinux64 = isLinux && is64
1112
isMac64 = isMac && is64
13+
isWin64 = isWin && is64
1214
}
1315

1416
repositories {

tests/objectbox-java-test/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ dependencies {
1313
compile "io.objectbox:objectbox-linux:${rootProject.version}"
1414
} else if(isMac64) {
1515
compile "io.objectbox:objectbox-macos:${rootProject.version}"
16+
} else if(isWin64) {
17+
compile "io.objectbox:objectbox-windows:${rootProject.version}"
1618
}
1719

18-
// Right now, test sources are in src/main not src/test
19-
compile 'junit:junit:4.12'
20+
testCompile 'junit:junit:4.12'
2021
}
2122

2223
test {

0 commit comments

Comments
 (0)