TRUNK-3949: Fixing build

rkorytkowski · rkorytkowski · commit 0c7564b3ea57 · 2013-04-02T12:41:57.000+02:00
(cherry picked from commit 7297fb3)
diff --git a/web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java b/web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
@@ -25,6 +25,7 @@
 import org.openmrs.web.test.WebTestHelper.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.test.annotation.NotTransactional;
 
 /**`
  * Tests {@link RoleFormController}.
@@ -39,6 +40,7 @@ public UserService getUS() {
 	}
 	
 	@Test
+	@NotTransactional
 	public void shouldUpdateRoleWithParent() throws Exception {
 		Role child = new Role("child", "child");
 		getUS().saveRole(child);
@@ -59,6 +61,8 @@ public void shouldUpdateRoleWithParent() throws Exception {
 		wth.handle(requestPOST);
 		
 		Assert.assertEquals("updated child", getUS().getRole("child").getDescription());
+		
+		deleteAllData();
 	}
 	
 }

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`import org.openmrs.web.test.WebTestHelper.Response;`
`26`	`26`	`import org.springframework.beans.factory.annotation.Autowired;`
`27`	`27`	`import org.springframework.mock.web.MockHttpServletRequest;`
	`28`	`+import org.springframework.test.annotation.NotTransactional;`
`28`	`29`
`29`	`30`	/**`
`30`	`31`	`* Tests {@link RoleFormController}.`
`@@ -39,6 +40,7 @@ public UserService getUS() {`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`@Test`
	`43`	`+ @NotTransactional`
`42`	`44`	`public void shouldUpdateRoleWithParent() throws Exception {`
`43`	`45`	`Role child = new Role("child", "child");`
`44`	`46`	`getUS().saveRole(child);`
`@@ -59,6 +61,8 @@ public void shouldUpdateRoleWithParent() throws Exception {`
`59`	`61`	`wth.handle(requestPOST);`
`60`	`62`
`61`	`63`	`Assert.assertEquals("updated child", getUS().getRole("child").getDescription());`
	`64`	`+`
	`65`	`+ deleteAllData();`
`62`	`66`	`}`
`63`	`67`
`64`	`68`	`}`