Let BitbucketEndpointConfigurationTest tolerate Spring Security version of AccessDeniedException (#362)

* Let BitbucketEndpointConfigurationTest tolerate Spring Security version of AccessDeniedException

* Use gitHubRepo

Co-authored-by: Liam Newman <[email protected]>

Author: jglick

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.0-beta-4</version>
+    <version>1.2</version>
   </extension>
 </extensions>

pom.xml

@@ -51,6 +51,7 @@
   <properties>
     <revision>2.9.3</revision>
     <changelist>-SNAPSHOT</changelist>
+    <gitHubRepo>jenkinsci/bitbucket-branch-source-plugin</gitHubRepo>
     <jenkins.version>2.176.4</jenkins.version>
     <java.level>8</java.level>
     <hpi.compatibleSinceVersion>2.0</hpi.compatibleSinceVersion>
@@ -76,9 +77,9 @@
   </developers>
 
   <scm>
-    <connection>scm:git:git://github.com/jenkinsci/bitbucket-branch-source-plugin.git</connection>
-    <developerConnection>scm:git:[email protected]:jenkinsci/bitbucket-branch-source-plugin.git</developerConnection>
-    <url>https://github.com/jenkinsci/bitbucket-branch-source-plugin</url>
+    <connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
+    <developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
+    <url>https://github.com/${gitHubRepo}</url>
     <tag>${scmTag}</tag>
   </scm>
 

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketEndpointConfigurationTest.java

@@ -45,7 +45,6 @@
 import java.util.Collections;
 import java.util.List;
 import jenkins.model.Jenkins;
-import org.acegisecurity.AccessDeniedException;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -110,7 +109,7 @@ public void given__newInstance__when__configuredWithMultipleCloud__then__onlyFir
         assertThat(instance.getEndpoints().get(0).getCredentialsId(), is("first"));
     }
 
-    @Test(expected = AccessDeniedException.class)
+    @Test
     public void given__newInstance__when__configuredAsAnon__then__permissionError() {
         BitbucketEndpointConfiguration instance = new BitbucketEndpointConfiguration();
         j.jenkins.setAuthorizationStrategy(new FullControlOnceLoggedInAuthorizationStrategy());
@@ -121,6 +120,8 @@ public void given__newInstance__when__configuredAsAnon__then__permissionError()
                     new BitbucketCloudEndpoint(true, "third")));
             assertThat(instance.getEndpoints(), contains(instanceOf(BitbucketCloudEndpoint.class)));
             assertThat(instance.getEndpoints().get(0).getCredentialsId(), is("first"));
+        } catch (RuntimeException x) {
+            assertThat(x.getMessage(), is(hudson.security.Messages.AccessDeniedException2_MissingPermission("anonymous", "Overall/Administer")));
         } finally {
             j.jenkins.setAuthorizationStrategy(AuthorizationStrategy.UNSECURED);
         }