From e559f39697dad8ee44320b092fc7b32c35ac1eb9 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 2 Mar 2015 18:51:55 -0500
Subject: [PATCH] [JENKINS-27188] Picking a better test location for #1590.

---
 test/src/test/java/hudson/model/NodeTest.java    | 15 +++++++++++++++
 .../jenkins/tasks/SimpleBuildWrapperTest.java    | 16 ----------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/test/src/test/java/hudson/model/NodeTest.java b/test/src/test/java/hudson/model/NodeTest.java
index 9ef5016172..63eac12117 100644
--- a/test/src/test/java/hudson/model/NodeTest.java
+++ b/test/src/test/java/hudson/model/NodeTest.java
@@ -23,6 +23,7 @@
  */
 package hudson.model;
 
+import hudson.EnvVars;
 import hudson.FilePath;
 import hudson.model.Node.Mode;
 import hudson.model.Queue.WaitingItem;
@@ -52,6 +53,7 @@ import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.MockQueueItemAuthenticator;
 import org.jvnet.hudson.test.TestExtension;
@@ -238,6 +240,19 @@ public class NodeTest {
         assertNotNull("Slave which is added into Jenkins list nodes should have assigned computer.", slave.toComputer());
     }
     
+    @Issue("JENKINS-27188")
+    @Test public void envPropertiesImmutable() throws Exception {
+        Slave slave = j.createSlave();
+
+        String propertyKey = "JENKINS-27188";
+        EnvVars envVars = slave.getComputer().getEnvironment();
+        envVars.put(propertyKey, "huuhaa");
+        assertTrue(envVars.containsKey(propertyKey));
+        assertFalse(slave.getComputer().getEnvironment().containsKey(propertyKey));
+
+        assertNotSame(slave.getComputer().getEnvironment(), slave.getComputer().getEnvironment());
+    }
+
     @TestExtension
     public static class LabelFinderImpl extends LabelFinder{
 
diff --git a/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java b/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java
index b3ad6c054a..f65cf065c5 100644
--- a/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java
+++ b/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java
@@ -46,14 +46,12 @@ import hudson.tasks.Shell;
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
-
 import org.junit.Test;
 import static org.junit.Assert.*;
 import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 import org.jvnet.hudson.test.CaptureEnvironmentBuilder;
-import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 
@@ -86,20 +84,6 @@ public class SimpleBuildWrapperTest {
         }
     }
 
-    @Issue("JENKINS-27188")
-    @Test public void envPropertiesImmutable() throws Exception {
-        SpecialEnvSlave slave = new SpecialEnvSlave(tmp.getRoot(), r.createComputerLauncher(null));
-        r.jenkins.addNode(slave);
-
-        String propertyKey = "JENKINS-27188";
-        EnvVars envVars = slave.getComputer().getEnvironment();
-        envVars.put(propertyKey, "huuhaa");
-        assertTrue(envVars.containsKey(propertyKey));
-        assertFalse(slave.getComputer().getEnvironment().containsKey(propertyKey));
-
-        assertNotSame(slave.getComputer().getEnvironment(), slave.getComputer().getEnvironment());
-    }
-
     @Test public void envOverrideExpand() throws Exception {
         Assume.assumeFalse(Functions.isWindows());
         FreeStyleProject p = r.createFreeStyleProject();
-- 
GitLab