diff --git a/scm-webapp/src/test/java/sonia/scm/security/GroupCollectorTest.java b/scm-webapp/src/test/java/sonia/scm/security/GroupCollectorTest.java index 57f0362549..e366b15b50 100644 --- a/scm-webapp/src/test/java/sonia/scm/security/GroupCollectorTest.java +++ b/scm-webapp/src/test/java/sonia/scm/security/GroupCollectorTest.java @@ -1,10 +1,10 @@ /** * Copyright (c) 2014, Sebastian Sdorra * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, @@ -13,7 +13,7 @@ * 3. Neither the name of SCM-Manager; nor the names of its * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,20 +24,15 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * http://bitbucket.org/sdorra/scm-manager - * + * */ package sonia.scm.security; import com.google.common.collect.ImmutableSet; -import java.util.Set; -import jdk.nashorn.internal.ir.annotations.Immutable; import org.junit.Test; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; -import static org.hamcrest.Matchers.*; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; @@ -47,9 +42,15 @@ import sonia.scm.group.GroupManager; import sonia.scm.user.UserTestData; import sonia.scm.web.security.AuthenticationResult; +import java.util.Set; + +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.junit.Assert.assertThat; +import static org.mockito.Mockito.when; + /** * Unit tests for {@link GroupCollector}. - * + * * @author Sebastian Sdorra * @since 1.52 */ @@ -58,10 +59,10 @@ public class GroupCollectorTest { @Mock private GroupManager groupManager; - + @InjectMocks private GroupCollector collector; - + /** * Tests {@link GroupCollector#collectGroups(AuthenticationResult)} without groups from authenticator. */ @@ -70,7 +71,7 @@ public class GroupCollectorTest { Set groups = collector.collectGroups(new AuthenticationResult(UserTestData.createSlarti())); assertThat(groups, containsInAnyOrder("_authenticated")); } - + /** * Tests {@link GroupCollector#collectGroups(AuthenticationResult)} with groups from authenticator. */ @@ -80,7 +81,7 @@ public class GroupCollectorTest { Set groups = collector.collectGroups(new AuthenticationResult(UserTestData.createSlarti(), authGroups)); assertThat(groups, containsInAnyOrder("_authenticated", "puzzle42")); } - + /** * Tests {@link GroupCollector#collectGroups(AuthenticationResult)} with groups from db. */ @@ -91,7 +92,7 @@ public class GroupCollectorTest { Set groups = collector.collectGroups(new AuthenticationResult(UserTestData.createSlarti())); assertThat(groups, containsInAnyOrder("_authenticated", "puzzle42")); } - + /** * Tests {@link GroupCollector#collectGroups(AuthenticationResult)} with groups from db. */ @@ -104,4 +105,4 @@ public class GroupCollectorTest { assertThat(groups, containsInAnyOrder("_authenticated", "puzzle42", "heartOfGold")); } -} \ No newline at end of file +}