From ee1d0793675df02e479ef86421c11d69639a828c Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Thu, 2 May 2019 09:12:05 -0700 Subject: [PATCH] Update OrganizationFolderTest.java --- .../branch/OrganizationFolderTest.java | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/test/java/jenkins/branch/OrganizationFolderTest.java b/src/test/java/jenkins/branch/OrganizationFolderTest.java index 2b4f42ff..ec7fedfb 100644 --- a/src/test/java/jenkins/branch/OrganizationFolderTest.java +++ b/src/test/java/jenkins/branch/OrganizationFolderTest.java @@ -24,30 +24,9 @@ package jenkins.branch; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.*; - -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.acegisecurity.Authentication; -import org.acegisecurity.providers.TestingAuthenticationToken; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.TestExtension; -import org.kohsuke.stapler.DataBoundConstructor; - import com.cloudbees.hudson.plugins.folder.computed.ChildObserver; import com.cloudbees.hudson.plugins.folder.computed.ComputedFolder; import com.google.common.collect.ImmutableSet; - import hudson.ExtensionList; import hudson.model.Item; import hudson.model.ItemGroup; @@ -56,6 +35,11 @@ import hudson.model.View; import hudson.scm.NullSCM; import hudson.security.Permission; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; import jenkins.branch.harness.MultiBranchImpl; import jenkins.scm.api.SCMNavigator; import jenkins.scm.api.SCMSource; @@ -68,6 +52,19 @@ import jenkins.scm.impl.mock.MockSCMDiscoverTags; import jenkins.scm.impl.mock.MockSCMHead; import jenkins.scm.impl.mock.MockSCMNavigator; +import org.acegisecurity.Authentication; +import org.acegisecurity.providers.TestingAuthenticationToken; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.TestExtension; +import org.kohsuke.stapler.DataBoundConstructor; + +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.*; public class OrganizationFolderTest {