validate button can only work with fields that are defined before, not after

kohsuke · kohsuke · commit de4f7a30eb36 · 2016-03-07T21:28:46.000-08:00
And if someone is testing a setting, cache can be only harmful, so might as well disable that. This also prevents garbage from accumulating
diff --git a/src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java b/src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java
@@ -281,12 +281,11 @@ ACL.SYSTEM, fromUri(defaultIfBlank(apiUrl, GITHUB_URL)).build())
         @SuppressWarnings("unused")
         public FormValidation doVerifyCredentials(
                 @QueryParameter String apiUrl,
-                @QueryParameter String credentialsId,
-                @QueryParameter Integer clientCacheSize) throws IOException {
+                @QueryParameter String credentialsId) throws IOException {
 
             GitHubServerConfig config = new GitHubServerConfig(credentialsId);
             config.setApiUrl(apiUrl);
-            config.setClientCacheSize(clientCacheSize);
+            config.setClientCacheSize(0);
             GitHub gitHub = new GitHubLoginFunction().apply(config);
 
             try {
diff --git a/src/main/resources/org/jenkinsci/plugins/github/config/GitHubServerConfig/config.groovy b/src/main/resources/org/jenkinsci/plugins/github/config/GitHubServerConfig/config.groovy
@@ -19,7 +19,7 @@ f.block() {
             title: _("Test connection"),
             progress: _("Testing..."),
             method: "verifyCredentials",
-            with: "apiUrl,credentialsId,clientCacheSize"
+            with: "apiUrl,credentialsId"
     )
 }
 
diff --git a/src/test/java/org/jenkinsci/plugins/github/internal/GitHubClientCacheCleanupTest.java b/src/test/java/org/jenkinsci/plugins/github/internal/GitHubClientCacheCleanupTest.java
@@ -6,6 +6,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.kohsuke.github.GitHub;
 
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
@@ -101,7 +102,10 @@ private void it(String comment, int count) throws IOException {
     }
 
     private void makeCachedRequestWithCredsId(String credsId) throws IOException {
-        jRule.getInstance().getDescriptorByType(GitHubServerConfig.DescriptorImpl.class)
-                .doVerifyCredentials(github.serverConfig().getApiUrl(), credsId, 1);
+        GitHubServerConfig config = new GitHubServerConfig(credsId);
+        config.setApiUrl(github.serverConfig().getApiUrl());
+        config.setClientCacheSize(1);
+        GitHub gitHub = new GitHubLoginFunction().apply(config);
+        gitHub.getMyself();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ f.block() {`
`19`	`19`	`title: _("Test connection"),`
`20`	`20`	`progress: _("Testing..."),`
`21`	`21`	`method: "verifyCredentials",`
`22`		`- with: "apiUrl,credentialsId,clientCacheSize"`
	`22`	`+ with: "apiUrl,credentialsId"`
`23`	`23`	`)`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import org.junit.Rule;`
`7`	`7`	`import org.junit.Test;`
`8`	`8`	`import org.jvnet.hudson.test.JenkinsRule;`
	`9`	`+import org.kohsuke.github.GitHub;`
`9`	`10`
`10`	`11`	`import java.io.IOException;`
`11`	`12`	`import java.nio.file.DirectoryStream;`
`@@ -101,7 +102,10 @@ private void it(String comment, int count) throws IOException {`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`private void makeCachedRequestWithCredsId(String credsId) throws IOException {`
`104`		`- jRule.getInstance().getDescriptorByType(GitHubServerConfig.DescriptorImpl.class)`
`105`		`- .doVerifyCredentials(github.serverConfig().getApiUrl(), credsId, 1);`
	`105`	`+ GitHubServerConfig config = new GitHubServerConfig(credsId);`
	`106`	`+ config.setApiUrl(github.serverConfig().getApiUrl());`
	`107`	`+ config.setClientCacheSize(1);`
	`108`	`+ GitHub gitHub = new GitHubLoginFunction().apply(config);`
	`109`	`+ gitHub.getMyself();`
`106`	`110`	`}`
`107`	`111`	`}`