Skip to content

Commit

Permalink
Merge pull request #153 from jonesbusy/feature/jenkins-2.479-baseline
Browse files Browse the repository at this point in the history
Depends on 2.479.1
  • Loading branch information
jonesbusy authored Nov 9, 2024
2 parents 7b89f6a + 0207762 commit a440709
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.88</version>
<version>5.2</version>
<relativePath />
</parent>

Expand All @@ -21,8 +21,8 @@
</scm>
<properties>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.baseline>2.462</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
<gitHubRepo>jenkinsci/next-executions-plugin</gitHubRepo>
<spotless.check.skip>false</spotless.check.skip>
</properties>
Expand Down
12 changes: 4 additions & 8 deletions src/test/java/hudson/plugins/nextexecutions/NextBuildsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import net.sf.json.JSONObject;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.jvnet.hudson.test.JenkinsRule;
import org.kohsuke.stapler.StaplerRequest;

Expand Down Expand Up @@ -63,16 +62,13 @@ public void testGetName() {
}

@Test
@Disabled("Flaky test")
public void testCompareToWithEqualDates() {
try {
FreeStyleProject project = j.createFreeStyleProject("test");
Calendar date1 = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
date1.set(2024, Calendar.MARCH, 19);
Calendar date2 = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
date2.set(2024, Calendar.MARCH, 19);
NextBuilds nextBuild1 = new NextBuilds(project, date1);
NextBuilds nextBuild2 = new NextBuilds(project, date2);
Calendar date = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
date.set(2024, Calendar.MARCH, 19);
NextBuilds nextBuild1 = new NextBuilds(project, date);
NextBuilds nextBuild2 = new NextBuilds(project, date);
assertEquals(0, nextBuild1.compareTo(nextBuild2));
assertEquals(0, nextBuild1.compareTo("Not an Instance"));
} catch (IOException e) {
Expand Down

0 comments on commit a440709

Please sign in to comment.