From 46f34f31f971d1b0469ce74cfe89e28e4d45481a Mon Sep 17 00:00:00 2001 From: sandtechnology Date: Fri, 31 Jul 2020 00:55:52 +0800 Subject: [PATCH] Fix update checking issue, add unitTest Former-commit-id: d7a3c5b8815b77dac4708cd8a049b9653092e8e2 --- .../org/maxgamer/quickshop/util/Updater.java | 42 ++++++++++++------- src/test/java/util/UpdaterTest.java | 20 +++++++++ 2 files changed, 46 insertions(+), 16 deletions(-) create mode 100644 src/test/java/util/UpdaterTest.java diff --git a/src/main/java/org/maxgamer/quickshop/util/Updater.java b/src/main/java/org/maxgamer/quickshop/util/Updater.java index 0bc97533a..d5bad0067 100644 --- a/src/main/java/org/maxgamer/quickshop/util/Updater.java +++ b/src/main/java/org/maxgamer/quickshop/util/Updater.java @@ -151,29 +151,39 @@ public class Updater { outputStream.close(); } - public synchronized static boolean hasUpdate(String versionNow) { - return hasUpdate(QuickShop.getVersion(), versionNow); + public synchronized static boolean hasUpdate(String versionRemote) { + return hasUpdate(QuickShop.getVersion(), versionRemote); } - public synchronized static boolean hasUpdate(String versionPre, String versionNow) { - if (versionNow == null) { + private static int[] parseStringArray(String[] input, int targetLength) { + int[] result = new int[targetLength]; + for (int i = 0; i < targetLength; i++) { + if (i >= input.length) { + result[i] = 0; + } else { + result[i] = Integer.parseInt(input[i]); + } + } + return result; + } + + public synchronized static boolean hasUpdate(String versionLocal, String versionRemote) { + if (versionRemote == null) { return false; } - if (!versionNow.equals(versionPre)) { - Matcher matcher = pattern.matcher(versionNow); + if (!versionRemote.equals(versionLocal)) { + Matcher matcher = pattern.matcher(versionRemote); if (matcher.find()) { String result = matcher.group(0); if (result != null && !result.isEmpty()) { - String[] now = matcher.group(0).split("\\."); - String[] previous = versionPre.split("\\."); - for (int i = 0; i < now.length; i++) { - if (i < previous.length) { - int nowSub = Integer.parseInt(now[i]); - int preSub = Integer.parseInt(previous[i]); - if (nowSub == preSub) { - continue; - } - return nowSub > preSub; + String[] remote = matcher.group(0).split("\\."); + String[] local = versionLocal.split("\\."); + int maxLength = Math.max(remote.length, local.length); + int[] parsedRemote = parseStringArray(remote, maxLength); + int[] parsedLocal = parseStringArray(local, maxLength); + for (int i = 0; i < parsedRemote.length; i++) { + if (parsedLocal[i] != parsedRemote[i]) { + return parsedRemote[i] > parsedLocal[i]; } } } diff --git a/src/test/java/util/UpdaterTest.java b/src/test/java/util/UpdaterTest.java new file mode 100644 index 000000000..68bae6480 --- /dev/null +++ b/src/test/java/util/UpdaterTest.java @@ -0,0 +1,20 @@ +package util; + + +import org.junit.Assert; +import org.junit.Test; +import org.maxgamer.quickshop.util.Updater; + +public class UpdaterTest { + + @Test + public void TestUpdateVer() { + Assert.assertTrue(Updater.hasUpdate("3", "4")); + Assert.assertFalse(Updater.hasUpdate("3.2.3", "3.2.3")); + Assert.assertTrue(Updater.hasUpdate("3.2.0", "3.2.3")); + Assert.assertTrue(Updater.hasUpdate("3.2.3", "3.2.3.1")); + Assert.assertTrue(Updater.hasUpdate("3.2.3", "3.2.3.0")); + Assert.assertTrue(Updater.hasUpdate("3.2.3.0", "3.2.3.1")); + Assert.assertFalse(Updater.hasUpdate("3.2.3.1.3", "3.2.3.1")); + } +}