Use assertpy in integration tests

So that when assertions fail, we get more information about how.

Author: ctrueden

tests/it/awt.py

@@ -7,11 +7,14 @@
 
 import scyjava
 
+from assertpy import assert_that
+
 if platform.system() == "Darwin":
     # NB: This test would hang on macOS, due to AWT threading issues.
     sys.exit(0)
 
-assert not scyjava.jvm_started()
+assert_that(scyjava.jvm_started()).is_false()
+
 scyjava.start_jvm()
 
 if scyjava.is_jvm_headless():
@@ -21,9 +24,9 @@
     # In that case, we are not able to perform this test.
     sys.exit(0)
 
-assert not scyjava.is_awt_initialized()
+assert_that(scyjava.is_awt_initialized()).is_false()
 
 Frame = scyjava.jimport("java.awt.Frame")
 f = Frame()
 
-assert scyjava.is_awt_initialized()
+assert_that(scyjava.is_awt_initialized()).is_true()

tests/it/headless.py

@@ -4,16 +4,15 @@
 
 import scyjava
 
+from assertpy import assert_that
+
 scyjava.config.enable_headless_mode()
 
-assert not scyjava.jvm_started()
+assert_that(scyjava.jvm_started()).is_false()
 scyjava.start_jvm()
-
-assert scyjava.is_jvm_headless()
+assert_that(scyjava.is_jvm_headless()).is_true()
 
 Frame = scyjava.jimport("java.awt.Frame")
-try:
-    f = Frame()
-    assert False, "HeadlessException should have occurred"
-except Exception as e:
-    assert "java.awt.HeadlessException" == str(e)
+assert_that(Frame).raises(Exception).when_called_with().is_equal_to(
+    "java.awt.HeadlessException"
+)

tests/it/java_heap.py

@@ -2,20 +2,21 @@
 Test scyjava JVM memory-related functions.
 """
 
-from assertpy import assert_that
-
 import scyjava
 
+from assertpy import assert_that
+
 mb_initial = 50  # initial MB of memory to snarf up
 mb_tolerance = 10  # ceiling of expected MB in use
 
 scyjava.config.set_heap_min(mb=mb_initial)
 scyjava.config.set_heap_max(gb=1)
 
-assert not scyjava.jvm_started()
+assert_that(scyjava.jvm_started()).is_false()
+
 scyjava.start_jvm()
 
-assert scyjava.available_processors() >= 1
+assert_that(scyjava.available_processors()).is_greater_than_or_equal_to(1)
 
 mb_max = scyjava.memory_max() // 1024 // 1024
 mb_total = scyjava.memory_total() // 1024 // 1024

tests/it/jvm_version.py

@@ -4,19 +4,21 @@
 
 import scyjava
 
-assert not scyjava.jvm_started()
+from assertpy import assert_that
+
+assert_that(scyjava.jvm_started()).is_false()
 
 before_version = scyjava.jvm_version()
-assert before_version is not None
-assert len(before_version) >= 3
-assert before_version[0] > 0
+assert_that(before_version).is_not_none()
+assert_that(len(before_version)).is_greater_than_or_equal_to(3)
+assert_that(before_version[0]).is_greater_than(0)
 
 scyjava.config.enable_headless_mode()
 scyjava.start_jvm()
 
 after_version = scyjava.jvm_version()
-assert after_version is not None
-assert len(after_version) >= 3
-assert after_version[0] > 0
+assert_that(after_version).is_not_none()
+assert_that(len(after_version)).is_greater_than_or_equal_to(3)
+assert_that(after_version[0]).is_greater_than(0)
 
-assert before_version == after_version
+assert_that(before_version).is_equal_to(after_version)

tests/it/script_scope.py

@@ -6,6 +6,8 @@
 
 import scyjava
 
+from assertpy import assert_that
+
 scyjava.config.endpoints.extend(
     ["org.scijava:scijava-common:2.94.2", "org.scijava:scripting-python:MANAGED"]
 )
@@ -23,7 +25,8 @@
 # Assert that the Python script language is available.
 ss = ctx.service("org.scijava.script.ScriptService")
 lang = ss.getLanguageByName("Python")
-assert lang is not None and "Python" in lang.getNames()
+assert_that(lang).is_not_none()
+assert_that(lang.getNames()).contains("Python")
 
 # Construct a script.
 script = """
@@ -58,5 +61,5 @@ def calculate_cbrt(age):
         sys.stderr.write(f"{trace}\n")
     raise e
 
-assert statement == "2"
-assert return_value == "The rounded cube root of my age is 2"
+assert_that(statement).is_equal_to("2")
+assert_that(return_value).is_equal_to("The rounded cube root of my age is 2")

tests/it/scripting.py

@@ -9,6 +9,8 @@
 
 import scyjava
 
+from assertpy import assert_that
+
 scyjava.config.endpoints.extend(
     ["org.scijava:scijava-common:2.94.2", "org.scijava:scripting-python:MANAGED"]
 )
@@ -26,7 +28,8 @@
 # Assert that the Python script language is available.
 ss = ctx.service("org.scijava.script.ScriptService")
 lang = ss.getLanguageByName("Python")
-assert lang is not None and "Python" in lang.getNames()
+assert_that(lang).is_not_none()
+assert_that(lang.getNames()).contains("Python")
 
 # Construct a script.
 script = """
@@ -55,5 +58,7 @@
         sys.stderr.write(f"{trace}\n")
     raise e
 
-assert statement == "Hello, Chuckles! In one year you will be 14 years old."
-assert return_value == "A wild return value appears!"
+assert_that(statement).is_equal_to(
+    "Hello, Chuckles! In one year you will be 14 years old."
+)
+assert_that(return_value).is_equal_to("A wild return value appears!")