Add back in AgentProtocolTest.

Add back what was actually being used and remains.

test/src/test/java/jenkins/AgentProtocolTest.java

+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import javax.annotation.CheckForNull;
+import jenkins.model.Jenkins;
+import org.apache.commons.lang.StringUtils;
+import static org.junit.Assert.fail;
+
+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.recipes.LocalData;
+
+/**
+ * Tests for {@link AgentProtocol}.
+ * 
+ * @author Oleg Nenashev
+ */
+public class AgentProtocolTest {
+    
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+
+    @Test
+    @LocalData
+    @Issue("JENKINS-45841")
+    public void testShouldNotOverrideUserConfiguration() throws Exception {
+        assertEnabled("JNLP-connect", "JNLP3-connect");
+        assertDisabled("JNLP2-connect", "JNLP4-connect");
+        assertProtocols(true, "System protocols should be always enabled", "Ping");
+    }
+    
+    private void assertEnabled(String ... protocolNames) throws AssertionError {
+        assertProtocols(true, null, protocolNames);    
+    }
+    
+    private void assertDisabled(String ... protocolNames) throws AssertionError {
+        assertProtocols(false, null, protocolNames);    
+    }
+    
+    private void assertProtocols(boolean shouldBeEnabled, @CheckForNull String why, String ... protocolNames) {
+        assertProtocols(j.jenkins, shouldBeEnabled, why, protocolNames);
+    }
+    
+    public static void assertProtocols(Jenkins jenkins, boolean shouldBeEnabled, @CheckForNull String why, String ... protocolNames) 
+            throws AssertionError {
+        Set<String> agentProtocols = jenkins.getAgentProtocols();
+        List<String> failedChecks = new ArrayList<>();
+        for (String protocol : protocolNames) {
+            if (shouldBeEnabled && !(agentProtocols.contains(protocol))) {
+                failedChecks.add(protocol);
+            }
+            if (!shouldBeEnabled && agentProtocols.contains(protocol)) {
+                failedChecks.add(protocol);
+            }
+        }
+        
+        if (!failedChecks.isEmpty()) {
+            String message = String.format("Protocol(s) are not %s: %s. %sEnabled protocols: %s",
+                    shouldBeEnabled ? "enabled" : "disabled",
+                    StringUtils.join(failedChecks, ','),
+                    why != null ? "Reason: " + why + ". " : "",
+                    StringUtils.join(agentProtocols, ','));
+            fail(message);
+        }
+    }
+    
+}

test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol.java

+/*
+ * The MIT License
+ *
+ * Copyright (c) 2020 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins;
+
+import hudson.Extension;
+import java.net.Socket;
+import org.jenkinsci.Symbol;
+
+@Extension
+@Symbol("jnlp")
+public class TestJnlpSlaveAgentProtocol extends AgentProtocol {
+
+    @Override
+    public boolean isOptIn() {
+        return true;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return "JNLP-connect";
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "JNLP-connect";
+    }
+
+    @Override
+    public void handle(Socket socket) {
+    }
+
+}

test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol2.java

+/*
+ * The MIT License
+ *
+ * Copyright (c) 2020 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins;
+
+import hudson.Extension;
+import org.jenkinsci.Symbol;
+
+import java.net.Socket;
+
+@Extension
+@Symbol("jnlp2")
+public class TestJnlpSlaveAgentProtocol2 extends AgentProtocol {
+
+    @Override
+    public boolean isOptIn() {
+        return true;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return "JNLP2-connect";
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "JNLP2-connect";
+    }
+
+    @Override
+    public void handle(Socket socket) {
+    }
+
+}

test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol3.java

+/*
+ * The MIT License
+ *
+ * Copyright (c) 2020 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins;
+
+import hudson.Extension;
+import org.jenkinsci.Symbol;
+
+import java.net.Socket;
+
+@Extension
+@Symbol("jnlp3")
+public class TestJnlpSlaveAgentProtocol3 extends AgentProtocol {
+
+    @Override
+    public boolean isOptIn() {
+        return true;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return "JNLP3-connect";
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "JNLP3-connect";
+    }
+
+    @Override
+    public void handle(Socket socket) {
+    }
+
+}

test/src/test/resources/jenkins/AgentProtocolTest/config.xml

+<?xml version='1.0' encoding='UTF-8'?>
+<hudson>
+  <disabledAdministrativeMonitors/>
+  <version>1.0</version>
+  <numExecutors>2</numExecutors>
+  <mode>NORMAL</mode>
+  <useSecurity>true</useSecurity>
+  <authorizationStrategy class="hudson.security.AuthorizationStrategy$Unsecured"/>
+  <securityRealm class="hudson.security.SecurityRealm$None"/>
+  <disableRememberMe>false</disableRememberMe>
+  <projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
+  <workspaceDir>${ITEM_ROOTDIR}/workspace</workspaceDir>
+  <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
+  <markupFormatter class="hudson.markup.EscapedMarkupFormatter"/>
+  <jdks/>
+  <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
+  <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
+  <clouds/>
+  <scmCheckoutRetryCount>0</scmCheckoutRetryCount>
+  <views>
+    <hudson.model.AllView>
+      <owner class="hudson" reference="../../.."/>
+      <name>all</name>
+      <filterExecutors>false</filterExecutors>
+      <filterQueue>false</filterQueue>
+      <properties class="hudson.model.View$PropertyList"/>
+    </hudson.model.AllView>
+  </views>
+  <primaryView>all</primaryView>
+  <slaveAgentPort>0</slaveAgentPort>
+  <!-- YOLO: unstable configuration -->
+  <enabledAgentProtocols>
+    <!-- Since removed, but may as well test robustness of load: -->
+    <string>CLI-connect</string>
+    <string>JNLP-connect</string>
+    <string>JNLP3-connect</string>
+  </enabledAgentProtocols>
+  <disabledAgentProtocols>
+    <string>JNLP4-connect</string>
+    <string>JNLP2-connect</string>
+    <!-- Ditto: -->
+    <string>CLI2-connect</string>
+  </disabledAgentProtocols>
+  <label></label>
+  <nodeProperties/>
+  <globalNodeProperties/>
+</hudson>
\ No newline at end of file