#706 updated unit tests

dzhw · Sep 29, 2016 · fa734ce · fa734ce
1 parent dfa4a8c
commit fa734ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/src/test/java/eu/dzhw/fdz/metadatamanagement/AbstractTest.java b/src/test/java/eu/dzhw/fdz/metadatamanagement/AbstractTest.java
@@ -1,6 +1,7 @@
 package eu.dzhw.fdz.metadatamanagement;
 
 import org.junit.runner.RunWith;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -18,6 +19,7 @@
 @SpringBootTest(classes = Application.class)
 @ActiveProfiles(Constants.SPRING_PROFILE_UNITTEST)
 @WebAppConfiguration
+@AutoConfigureMockMvc
 public abstract class AbstractTest {
 
 }
diff --git a/src/test/java/eu/dzhw/fdz/metadatamanagement/studymanagement/rest/StudyResourceTest.java b/src/test/java/eu/dzhw/fdz/metadatamanagement/studymanagement/rest/StudyResourceTest.java
@@ -14,7 +14,6 @@
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -101,14 +100,9 @@ public void testCreateStudyWithWrongId() throws IOException, Exception {
     study.setId("hurz");
 
     // create the study with the given id
-    MvcResult result = mockMvc.perform(put(API_STUDY_URI + "/" + study.getId())
+    mockMvc.perform(put(API_STUDY_URI + "/" + study.getId())
       .content(TestUtil.convertObjectToJsonBytes(study)))
-      .andExpect(status().is4xxClientError())
-      //TODO DKatzberg, why no reponse of this error?
-      //.andExpect(jsonPath("$.errors[0].message", containsString("study-management.error.study.id.not-equal-to-project-id")));
-      .andReturn();
-
-    System.out.println(result.getResponse().getContentAsString());
+      .andExpect(status().is4xxClientError());
   }
 
   @Test

diff --git a/...est/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/rest/VariableResourceTest.java b/...est/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/rest/VariableResourceTest.java
@@ -22,7 +22,6 @@
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -296,15 +295,10 @@ public void testCreateVariableWithNonNumericValueOnContinouosScaleLevel() throws
     validResponse.setValue("hurz");
 
     // create the variable with duplicate value classes
-    MvcResult result = mockMvc.perform(put(API_VARIABLES_URI + "/" + variable.getId())
+    mockMvc.perform(put(API_VARIABLES_URI + "/" + variable.getId())
       .content(TestUtil.convertObjectToJsonBytes(variable)))
       .andExpect(status().is4xxClientError())
-      //TODO DKatzberg Why no Reponse of the Error by given Client Error?
-      // .andExpect(jsonPath("$.errors[0].message", containsString("variable-management.error.variable.valid-response-value-must-be-a-number-on-numeric-data-type")));
       .andReturn();
-
-    System.out.println(result.getResponse().getContentAsString());
-
   }
 
   @Test