TRUNK-3949: Yet another try at fixing the build

rkorytkowski · rkorytkowski · commit a04064ff0103 · 2013-04-02T13:13:55.000+02:00
diff --git a/web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java b/web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
@@ -1033,7 +1033,6 @@ public void validateConceptReferenceTermUsesPersistedObjects_shouldAddErrorIfTer
 	 * @verifies not save changes if there are validation errors
 	 */
 	@Test
-	@NotTransactional
 	public void onSubmit_shouldNotSaveChangesIfThereAreValidationErrors() throws Exception {
 		Integer conceptId = 792;
 		
@@ -1047,6 +1046,8 @@ public void onSubmit_shouldNotSaveChangesIfThereAreValidationErrors() throws Exc
 		Response response = webTestHelper.handle(request);
 		assertThat(response.getErrors().hasFieldErrors("synonymsByLocale[en][1].name"), is(true));
 		
+		Context.clearSession();
+		
 		Concept concept = conceptService.getConcept(conceptId);
 		assertThat(concept.getPreferredName(Locale.ENGLISH).getName(), is("STAVUDINE LAMIVUDINE AND NEVIRAPINE"));
 	}
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,7 +25,6 @@
 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}.
@@ -40,7 +39,6 @@ public UserService getUS() {
 	}
 	
 	@Test
-	@NotTransactional
 	public void shouldUpdateRoleWithParent() throws Exception {
 		Role child = new Role("child", "child");
 		getUS().saveRole(child);
@@ -61,8 +59,6 @@ public void shouldUpdateRoleWithParent() throws Exception {
 		wth.handle(requestPOST);
 		
 		Assert.assertEquals("updated child", getUS().getRole("child").getDescription());
-		
-		deleteAllData();
 	}
 	
 }
diff --git a/web/src/test/java/org/openmrs/web/test/WebTestHelper.java b/web/src/test/java/org/openmrs/web/test/WebTestHelper.java
@@ -135,8 +135,6 @@ public Response handle(final HttpServletRequest request) throws Exception {
 		
 		Assert.assertTrue("The requested URI has no handlers: " + request.getRequestURI(), supported);
 		
-		Context.clearSession();
-		
 		return new Response(response, request.getSession(), modelAndView);
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`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;`
`29`	`28`
`30`	`29`	/**`
`31`	`30`	`* Tests {@link RoleFormController}.`
`@@ -40,7 +39,6 @@ public UserService getUS() {`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`@Test`
`43`		`- @NotTransactional`Has conversations. Original line has conversations.
`44`	`42`	`public void shouldUpdateRoleWithParent() throws Exception {`
`45`	`43`	`Role child = new Role("child", "child");`
`46`	`44`	`getUS().saveRole(child);`
`@@ -61,8 +59,6 @@ public void shouldUpdateRoleWithParent() throws Exception {`
`61`	`59`	`wth.handle(requestPOST);`
`62`	`60`
`63`	`61`	`Assert.assertEquals("updated child", getUS().getRole("child").getDescription());`
`64`		`-`
`65`		`- deleteAllData();`
`66`	`62`	`}`
`67`	`63`
`68`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,6 @@ public Response handle(final HttpServletRequest request) throws Exception {`
`135`	`135`
`136`	`136`	`Assert.assertTrue("The requested URI has no handlers: " + request.getRequestURI(), supported);`
`137`	`137`
`138`		`- Context.clearSession();`
`139`		`-`
`140`	`138`	`return new Response(response, request.getSession(), modelAndView);`
`141`	`139`	`}`
`142`	`140`