Skip to content

Commit 46183e4

Browse files
authored
Merge pull request #153 from offa/timertriggercause
build-user-vars compatibility
2 parents 4323f15 + 35c937f commit 46183e4

2 files changed

Lines changed: 25 additions & 2 deletions

File tree

src/main/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterizedTimerTriggerCause.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package org.jenkinsci.plugins.parameterizedscheduler;
22

3-
import hudson.model.Cause;
3+
import hudson.triggers.TimerTrigger;
44

55
import java.util.Map;
6+
import java.util.Objects;
67

7-
public class ParameterizedTimerTriggerCause extends Cause {
8+
public class ParameterizedTimerTriggerCause extends TimerTrigger.TimerTriggerCause {
89

910
private final String description;
1011

@@ -18,4 +19,17 @@ public String getShortDescription() {
1819
return description;
1920
}
2021

22+
@Override
23+
public boolean equals(Object o) {
24+
if (this == o) return true;
25+
if (o == null || getClass() != o.getClass()) return false;
26+
if (!super.equals(o)) return false;
27+
ParameterizedTimerTriggerCause that = (ParameterizedTimerTriggerCause) o;
28+
return Objects.equals(description, that.description);
29+
}
30+
31+
@Override
32+
public int hashCode() {
33+
return Objects.hash(super.hashCode(), description);
34+
}
2135
}

src/test/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterizedTimerTriggerCauseTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package org.jenkinsci.plugins.parameterizedscheduler;
22

3+
import hudson.triggers.TimerTrigger;
34
import org.junit.Test;
45

6+
import java.util.Collections;
57
import java.util.HashMap;
68
import java.util.Map;
79

10+
import static org.hamcrest.MatcherAssert.assertThat;
11+
import static org.hamcrest.Matchers.instanceOf;
812
import static org.junit.Assert.assertEquals;
913

1014
public class ParameterizedTimerTriggerCauseTest {
@@ -19,4 +23,9 @@ public void happyPath() {
1923
testObject.getShortDescription());
2024
}
2125

26+
@Test
27+
public void isTimerTrigger() {
28+
assertThat(new ParameterizedTimerTriggerCause(Collections.singletonMap("a", "b")),
29+
instanceOf(TimerTrigger.TimerTriggerCause.class));
30+
}
2231
}

0 commit comments

Comments
 (0)