TRUNK-3949: Yet another try at fixing the build

openmrs · Apr 2, 2013 · a04064f · rkorytkowski · Apr 2, 2013 · wluyima
1 parent 0c7564b
commit a04064f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
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);
 	}