Update tests for backgroundType rename and split migration methods

Author: Glavo

HMCL/src/main/java/org/jackhuang/hmcl/setting/LegacyConfigMigrator.java

@@ -607,7 +607,8 @@ static void migrateLegacyLanguage(JsonObject json) {
     }
 
     /// Migrates the legacy background image type into the current enum values.
-    private static void migrateLegacyBackgroundImageType(JsonObject json) {
+    @VisibleForTesting
+    static void migrateLegacyBackgroundImageType(JsonObject json) {
         JsonElement legacyValue = json.get("backgroundType");
         @Nullable Integer ordinal = JsonUtils.getInteger(legacyValue);
         if (ordinal != null && ordinal >= 0 && ordinal < LEGACY_BACKGROUND_IMAGE_TYPES.length) {
@@ -623,7 +624,8 @@ private static void migrateLegacyBackgroundImageType(JsonObject json) {
     }
 
     /// Migrates the legacy proxy type ordinal into the current enum value.
-    private static void migrateLegacyProxyType(JsonObject json) {
+    @VisibleForTesting
+    static void migrateLegacyProxyType(JsonObject json) {
         JsonElement legacyValue = json.get("proxyType");
         @Nullable Integer ordinal = JsonUtils.getInteger(legacyValue);
         if (ordinal == null || ordinal < 0 || ordinal >= LEGACY_PROXY_TYPES.length) {

HMCL/src/test/java/org/jackhuang/hmcl/setting/GameDirectoriesTest.java

@@ -281,7 +281,7 @@ public void preservesPatchSchemaAndUnknownFields() throws IOException {
                 GameDirectories::new);
 
         JsonSettingFile.LoadResult<GameDirectories> result = file.load(null);
-        assertTrue(result.allowSave());
+        assertTrue(result.value().isSaveable());
         assertEquals(new JsonSchema("https://schemas.glavo.site/hmcl/game-directories/1.0.1"),
                 result.value().getSchema());
 
@@ -308,7 +308,7 @@ public void rejectsSavingFallbackForMalformedDetachedFile() throws IOException {
 
         JsonSettingFile.LoadResult<GameDirectories> result = file.load(null);
 
-        assertFalse(result.allowSave());
+        assertFalse(result.value().isSaveable());
         assertEquals("{", Files.readString(location));
     }
 

HMCL/src/test/java/org/jackhuang/hmcl/setting/LauncherSettingsMigrationTest.java

@@ -89,17 +89,16 @@ public void migratesLegacyEnumOrdinals() {
                 }
                 """).getAsJsonObject();
 
-        LegacyConfigMigrator.migrateLegacyEnumOrdinals(settings);
+        LegacyConfigMigrator.migrateLegacyBackgroundImageType(settings);
+        LegacyConfigMigrator.migrateLegacyProxyType(settings);
         LauncherSettings launcherSettings = Objects.requireNonNull(LauncherSettings.fromJson(settings));
         JsonObject serialized = JsonParser.parseString(launcherSettings.toJson()).getAsJsonObject();
 
-        assertFalse(settings.has("backgroundType"));
-        assertEquals("NETWORK", settings.get("backgroundImageType").getAsString());
+        assertEquals("NETWORK", settings.get("backgroundType").getAsString());
         assertEquals("SOCKS", settings.get("proxyType").getAsString());
-        assertEquals(EnumBackgroundImage.NETWORK, launcherSettings.backgroundImageTypeProperty().get());
+        assertEquals(EnumBackgroundImage.NETWORK, launcherSettings.backgroundTypeProperty().get());
         assertEquals(Proxy.Type.SOCKS, launcherSettings.proxyTypeProperty().get());
-        assertFalse(serialized.has("backgroundType"));
-        assertEquals("NETWORK", serialized.get("backgroundImageType").getAsString());
+        assertEquals("NETWORK", serialized.get("backgroundType").getAsString());
         assertEquals("SOCKS", serialized.get("proxyType").getAsString());
     }
 
@@ -113,13 +112,13 @@ public void migratesLegacyEnumOrdinalStrings() {
                 }
                 """).getAsJsonObject();
 
-        LegacyConfigMigrator.migrateLegacyEnumOrdinals(settings);
+        LegacyConfigMigrator.migrateLegacyBackgroundImageType(settings);
+        LegacyConfigMigrator.migrateLegacyProxyType(settings);
         LauncherSettings launcherSettings = Objects.requireNonNull(LauncherSettings.fromJson(settings));
 
-        assertFalse(settings.has("backgroundType"));
-        assertEquals("CUSTOM", settings.get("backgroundImageType").getAsString());
+        assertEquals("CUSTOM", settings.get("backgroundType").getAsString());
         assertEquals("DIRECT", settings.get("proxyType").getAsString());
-        assertEquals(EnumBackgroundImage.CUSTOM, launcherSettings.backgroundImageTypeProperty().get());
+        assertEquals(EnumBackgroundImage.CUSTOM, launcherSettings.backgroundTypeProperty().get());
         assertEquals(Proxy.Type.DIRECT, launcherSettings.proxyTypeProperty().get());
     }
 

HMCL/src/test/java/org/jackhuang/hmcl/setting/UserSettingsTest.java

@@ -43,7 +43,7 @@ public void writesCurrentSchema() {
     /// Tests that legacy global config content can be read as current user settings.
     @Test
     public void readsLegacyGlobalConfigFormat() {
-        UserSettings settings = Objects.requireNonNull(UserSettings.fromJson("""
+        String legacyUserConfig = """
                 {
                   "agreementVersion": 1,
                   "terracottaAgreementVersion": 2,
@@ -54,12 +54,15 @@ public void readsLegacyGlobalConfigFormat() {
                   "userJava": ["java-a"],
                   "disabledJava": ["java-b"]
                 }
-                """));
+                """;
+        UserSettings settings = Objects.requireNonNull(UserSettings.fromJson(legacyUserConfig));
+        UserState state = Objects.requireNonNull(UserState.fromJson(legacyUserConfig));
 
         assertEquals(UserSettings.CURRENT_SCHEMA, settings.getSchema());
-        assertEquals(1, settings.agreementVersionProperty().get());
-        assertEquals(2, settings.terracottaAgreementVersionProperty().get());
-        assertEquals(3, settings.platformPromptVersionProperty().get());
+        assertEquals(UserState.CURRENT_SCHEMA, state.getSchema());
+        assertEquals(1, state.agreementVersionProperty().get());
+        assertEquals(2, state.terracottaAgreementVersionProperty().get());
+        assertEquals(3, state.platformPromptVersionProperty().get());
         assertEquals(7, settings.logRetentionProperty().get());
         assertTrue(settings.enableOfflineAccountProperty().get());
         assertEquals("gray", settings.fontAntiAliasingProperty().get());