Upgrade to Java 16, add more tests

Author: airsquared

.github/workflows/main.yml

@@ -12,10 +12,10 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 15
+      - name: Set up JDK 16
         uses: actions/setup-java@v1
         with:
-          java-version: '15'
+          java-version: '16'
       - name: gradle build
         uses: eskatos/gradle-command-action@v1
         with:

.idea/compiler.xml

@@ -23,7 +23,8 @@ plugins {
     id 'java'
     id 'application'
     id 'com.github.ben-manes.versions' version '0.38.0'
-    id 'org.beryx.jlink' version '2.23.3'
+    id 'org.beryx.jlink' version '2.23.5'
+    id 'com.dua3.javafxgradle7plugin' version '0.0.9'
 
     id 'idea'
 }
@@ -36,43 +37,30 @@ idea.module.outputDir file("out/production/classes") // fix running via IntelliJ
 version = "2.6"
 description = "A cross-platform GUI app for saving SHSH blobs"
 String appIdentifier = "airsquared.blobsaver.app"
-String copyright = "Copyright (c) 2020 airsquared"
+String copyright = "Copyright (c) 2021 airsquared"
 def os = DefaultNativePlatform.currentOperatingSystem
 
 startScripts.enabled = distZip.enabled = distTar.enabled = false
 
+java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    String fxPlatform = ""
-    if (os.isMacOsX()) fxPlatform = 'mac'
-    else if (os.isWindows()) fxPlatform = 'win'
-    else if (os.isLinux()) fxPlatform = 'linux'
-
-    implementation "org.openjfx:javafx-base:16:$fxPlatform"
-    implementation "org.openjfx:javafx-controls:16:$fxPlatform"
-    implementation "org.openjfx:javafx-graphics:16:$fxPlatform"
-    implementation "org.openjfx:javafx-fxml:16:$fxPlatform"
-
     implementation group: 'org.json', name: 'json', version: '20210307'
     implementation 'de.jangassen:nsmenufx:3.1.0'
-//    implementation 'net.java.dev.jna:jna:jpms:5.7.0'
+    implementation 'net.java.dev.jna:jna:5.7.0:jpms'
     implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.20'
 
-
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
+    testImplementation group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-12.0.1+2'
 }
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(15)
-    }
-}
-
-compileJava {
-    options.compilerArgs = ['--module-path', classpath.asPath]
+javafx {
+    version = '16'
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
 
 application {

.idea/misc.xml

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

.idea/runConfigurations/Main__Linux_.xml

@@ -625,9 +625,8 @@ private TSS createTSS(String runningAlertTitle) {
     }
 
     private void parseException(Throwable t) {
-        if (t instanceof TSS.TSSException) {
-            TSS.TSSException e = (TSS.TSSException) t;
-            String message = t.getMessage();
+        if (t instanceof TSS.TSSException e) {
+            String message = e.getMessage();
             if (message.contains("not a valid identifier")) {
                 identifierField.setEffect(Utils.errorBorder);
             } else if (message.contains("IPSW URL is not valid")) {

.idea/runConfigurations/Main__Windows_.xml

@@ -64,7 +64,7 @@ public static void export(File file) {
     public static void importXML(File file) throws IOException, InvalidPreferencesFormatException {
         Preferences.importPreferences(new FileInputStream(file));
         if (savedDevicesList != null) {
-            savedDevicesList.setAll(savedDevices().collect(Collectors.toList()));
+            savedDevicesList.setAll(savedDevices().toList());
         }
     }
 
@@ -112,22 +112,6 @@ public static boolean getShowOldDevices() {
         return appPrefs.getBoolean("Show Old Devices", false);
     }
 
-    public static Optional<SavedDevice> savedDevice(String name) {
-        if (savedDeviceExists(name)) {
-            return Optional.of(new SavedDevice(name));
-        } else {
-            return Optional.empty();
-        }
-    }
-
-    private static boolean savedDeviceExists(String name) {
-        try {
-            return savedDevicesPrefs.nodeExists(name);
-        } catch (BackingStoreException e) {
-            return false;
-        }
-    }
-
     private static Stream<SavedDevice> savedDevices() {
         try {
             return Arrays.stream(savedDevicesPrefs.childrenNames()).map(SavedDevice::new);
@@ -141,7 +125,7 @@ private static Stream<SavedDevice> savedDevices() {
      */
     public static ObservableList<SavedDevice> getSavedDevices() {
         if (savedDevicesList == null) {
-            savedDevicesList = FXCollections.observableList(savedDevices().collect(Collectors.toList()));
+            savedDevicesList = savedDevices().collect(Collectors.toCollection(FXCollections::observableArrayList));
         }
 
         return savedDevicesList;
@@ -155,10 +139,6 @@ public static boolean anyBackgroundDevices() {
         return savedDevices().anyMatch(SavedDevice::isBackground);
     }
 
-    public static boolean isDeviceInBackground(String name) {
-        return savedDevice(name).map(SavedDevice::isBackground).orElse(false);
-    }
-
     public static void setBackgroundInterval(long interval, TimeUnit timeUnit) {
         appPrefs.putLong("Time to run", interval);
         appPrefs.put("Time unit for background", timeUnit.toString());
@@ -247,7 +227,7 @@ public String toString() {
 
         @Override
         public boolean equals(Object o) {
-            return o instanceof SavedDevice && this.getName().equals(((SavedDevice) o).getName());
+            return o instanceof SavedDevice s && this.getName().equals(s.getName());
         }
 
         @Override