diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java index feed89aa8f..42790ea7a4 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java @@ -110,7 +110,7 @@ public class GitConfigResourceTest { @Test @SubjectAware(username = "writeOnly") - public void shouldGetConfigOnlyWhenAuthorized() throws URISyntaxException { + public void shouldNotGetConfigWhenNotAuthorized() throws URISyntaxException { thrown.expectMessage("Subject does not have permission [configuration:read:git]"); get(); @@ -125,7 +125,7 @@ public class GitConfigResourceTest { @Test @SubjectAware(username = "readOnly") - public void shouldUpdateConfigOnlyWhenAuthorized() throws URISyntaxException, IOException { + public void shouldNotUpdateConfigWhenNotAuthorized() throws URISyntaxException, IOException { thrown.expectMessage("Subject does not have permission [configuration:write:git]"); put(); diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigAutoConfigurationResourceTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigAutoConfigurationResourceTest.java index 0c766eb4e6..4b66444bbe 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigAutoConfigurationResourceTest.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigAutoConfigurationResourceTest.java @@ -23,9 +23,7 @@ import javax.inject.Provider; import javax.servlet.http.HttpServletResponse; import java.net.URISyntaxException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -77,7 +75,7 @@ public class HgConfigAutoConfigurationResourceTest { @Test @SubjectAware(username = "readOnly") - public void shouldSetDefaultConfigAndInstallHgOnlyWhenAuthorized() throws Exception { + public void shouldNotSetDefaultConfigAndInstallHgWhenNotAuthorized() throws Exception { thrown.expectMessage("Subject does not have permission [configuration:write:hg]"); put(null); @@ -96,7 +94,7 @@ public class HgConfigAutoConfigurationResourceTest { @Test @SubjectAware(username = "readOnly") - public void shouldUpdateConfigAndInstallHgOnlyWhenAuthorized() throws Exception { + public void shouldNotUpdateConfigAndInstallHgWhenNotAuthorized() throws Exception { thrown.expectMessage("Subject does not have permission [configuration:write:hg]"); put("{\"disabled\":true}"); diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsResourceTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsResourceTest.java index f2fe4165f9..540a5b6757 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsResourceTest.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsResourceTest.java @@ -81,7 +81,7 @@ public class HgConfigInstallationsResourceTest { @Test @SubjectAware(username = "writeOnly") - public void shouldGetHgInstallationsOnlyWhenAuthorized() throws Exception { + public void shouldNotGetHgInstallationsWhenNotAuthorized() throws Exception { thrown.expectMessage("Subject does not have permission [configuration:read:hg]"); get("hg"); @@ -103,7 +103,7 @@ public class HgConfigInstallationsResourceTest { @Test @SubjectAware(username = "writeOnly") - public void shouldGetPythonInstallationsOnlyWhenAuthorized() throws Exception { + public void shouldNotGetPythonInstallationsWhenNotAuthorized() throws Exception { thrown.expectMessage("Subject does not have permission [configuration:read:hg]"); get("python"); diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackageResourceTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackageResourceTest.java index a2ae6739eb..044897ad80 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackageResourceTest.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackageResourceTest.java @@ -112,7 +112,7 @@ public class HgConfigPackageResourceTest { @Test @SubjectAware(username = "writeOnly") - public void shouldGetPackagesOnlyWhenAuthorized() throws Exception { + public void shouldNotGetPackagesWhenNotAuthorized() throws Exception { thrown.expectMessage("Subject does not have permission [configuration:read:hg]"); get(); @@ -157,7 +157,7 @@ public class HgConfigPackageResourceTest { @Test @SubjectAware(username = "readOnly") - public void shouldInstallPackageOnlyWhenAuthorized() throws Exception { + public void shouldNotInstallPackageWhenNotAuthorized() throws Exception { thrown.expectMessage("Subject does not have permission [configuration:write:hg]"); put("don-t-care"); diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java index c655e8433a..11a0fb55f9 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java @@ -121,7 +121,7 @@ public class HgConfigResourceTest { @Test @SubjectAware(username = "writeOnly") - public void shouldGetConfigOnlyWhenAuthorized() throws URISyntaxException { + public void shouldNotGetConfigWhenNotAuthorized() throws URISyntaxException { thrown.expectMessage("Subject does not have permission [configuration:read:hg]"); get(); @@ -136,7 +136,7 @@ public class HgConfigResourceTest { @Test @SubjectAware(username = "readOnly") - public void shouldUpdateConfigOnlyWhenAuthorized() throws URISyntaxException { + public void shouldNotUpdateConfigWhenNotAuthorized() throws URISyntaxException { thrown.expectMessage("Subject does not have permission [configuration:write:hg]"); put(); diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigResourceTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigResourceTest.java index 6c0601f977..de4d654910 100644 --- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigResourceTest.java +++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigResourceTest.java @@ -109,7 +109,7 @@ public class SvnConfigResourceTest { @Test @SubjectAware(username = "writeOnly") - public void shouldGetConfigOnlyWhenAuthorized() throws URISyntaxException { + public void shouldNotGetConfigWhenNotAuthorized() throws URISyntaxException { thrown.expectMessage("Subject does not have permission [configuration:read:svn]"); get(); @@ -124,7 +124,7 @@ public class SvnConfigResourceTest { @Test @SubjectAware(username = "readOnly") - public void shouldUpdateConfigOnlyWhenAuthorized() throws URISyntaxException { + public void shouldNotUpdateConfigWhenNotAuthorized() throws URISyntaxException { thrown.expectMessage("Subject does not have permission [configuration:write:svn]"); put(); diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java index 2a8a44b4d1..ff97ca332b 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java @@ -21,9 +21,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import static org.mockito.MockitoAnnotations.initMocks; @SubjectAware( @@ -72,7 +70,7 @@ public class ConfigResourceTest { @Test @SubjectAware(username = "writeOnly") - public void shouldGetConfigOnlyWhenAuthorized() throws URISyntaxException { + public void shouldNotGetConfigWhenNotAuthorized() throws URISyntaxException { MockHttpRequest request = MockHttpRequest.get("/" + ConfigResource.CONFIG_PATH_V2); MockHttpResponse response = new MockHttpResponse(); @@ -104,7 +102,7 @@ public class ConfigResourceTest { @Test @SubjectAware(username = "readOnly") - public void shouldUpdateConfigOnlyWhenAuthorized() throws URISyntaxException, IOException { + public void shouldNotUpdateConfigWhenNotAuthorized() throws URISyntaxException, IOException { URL url = Resources.getResource("sonia/scm/api/v2/config-test-update.json"); byte[] configJson = Resources.toByteArray(url); MockHttpRequest request = MockHttpRequest.put("/" + ConfigResource.CONFIG_PATH_V2)