From 92eda2faf88b6974ff3b2115935dfd577c1878a2 Mon Sep 17 00:00:00 2001
From: John Niang <johnniang@riseup.net>
Date: Mon, 2 Nov 2020 08:35:40 -0600
Subject: [PATCH] Fix failing tests (#1131)

---
 .../java/run/halo/app/utils/VersionTest.java  |  9 ++++-----
 .../resources/application-test.yaml           | 19 +------------------
 2 files changed, 5 insertions(+), 23 deletions(-)
 rename src/{main => test}/resources/application-test.yaml (64%)

diff --git a/src/test/java/run/halo/app/utils/VersionTest.java b/src/test/java/run/halo/app/utils/VersionTest.java
index 88fe217bb..348ef2b2f 100644
--- a/src/test/java/run/halo/app/utils/VersionTest.java
+++ b/src/test/java/run/halo/app/utils/VersionTest.java
@@ -135,13 +135,12 @@ class VersionTest {
     @Test
     void unknownVersionTest() {
         Optional<Version> unknownVersionOpt = Version.resolve(HaloConst.UNKNOWN_VERSION);
-        assertTrue(unknownVersionOpt.isPresent());
-        assertEquals(new Version(0, 0, 0), unknownVersionOpt.get());
+        assertEquals(new Version(Long.MAX_VALUE, Long.MAX_VALUE, Long.MAX_VALUE), unknownVersionOpt.get());
     }
 
     @Test
     void compareTest() {
-        Version leftVersion = getVersion("1.2.3");
+        final Version leftVersion = getVersion("1.2.3");
         // compare with own
         assertEquals(0, leftVersion.compareTo(leftVersion));
 
@@ -170,8 +169,8 @@ class VersionTest {
         rightVersion = getVersion("1.2.4-alpha.0");
         assertTrue(leftVersion.compareTo(rightVersion) < 0);
 
-        // compare with unkown version
-        assertTrue(leftVersion.compareTo(getVersion(HaloConst.UNKNOWN_VERSION)) > 0);
+        // compare with unknown version
+        assertTrue(leftVersion.compareTo(getVersion(HaloConst.UNKNOWN_VERSION)) < 0);
     }
 
     @NonNull
diff --git a/src/main/resources/application-test.yaml b/src/test/resources/application-test.yaml
similarity index 64%
rename from src/main/resources/application-test.yaml
rename to src/test/resources/application-test.yaml
index 058f12f23..c3a24b5c7 100755
--- a/src/main/resources/application-test.yaml
+++ b/src/test/resources/application-test.yaml
@@ -1,5 +1,4 @@
 server:
-  port: 18090
   forward-headers-strategy: native
   compression:
     enabled: false
@@ -13,25 +12,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     url: jdbc:h2:mem:halo-test
-
-    # H2 Database 配置
-    #    driver-class-name: org.h2.Driver
-    #    url: jdbc:h2:file:~/halo-test/db/halo
-    #    username: admin
-    #    password: 123456
-
-    # MySQL 配置
-  #  driver-class-name: com.mysql.cj.jdbc.Driver
-  #  url: jdbc:mysql://127.0.0.1:3306/halodb?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-  #  username: root
-  #  password: 123456
-
   h2:
     console:
-      settings:
-        web-allow-others: true
-      path: /h2-console
-      enabled: true
+      enabled: false
   jpa:
     hibernate:
       ddl-auto: create-drop