Merge "Make test switchable on both env variables and JVM properties"

gerrit-server/src/test/java/com/google/gerrit/testutil/NoteDbMode.java

diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/NoteDbMode.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/NoteDbMode.java
index 8aadb92..259973d 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/testutil/NoteDbMode.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/NoteDbMode.java
@@ -35,17 +35,26 @@
    */
   CHECK;
 
-  private static final String VAR = "GERRIT_NOTEDB";
+  private static final String ENV_VAR = "GERRIT_NOTEDB";
+  private static final String SYS_PROP = "gerrit.notedb";
 
   public static NoteDbMode get() {
-    String value = System.getenv(VAR);
+    String value = System.getenv(ENV_VAR);
+    if (Strings.isNullOrEmpty(value)) {
+      value = System.getProperty(SYS_PROP);
+    }
     if (Strings.isNullOrEmpty(value)) {
       return OFF;
     }
     value = value.toUpperCase().replace("-", "_");
     NoteDbMode mode = Enums.getIfPresent(NoteDbMode.class, value).orNull();
-    checkArgument(mode != null,
-        "Invalid value for %s: %s", VAR, System.getenv(VAR));
+    if (!Strings.isNullOrEmpty(System.getenv(ENV_VAR))) {
+      checkArgument(mode != null, "Invalid value for env variable %s: %s",
+          ENV_VAR, System.getenv(ENV_VAR));
+    } else {
+      checkArgument(mode != null, "Invalid value for system property %s: %s",
+          SYS_PROP, System.getProperty(SYS_PROP));
+    }
     return mode;
   }
 

gerrit-server/src/test/java/com/google/gerrit/testutil/SshMode.java

diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/SshMode.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/SshMode.java
index 9b23ead..bc4e4e9 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/testutil/SshMode.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/SshMode.java
@@ -26,17 +26,26 @@
   /** Tests annotated with UseSsh will be enabled. */
   YES;
 
-  private static final String VAR = "GERRIT_USE_SSH";
+  private static final String ENV_VAR = "GERRIT_USE_SSH";
+  private static final String SYS_PROP = "gerrit.use.ssh";
 
   public static SshMode get() {
-    String value = System.getenv(VAR);
+    String value = System.getenv(ENV_VAR);
+    if (Strings.isNullOrEmpty(value)) {
+      value = System.getProperty(SYS_PROP);
+    }
     if (Strings.isNullOrEmpty(value)) {
       return YES;
     }
     value = value.toUpperCase();
     SshMode mode = Enums.getIfPresent(SshMode.class, value).orNull();
-    checkArgument(mode != null,
-        "Invalid value for %s: %s", VAR, System.getenv(VAR));
+    if (!Strings.isNullOrEmpty(System.getenv(ENV_VAR))) {
+      checkArgument(mode != null, "Invalid value for env variable %s: %s",
+          ENV_VAR, System.getenv(ENV_VAR));
+    } else {
+      checkArgument(mode != null, "Invalid value for system property %s: %s",
+          SYS_PROP, System.getProperty(SYS_PROP));
+    }
     return mode;
   }