Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a567f6d80e5b
Choose a base ref
...
head repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 00a079acc112
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 28, 2013

  1. move unit test to separate class to get away from @before failure

    @LeeBreisacher
    LeeBreisacher committed Jun 28, 2013
    Copy the full SHA
    a7289b4 View commit details

  2. move unit test to separate class to get away from @before failure

    @LeeBreisacher
    LeeBreisacher committed Jun 28, 2013
    Copy the full SHA
    2c321f9 View commit details

Commits on Jul 26, 2013

  1. Merge pull request #353 from LeeBreisacher/TRUNK-3970 

    Trunk 3970
    @dkayiwa
    dkayiwa committed Jul 26, 2013
    Copy the full SHA
    00a079a View commit details
12 changes: 0 additions & 12 deletions web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java
View file
Original file line number Diff line number Diff line change
@@ -157,16 +157,4 @@ public void onSubmit_shouldNotRescheduleAnExecutingTask() throws Exception {
Assert.assertSame(oldTaskInstance, task.getTaskInstance());
}

/**
* See TRUNK-3970: Error when adding a task in version 1.9.3
* https://tickets.openmrs.org/browse/TRUNK-3970
*/
@Ignore
@Test
public void addANewTaskShouldNotError() throws Exception {
HttpServletRequest request = new MockHttpServletRequest("GET", "/openmrs/admin/scheduler/scheduler.form");
ModelAndView mav = controller.handleRequest(request, new MockHttpServletResponse());
assertNotNull(mav);
}

}
30 changes: 30 additions & 0 deletions web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package org.openmrs.scheduler.web.controller;

import static org.junit.Assert.assertNotNull;

import javax.servlet.http.HttpServletRequest;

import org.junit.Test;
import org.openmrs.web.test.BaseWebContextSensitiveTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.web.servlet.ModelAndView;

public class SchedulerFormTest extends BaseWebContextSensitiveTest {

@Autowired
private SchedulerFormController controller;

/**
* See TRUNK-3970: Error when adding a task in version 1.9.3
* https://tickets.openmrs.org/browse/TRUNK-3970
*/
@Test
public void addANewTaskShouldNotError() throws Exception {
HttpServletRequest request = new MockHttpServletRequest("GET", "/openmrs/admin/scheduler/scheduler.form");
ModelAndView mav = controller.handleRequest(request, new MockHttpServletResponse());
assertNotNull(mav);
}

}