[#1932] Use System Rules for Java 5-7, and use System Lambda for Java 8+

* System.exit tests
* Environment variable tests

build.gradle

@@ -93,12 +93,10 @@ allprojects {
         testImplementation supportDependencies.jansi
         testImplementation supportDependencies.groovy
 
-        if (!project.name in ['picocli-tests-java8plus']) {
-            testImplementation supportDependencies.junit
-            testImplementation supportDependencies.hamcrestCore
-            testImplementation supportDependencies.systemRules
-            testImplementation supportDependencies.junitParams
-        }
+        testImplementation supportDependencies.junit
+        testImplementation supportDependencies.hamcrestCore
+        testImplementation supportDependencies.systemRules
+        testImplementation supportDependencies.junitParams
     }
     tasks.withType(JavaCompile) {
         options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'

gradle/release-tasks.gradle

@@ -172,6 +172,14 @@ task gatherArtifacts(type: Copy) {
 
 /*
 Release procedure:
+0. Run tests in Java 5:
+    cmd
+    cd picocli-tests-java567
+
+    : now build the project with Java 5, 6 and 7
+    set JAVA_HOME=C:\apps\jdk1.5.0_22
+    gradlew clean build --no-daemon
+
 1. edit version numbers in dependencies.gradle: remove -SNAPSHOT classifier; edit releaseDate
 2. ./gradlew bumpVersion
 3. check modified files

picocli-tests-java567/README.md

@@ -36,7 +36,7 @@ If you have multiple versions of Java installed, then before running this build,
 : (on Windows)
 : start command prompt if we are running in Powershell
 cmd
-cd picocli-legacy-tests
+cd picocli-tests-java567
 
 : now build the project with Java 5, 6 and 7
 set JAVA_HOME=C:\apps\jdk1.5.0_22

picocli-tests-java567/build.gradle

@@ -28,7 +28,7 @@ compileJava.options.encoding = "UTF-8"
 compileTestJava.options.encoding = "UTF-8"
 
 sourceSets.main.java.srcDirs = ['../src/main/java']
-sourceSets.test.java.srcDirs = ['../src/test/java']
+sourceSets.test.java.srcDirs += ['../src/test/java']
 sourceSets.test.resources.srcDirs = ['../src/test/resources']
 sourceSets {
     test {

picocli-tests-java567/src/test/java/picocli/DefaultProviderEnvironmentTestBundle.java

@@ -0,0 +1,16 @@
+package picocli;
+
+import java.util.ListResourceBundle;
+
+/**
+ * Resource bundle for DefaultProviderTest#testDefaultValueProviderWithVariablesResolvesResourceBundle
+ */
+public class DefaultProviderEnvironmentTestBundle extends ListResourceBundle {
+    protected Object[][] getContents() {
+        return new Object[][] {
+            // KEY VALUE PAIRS
+            {"VARIABLE", "789"},
+            // END OF MATERIAL TO LOCALIZE
+        };
+    }
+}

src/test/java/picocli/DefaultProviderTest.java

@@ -2,7 +2,6 @@
 
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.junit.contrib.java.lang.system.ProvideSystemProperty;
 import org.junit.contrib.java.lang.system.RestoreSystemProperties;
 import org.junit.rules.TestRule;
@@ -16,7 +15,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.ListResourceBundle;
 import java.util.Properties;
 
 import static org.junit.Assert.*;
@@ -30,9 +28,6 @@ public class DefaultProviderTest {
     @Rule
     public final ProvideSystemProperty ansiOFF = new ProvideSystemProperty("picocli.ansi", "false");
 
-    @Rule
-    public final EnvironmentVariables envVars = new EnvironmentVariables();
-
     static class TestDefaultProvider implements IDefaultValueProvider {
         public String defaultValue(ArgSpec argSpec) {
             return "Default provider string value";
@@ -416,31 +411,6 @@ class App {
         assertEquals(123, app1.a);
     }
 
-    @Test
-    public void testDefaultValueProviderWithVariablesPrefersSystemPropertyOverEnvVars() {
-        @Command(defaultValueProvider = DefaultProviderWithVariables.class)
-        class App {
-            @Option(names = "-a")
-            int a;
-        }
-        System.setProperty("VARIABLE", "123");
-        envVars.set("VARIABLE", "456");
-        App app1 = CommandLine.populateCommand(new App());
-        assertEquals(123, app1.a);
-    }
-
-    @Test
-    public void testDefaultValueProviderWithVariablesResolvesEnvironmentVariable() {
-        @Command(defaultValueProvider = DefaultProviderWithVariables.class)
-        class App {
-            @Option(names = "-a")
-            int a;
-        }
-        envVars.set("VARIABLE", "456");
-        App app1 = CommandLine.populateCommand(new App());
-        assertEquals(456, app1.a);
-    }
-
     @Test
     public void testDefaultValueProviderWithVariablesResolvesResourceBundle() {
         @Command(defaultValueProvider = DefaultProviderWithVariables.class,
@@ -466,16 +436,4 @@ class App {
         assertEquals(123, app1.a);
     }
 
-    @Test
-    public void testDefaultValueProviderWithVariablesPrefersEnvVarsOverResourceBundle() {
-        @Command(defaultValueProvider = DefaultProviderWithVariables.class,
-            resourceBundle = "picocli.DefaultProviderTestBundle")
-        class App {
-            @Option(names = "-a")
-            int a;
-        }
-        envVars.set("VARIABLE", "456");
-        App app1 = CommandLine.populateCommand(new App());
-        assertEquals(456, app1.a);
-    }
 }