Removing tests of Jenkins.agentProtocols (#2580)

README.md

@@ -73,8 +73,6 @@ jenkins:
               workDirPath: "/tmp"
 
   slaveAgentPort: 50000
-  agentProtocols:
-    - "jnlp2"
 
 tool:
   git:

demos/external-workspace-manager/README.md

@@ -30,8 +30,6 @@ jenkins:
                     - diskRefId: "localdisk"
                       nodeMountPoint: "/tmp/localdisk"
   slaveAgentPort: 50000
-  agentProtocols:
-    - "jnlp2"
 
 unclassified:
   exwsGlobalConfigurationDiskPools:

plugin/src/main/java/io/jenkins/plugins/casc/Attribute.java

@@ -517,7 +517,6 @@ private void _setValue(Owner target, Type value) throws Exception {
                 o = collection.toArray((Object[]) Array.newInstance(type, collection.size()));
 
                 // if setter expect a Set, convert Collection to Set
-                // see jenkins.agentProtocols
             } else if (c.isAssignableFrom(Set.class)) {
                 o = new HashSet((Collection) value);
             }

plugin/src/test/java/io/jenkins/plugins/casc/UnknownRootElementTest.java

@@ -1,11 +1,9 @@
 package io.jenkins.plugins.casc;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThrows;
 
-import java.util.Set;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -36,7 +34,5 @@ public void twoUnknown() {
     public void ignoreKnownAlias() throws Exception {
         ConfigurationAsCode.get().configure(getClass().getResource("known.yml").toExternalForm());
         assertThat(j.jenkins.getSystemMessage(), is("Configured by Configuration as Code plugin"));
-        Set<String> agentProtocols = j.jenkins.getAgentProtocols();
-        assertThat(agentProtocols, hasSize(2));
     }
 }

plugin/src/test/java/io/jenkins/plugins/casc/yaml/OverrideMergeStrategyTest.java

@@ -3,14 +3,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
 
 import io.jenkins.plugins.casc.CasCGlobalConfig;
 import io.jenkins.plugins.casc.ConfigurationAsCode;
 import io.jenkins.plugins.casc.ConfigurationContext;
 import io.jenkins.plugins.casc.ConfiguratorException;
 import io.jenkins.plugins.casc.ConfiguratorRegistry;
-import java.util.Set;
 import jenkins.model.Jenkins;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -87,14 +85,6 @@ public void sequenceValue() throws ConfiguratorException {
 
         // merge without conflicts
         ConfigurationAsCode.get().configure(sequenceA, sequenceB);
-
-        Set<String> agentProtocals = Jenkins.get().getAgentProtocols();
-        assertTrue(
-                "unexpected sequence merging (missing Ping) with override merge strategy",
-                agentProtocals.contains("Ping"));
-        assertTrue(
-                "unexpected sequence merging (missing JNLP4-connect) with override merge strategy",
-                agentProtocals.contains("JNLP4-connect"));
     }
 
     @Test

plugin/src/test/resources/io/jenkins/plugins/casc/known.yml

@@ -4,6 +4,3 @@ x-alias:
 
 jenkins:
   <<: *message
-  agentProtocols:
-    - JNLP4-connect
-    - Ping

plugin/src/test/resources/io/jenkins/plugins/casc/yaml/conflicts.yml

@@ -5,5 +5,3 @@ jenkins:
         env:
           - key: VARIABLE2
             value: bar
-  agentProtocols:
-    - "jnlp2"

plugin/src/test/resources/io/jenkins/plugins/casc/yaml/normal.yml

@@ -5,5 +5,3 @@ jenkins:
         env:
           - key: VARIABLE1
             value: foo
-  agentProtocols:
-    - "jnlp1"

plugin/src/test/resources/io/jenkins/plugins/casc/yaml/overwrite.yml

@@ -4,5 +4,3 @@ jenkins:
         env:
           - key: VARIABLE2
             value: bar
-  agentProtocols:
-    - "jnlp2"

plugin/src/test/resources/io/jenkins/plugins/casc/yaml/sequence-a.yml

@@ -5,5 +5,3 @@ jenkins:
         env:
           - key: VARIABLE1
             value: foo
-  agentProtocols:
-    - "Ping"

plugin/src/test/resources/io/jenkins/plugins/casc/yaml/sequence-b.yml

@@ -5,5 +5,3 @@ jenkins:
         env:
           - key: VARIABLE1
             value: foo
-  agentProtocols:
-    - "JNLP4-connect"

test-harness/pom.xml

@@ -57,12 +57,6 @@
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>jackson2-api</artifactId>
     </dependency>
-    <!-- Needed for AgentProtocolsTest -->
-    <dependency>
-      <groupId>org.jenkins-ci.modules</groupId>
-      <artifactId>instance-identity</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>