Skip to content

Commit

Permalink
Formatting.
Browse files Browse the repository at this point in the history
  • Loading branch information
J-cztery committed Apr 28, 2016
1 parent a8cb9b5 commit 561926e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package hudson.plugins.jira.selector.p4;


import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand All @@ -26,13 +25,12 @@
import hudson.scm.ChangeLogSet;
import hudson.scm.ChangeLogSet.Entry;


public class P4JobIssueSelectorTest extends JobIssueSelectorTest{
public class P4JobIssueSelectorTest extends JobIssueSelectorTest {

@Test
public void testFindsTwoP4Jobs() {
final String jobIdIW1231 = "IW-1231";
final String jobIdEC3453 = "EC-3453";
final String jobIdEC3453 = "EC-3453";

FreeStyleBuild build = mock(FreeStyleBuild.class);
BuildListener listener = mock(BuildListener.class);
Expand All @@ -41,30 +39,29 @@ public void testFindsTwoP4Jobs() {
JiraSite jiraSite = mock(JiraSite.class);
Fix fixIW1231 = mock(Fix.class);
Fix fixEC3453 = mock(Fix.class);

when(fixIW1231.getJobId()).thenReturn(jobIdIW1231);
when(fixEC3453.getJobId()).thenReturn(jobIdEC3453);

when(listener.getLogger()).thenReturn(System.out);
when(build.getChangeSet()).thenReturn(changeLogSet);

ArrayList<P4ChangeEntry> entries = new ArrayList<P4ChangeEntry>();

P4ChangeEntry entry1 = new P4ChangeEntry(perforceChangeLogSet);
entry1.getJobs().add(fixIW1231);
entries.add(entry1);

P4ChangeEntry entry2 = new P4ChangeEntry(perforceChangeLogSet);
entry2.getJobs().add(fixEC3453);
entries.add(entry2);
when(changeLogSet.iterator()).thenReturn(entries.iterator());


List<ChangeLogSet<? extends ChangeLogSet.Entry>> changeSets = new ArrayList<ChangeLogSet<? extends Entry>>();
changeSets.add(changeLogSet);
when(build.getChangeSets()).thenReturn(changeSets);

Set<String> expected = Sets.newHashSet(jobIdEC3453,jobIdIW1231);
Set<String> expected = Sets.newHashSet(jobIdEC3453, jobIdIW1231);

P4JobIssueSelector selector = new P4JobIssueSelector();
Set<String> result = selector.findIssueIds(build, jiraSite, listener);
Expand All @@ -75,9 +72,7 @@ public void testFindsTwoP4Jobs() {

@Override
protected JobIssueSelector createJobIssueSelector() {
return new P4JobIssueSelector();
return new P4JobIssueSelector();
}



}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import hudson.scm.ChangeLogSet;
import hudson.scm.ChangeLogSet.Entry;

public class PerforceJobIssueSelectorTest extends JobIssueSelectorTest{
public class PerforceJobIssueSelectorTest extends JobIssueSelectorTest {

@Test
public void testFindsTwoPerforceJobs() {
Expand Down

0 comments on commit 561926e

Please sign in to comment.