fix broken tests

ikhoon · Oct 22, 2024 · 89745cc · 89745cc
1 parent 3525953
commit 89745cc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/it/zone-leader-plugin/build.gradle b/it/zone-leader-plugin/build.gradle
@@ -3,6 +3,8 @@ dependencies {
     testImplementation libs.curator.test
 }
 
-tasks.withType(Test) {
-    jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED'
+if (project.ext.testJavaVersion >= 16) {
+    tasks.withType(Test) {
+        jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED'
+    }
 }
diff --git a/...p/centraldogma/server/MyZoneProvider.java → ...p/centraldogma/server/MyZoneProvider.java b/...p/centraldogma/server/MyZoneProvider.java → ...p/centraldogma/server/MyZoneProvider.java
@@ -16,7 +16,7 @@
 
 package com.linecorp.centraldogma.server;
 
-class MyZoneProvider implements ZoneProvider {
+final class MyZoneProvider implements ZoneProvider {
 
     @Override
     public String zone(String hostname) {

diff --git a/...centraldogma/server/ZoneResolverTest.java → ...centraldogma/server/ZoneResolverTest.java b/...centraldogma/server/ZoneResolverTest.java → ...centraldogma/server/ZoneResolverTest.java
@@ -29,9 +29,6 @@ void plainText() {
         assertThat(ZoneResolver.resolve(null)).isNull();
     }
 
-    /**
-     * This test should be run with the Gradle runner. It will not work with the IntelliJ runner.
-     */
     @SetEnvironmentVariable(key = "ZONE", value = "ZONE_A")
     @SetEnvironmentVariable(key = "MY_ZONE", value = "ZONE_B")
     @Test