Back porting to 1.9.x: Error when adding a task in version 1.9.3 -

dkayiwa · dkayiwa · commit 3f43fd61b19e · 2013-09-11T12:42:20.000+03:00
TRUNK-3970
diff --git a/web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java b/web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java
@@ -186,16 +186,4 @@ public void onSubmit_shouldNotRescheduleATaskIfTheStartTimeHasPassed() throws Ex
 			Assert.assertFalse(task.getStarted());
 		}
 	}
-	
-	/**
-	 * 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);
-	}
 }
diff --git a/web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormTest.java b/web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormTest.java
@@ -0,0 +1,42 @@
+/**
+ * The contents of this file are subject to the OpenMRS Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://license.openmrs.org
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
+ */
+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);
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -186,16 +186,4 @@ public void onSubmit_shouldNotRescheduleATaskIfTheStartTimeHasPassed() throws Ex`
`186`	`186`	`Assert.assertFalse(task.getStarted());`
`187`	`187`	`}`
`188`	`188`	`}`
`189`		`-`
`190`		`- /**`
`191`		`- * See TRUNK-3970: Error when adding a task in version 1.9.3`
`192`		`- * https://tickets.openmrs.org/browse/TRUNK-3970`
`193`		`- */`
`194`		`- @Ignore`
`195`		`- @Test`
`196`		`- public void addANewTaskShouldNotError() throws Exception {`
`197`		`- HttpServletRequest request = new MockHttpServletRequest("GET", "/openmrs/admin/scheduler/scheduler.form");`
`198`		`- ModelAndView mav = controller.handleRequest(request, new MockHttpServletResponse());`
`199`		`- assertNotNull(mav);`
`200`		`- }`
`201`	`189`	`}`