Skip to content

Fix mockito issues with JDK11 and jenkins 2.222.3 #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix mockito issues with JDK11 and jenkins 2.222.3 #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
529da39
Fix mockito issues for BranchCategoryFilterTest
nfalco79 May 5, 2020
2f43cb3
Update organisation pom to latest version and use BOM to resolve depe…
nfalco79 May 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.43</version>
<version>3.56</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -67,10 +67,9 @@
<properties>
<revision>2.5.7</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.138.4</jenkins.version>
<java.level>8</java.level>
<scm-api.version>2.4.1</scm-api.version>
<git-plugin.version>3.10.0</git-plugin.version>
<jenkins.version>2.176.4</jenkins.version>
<slf4jVersion>1.7.26</slf4jVersion>
</properties>

<repositories>
Expand All @@ -87,36 +86,38 @@
</pluginRepository>
</pluginRepositories>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.176.x</artifactId>
<version>9</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- plugin dependencies -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>${scm-api.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>cloudbees-folder</artifactId>
<version>6.11</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.18</version>
</dependency>
<!-- jenkins dependencies -->
<!-- test dependencies -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.8.5</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <!-- previously gathered from org.jenkins-ci.lib:lib-jenkins-maven-embedder -->
<groupId>org.codehaus.plexus</groupId>
Expand All @@ -127,20 +128,17 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>${scm-api.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>2.1.16</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>${git-plugin.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -156,14 +154,12 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>${git-plugin.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>1.6</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
84 changes: 63 additions & 21 deletions src/test/java/jenkins/branch/BranchCategoryFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,26 @@
import hudson.model.ItemGroup;
import hudson.model.Job;
import hudson.model.Run;
import hudson.model.TaskListener;
import hudson.model.TopLevelItem;
import hudson.model.TopLevelItemDescriptor;
import hudson.model.View;
import hudson.scm.SCM;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.SortedMap;

import javax.annotation.Nonnull;

import jenkins.scm.api.SCMHead;
import jenkins.scm.api.SCMHeadCategory;
import jenkins.scm.api.SCMHeadEvent;
import jenkins.scm.api.SCMHeadObserver;
import jenkins.scm.api.SCMRevision;
import jenkins.scm.api.SCMSource;
import jenkins.scm.api.SCMSourceCriteria;
import jenkins.scm.api.SCMSourceDescriptor;
import jenkins.scm.impl.ChangeRequestSCMHeadCategory;
import jenkins.scm.impl.TagSCMHeadCategory;
Expand All @@ -49,7 +59,6 @@
import org.junit.Test;

import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand All @@ -61,28 +70,25 @@ public void filter_uncategorizedCategory() throws Exception {
when(filteringView.getOwner()).thenReturn(owner);
BranchProjectFactory factory = mock(BranchProjectFactory.class);
when(owner.getProjectFactory()).thenReturn(factory);
MockSCMSource source = mock(MockSCMSource.class);
SCMSourceDescriptor sourceDescriptor = new MockSCMSource.MockSCMSourceDescriptor();
MockSCMSource source = new MockSCMSource();
when(owner.getSCMSources()).thenReturn(Collections.singletonList(source));
when(source.getDescriptor()).thenReturn(sourceDescriptor);
when(source.isCategoryEnabled(any(SCMHeadCategory.class))).thenReturn(true);
TopLevelJob child1 = mock(TopLevelJob.class);
TopLevelJob child1 = new TopLevelJob("child1");
when(factory.isProject(child1)).thenReturn(true);
when(factory.asProject(child1)).thenReturn(child1);
SCM scm = mock(SCM.class);
when(factory.getBranch(child1)).thenReturn(
new Branch("1", new MockSCMHead("master"), scm, Collections.<BranchProperty>emptyList()));
TopLevelJob child2 = mock(TopLevelJob.class);
TopLevelJob child2 = new TopLevelJob("child2");
when(factory.isProject(child2)).thenReturn(true);
when(factory.asProject(child2)).thenReturn(child2);
when(factory.getBranch(child2)).thenReturn(new Branch("1", new MockSCMHead("fork"), scm,
Collections.<BranchProperty>emptyList()));
TopLevelJob child3 = mock(TopLevelJob.class);
TopLevelJob child3 = new TopLevelJob("child3");
when(factory.isProject(child3)).thenReturn(true);
when(factory.asProject(child3)).thenReturn(child3);
when(factory.getBranch(child3)).thenReturn(new Branch("1", new MockTagSCMHead("master-1.0", 0L), scm,
Collections.<BranchProperty>emptyList()));
TopLevelJob child4 = mock(TopLevelJob.class);
TopLevelJob child4 = new TopLevelJob("child4");
when(factory.isProject(child4)).thenReturn(false);
List<TopLevelItem> added = new ArrayList<>();
added.add(child1);
Expand Down Expand Up @@ -112,28 +118,25 @@ public void filter_specificCategory() throws Exception {
when(filteringView.getOwner()).thenReturn(owner);
BranchProjectFactory factory = mock(BranchProjectFactory.class);
when(owner.getProjectFactory()).thenReturn(factory);
MockSCMSource source = mock(MockSCMSource.class);
SCMSourceDescriptor sourceDescriptor = new MockSCMSource.MockSCMSourceDescriptor();
MockSCMSource source = new MockSCMSource();
when(owner.getSCMSources()).thenReturn(Collections.singletonList(source));
when(source.getDescriptor()).thenReturn(sourceDescriptor);
when(source.isCategoryEnabled(any(SCMHeadCategory.class))).thenReturn(true);
TopLevelJob child1 = mock(TopLevelJob.class);
TopLevelJob child1 = new TopLevelJob("child1");
when(factory.isProject(child1)).thenReturn(true);
when(factory.asProject(child1)).thenReturn(child1);
SCM scm = mock(SCM.class);
when(factory.getBranch(child1)).thenReturn(
new Branch("1", new MockSCMHead("master"), scm, Collections.<BranchProperty>emptyList()));
TopLevelJob child2 = mock(TopLevelJob.class);
TopLevelJob child2 = new TopLevelJob("child2");
when(factory.isProject(child2)).thenReturn(true);
when(factory.asProject(child2)).thenReturn(child2);
when(factory.getBranch(child2)).thenReturn(new Branch("1", new MockSCMHead("fork"), scm,
Collections.<BranchProperty>emptyList()));
TopLevelJob child3 = mock(TopLevelJob.class);
TopLevelJob child3 = new TopLevelJob("child3");
when(factory.isProject(child3)).thenReturn(true);
when(factory.asProject(child3)).thenReturn(child3);
when(factory.getBranch(child3)).thenReturn(new Branch("1", new MockTagSCMHead("master-1.0", 0L), scm,
Collections.<BranchProperty>emptyList()));
TopLevelJob child4 = mock(TopLevelJob.class);
TopLevelJob child4 = new TopLevelJob("child4");
when(factory.isProject(child4)).thenReturn(false);
List<TopLevelItem> added = new ArrayList<>();
added.add(child1);
Expand All @@ -147,10 +150,29 @@ public void filter_specificCategory() throws Exception {

}

private static abstract class TopLevelJob extends Job<TopLevelJob, TopLevelRun> implements TopLevelItem {
private static class TopLevelJob extends Job<TopLevelJob, TopLevelRun> implements TopLevelItem {

protected TopLevelJob(String name) {
super(null, name);
}

@Override
public TopLevelItemDescriptor getDescriptor() {
return null;
}

@Override
public boolean isBuildable() {
return false;
}

@Override
protected SortedMap<Integer, ? extends TopLevelRun> _getRuns() {
return null;
}

protected TopLevelJob(ItemGroup parent, String name) {
super(parent, name);
@Override
protected void removeRun(TopLevelRun run) {
}
}

Expand All @@ -161,17 +183,25 @@ protected TopLevelRun(@Nonnull TopLevelJob job) throws IOException {
}
}

private static abstract class MockSCMSource extends SCMSource {
private static class MockSCMSource extends SCMSource {

private MockSCMSourceDescriptor descriptor;

protected MockSCMSource() {
super("1");
this.descriptor = new MockSCMSourceDescriptor();
}

@Override
public boolean isCategoryEnabled(@NonNull SCMHeadCategory category) {
return true;
}

@Override
public SCMSourceDescriptor getDescriptor() {
return descriptor;
}

private static class MockSCMSourceDescriptor extends SCMSourceDescriptor {

@NonNull
Expand All @@ -185,6 +215,18 @@ protected SCMHeadCategory[] createCategories() {
}
}

@Override
protected void retrieve(SCMSourceCriteria criteria,
SCMHeadObserver observer,
SCMHeadEvent<?> event,
TaskListener listener) throws IOException, InterruptedException {
}

@Override
public SCM build(SCMHead head, SCMRevision revision) {
return null;
}

}

}