Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-45879] Fixing false positive with empty lines and return car…
…ries

Change-Id: I0604d71b59c5866c69e7ff2185f3e1c821daad00
  • Loading branch information
v1v committed Aug 1, 2017
1 parent f9a6fbc commit dd01a69
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
Expand Up @@ -25,7 +25,7 @@ public boolean executeCheck(Item item) {
String spec = ((AbstractProject) item).getTrigger(TimerTrigger.class).getSpec().toLowerCase();
String[] myData = spec.split("\n");
for (String line: myData) {
if (!isH(line) && !isComment(line) && !isAt(line)) {
if (!isH(line) && !isComment(line) && !isAt(line) && !line.isEmpty()) {
found = true;
}
}
Expand Down
Expand Up @@ -44,6 +44,14 @@ public class TimerTriggerCheckerTestCase extends AbstractTestCase {
project.save();
assertTrue(checker.executeCheck(project));
}
@Issue("JENKINS-45879")
@Test public void testWithAtTimerTriggerWithReturnCarries() throws Exception {
FreeStyleProject project = j.createFreeStyleProject();
TimerTrigger newTrigger = new TimerTrigger(TIMER_WITH_H + "\n\n" + TIMER_WITH_H);
project.addTrigger(newTrigger);
project.save();
assertFalse(checker.executeCheck(project));
}
@Test public void testWithTimerTrigger() throws Exception {
FreeStyleProject project = j.createFreeStyleProject();
TimerTrigger newTrigger = new TimerTrigger(TIMER_WITHOUT_H);
Expand Down

0 comments on commit dd01a69

Please sign in to comment.