Skip to content

Commit ada039c

Browse files
committed
#1835 adjusted execution tests
Some of them are for some local introspection, not real tests.
1 parent d912a60 commit ada039c

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

src/test/java/org/ice1000/julia/lang/execution/julia-execution-test.kt

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,20 @@ import org.ice1000.julia.lang.executeCommand
2525
import org.ice1000.julia.lang.module.juliaPath
2626
import org.ice1000.julia.lang.module.versionOf
2727
import org.ice1000.julia.lang.shouldBe
28+
import org.junit.Assume.assumeFalse
29+
import org.junit.Assume.assumeTrue
2830
import org.junit.Test
2931
import java.io.File
3032
import java.io.IOException
3133
import java.util.concurrent.TimeUnit
3234
import kotlin.system.measureTimeMillis
3335

36+
37+
private fun assumeMac() = assumeTrue("Mac-only test", SystemInfo.isMac)
38+
private fun assumeNonCI() = assumeTrue("Non CI test", System.getenv("CI").isNullOrBlank())
39+
private fun assumeNotWindows() = assumeFalse("Non-windows-only test", SystemInfo.isWindows)
40+
private fun assumeWindows() = assumeTrue("Windows-only test", SystemInfo.isWindows)
41+
3442
private fun main(args: Array<String>) {
3543
val process = Runtime.getRuntime().exec("$juliaPath -q").also {
3644
//language=Julia
@@ -74,8 +82,7 @@ class ExecutionTest {
7482

7583
@Test
7684
fun testVersion() {
77-
if (System.getenv("CI").isNullOrBlank())
78-
println(versionOf(juliaPath))
85+
println(versionOf(juliaPath))
7986
}
8087

8188
/**
@@ -84,6 +91,7 @@ class ExecutionTest {
8491
*/
8592
@Test(timeout = 5000L)
8693
fun testTimeout() {
94+
assumeNonCI()
8795
measureTimeMillis {
8896
// just test if it will throw exceptions
8997
executeCommand("git clone https://github.com/jetbrains/intellij-community", timeLimit = 500L)
@@ -96,9 +104,8 @@ class ExecutionTest {
96104
class JuliaExecutionTest {
97105
@Test
98106
fun testDocker() {
99-
//Windows
100-
if (!System.getenv("CI").isNullOrBlank()) return
101-
if (!SystemInfo.isWindows) return
107+
assumeNonCI()
108+
assumeWindows()
102109
val winCD = "%CD%"
103110
val unixPWD = "\$PWD"
104111
val currentDir = if (SystemInfo.isWindows) winCD else unixPWD
@@ -115,6 +122,8 @@ class JuliaExecutionTest {
115122

116123
@Test
117124
fun testUnixDocker() {
125+
assumeNonCI()
126+
assumeNotWindows()
118127
val pwd = File(".").absolutePath
119128
val juliaFile = "ParseFunctions.jl"
120129
val containerName = "julia"
@@ -153,9 +162,10 @@ class JuliaConfig {
153162
class JuliaConsoleTest {
154163
@Test
155164
fun testShouldFolding() {
156-
if (!System.getenv("CI").isNullOrBlank()) return
157-
if (!SystemInfo.isMac) return
165+
assumeNonCI()
166+
assumeMac()
158167
val command = "/Applications/Julia-0.6.app/Contents/Resources/julia/bin/julia --check-bounds=no --history-file=no --inline=no --color=no --math-mode=ieee --handle-signals=no --startup-file=no --optimize=0 --compile=yes -q /Users/paul/IdeaProjects/julia-project-test2/src/Jul.jl 23 f jh"
159168
JuliaConsoleFolding().shouldFoldLine(command) shouldBe true
160169
}
161170
}
171+

0 commit comments

Comments
 (0)