dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #21372
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10094: FRED-API: updated tests to verify more properties
------------------------------------------------------------
revno: 10094
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-03-09 09:33:50 +0300
message:
FRED-API: updated tests to verify more properties
modified:
dhis-2/dhis-web/dhis-web-api-fred/src/test/java/org/hisp/dhis/web/webapi/v1/controller/FacilityControllerTest.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/test/java/org/hisp/dhis/web/webapi/v1/controller/FacilityControllerTest.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/test/java/org/hisp/dhis/web/webapi/v1/controller/FacilityControllerTest.java 2013-03-08 18:37:42 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/test/java/org/hisp/dhis/web/webapi/v1/controller/FacilityControllerTest.java 2013-03-09 06:33:50 +0000
@@ -37,7 +37,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.mock.web.MockHttpSession;
-import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -119,6 +118,19 @@
}
@Test
+ public void testGetFacilityVerifyPresenceOfETag() throws Exception
+ {
+ OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
+ manager.save( organisationUnit );
+
+ MockHttpSession session = getSession( "ALL" );
+
+ mvc.perform( get( "/v1/facilities/" + organisationUnit.getUid() ).session( session ).accept( MediaType.APPLICATION_JSON ) )
+ .andExpect( header().string( "ETag", Matchers.notNullValue() ) )
+ .andExpect( status().isOk() );
+ }
+
+ @Test
public void testGetFacilityUid() throws Exception
{
OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
@@ -128,20 +140,11 @@
mvc.perform( get( "/v1/facilities/" + organisationUnit.getUid() ).session( session ).accept( MediaType.APPLICATION_JSON ) )
.andExpect( content().contentType( MediaType.APPLICATION_JSON ) )
+ .andExpect( jsonPath( "$.uuid", Matchers.notNullValue() ) )
.andExpect( jsonPath( "$.name" ).value( "OrgUnitA" ) )
- .andExpect( header().string( "ETag", Matchers.notNullValue() ) )
- .andExpect( status().isOk() );
- }
-
- @Test
- public void testGetFacilityVerifyPresenceOfETag() throws Exception
- {
- OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
- manager.save( organisationUnit );
-
- MockHttpSession session = getSession( "ALL" );
-
- mvc.perform( get( "/v1/facilities/" + organisationUnit.getUid() ).session( session ).accept( MediaType.APPLICATION_JSON ) )
+ .andExpect( jsonPath( "$.active" ).value( true ) )
+ .andExpect( jsonPath( "$.createdAt", Matchers.notNullValue() ) )
+ .andExpect( jsonPath( "$.updatedAt", Matchers.notNullValue() ) )
.andExpect( header().string( "ETag", Matchers.notNullValue() ) )
.andExpect( status().isOk() );
}
@@ -156,7 +159,12 @@
mvc.perform( get( "/v1/facilities/" + organisationUnit.getUuid() ).session( session ).accept( MediaType.APPLICATION_JSON ) )
.andExpect( content().contentType( MediaType.APPLICATION_JSON ) )
+ .andExpect( jsonPath( "$.uuid", Matchers.notNullValue() ) )
.andExpect( jsonPath( "$.name" ).value( "OrgUnitA" ) )
+ .andExpect( jsonPath( "$.active" ).value( true ) )
+ .andExpect( jsonPath( "$.createdAt", Matchers.notNullValue() ) )
+ .andExpect( jsonPath( "$.updatedAt", Matchers.notNullValue() ) )
+ .andExpect( header().string( "ETag", Matchers.notNullValue() ) )
.andExpect( status().isOk() );
}
@@ -240,8 +248,12 @@
mvc.perform( put( "/v1/facilities/" + organisationUnit.getUid() ).content( objectMapper.writeValueAsString( facility ) )
.session( session ).contentType( MediaType.APPLICATION_JSON ) )
.andExpect( content().contentType( MediaType.APPLICATION_JSON ) )
+ .andExpect( jsonPath( "$.uuid", Matchers.notNullValue() ) )
.andExpect( jsonPath( "$.name" ).value( "FacilityB" ) )
.andExpect( jsonPath( "$.active" ).value( false ) )
+ .andExpect( jsonPath( "$.createdAt", Matchers.notNullValue() ) )
+ .andExpect( jsonPath( "$.updatedAt", Matchers.notNullValue() ) )
+ .andExpect( header().string( "ETag", Matchers.notNullValue() ) )
.andExpect( status().isOk() );
}
@@ -260,8 +272,12 @@
mvc.perform( put( "/v1/facilities/" + organisationUnit.getUuid() ).content( objectMapper.writeValueAsString( facility ) )
.session( session ).contentType( MediaType.APPLICATION_JSON ) )
.andExpect( content().contentType( MediaType.APPLICATION_JSON ) )
+ .andExpect( jsonPath( "$.uuid", Matchers.notNullValue() ) )
.andExpect( jsonPath( "$.name" ).value( "FacilityB" ) )
.andExpect( jsonPath( "$.active" ).value( false ) )
+ .andExpect( jsonPath( "$.createdAt", Matchers.notNullValue() ) )
+ .andExpect( jsonPath( "$.updatedAt", Matchers.notNullValue() ) )
+ .andExpect( header().string( "ETag", Matchers.notNullValue() ) )
.andExpect( status().isOk() );
}
@@ -314,6 +330,19 @@
}
@Test
+ public void testPostInvalidUuidShouldFail() throws Exception
+ {
+ MockHttpSession session = getSession( "ALL" );
+
+ Facility facility = new Facility( "FacilityA" );
+ facility.setUuid( "DUMMY_UUID" );
+
+ mvc.perform( post( "/v1/facilities" ).content( objectMapper.writeValueAsString( facility ) )
+ .session( session ).contentType( MediaType.APPLICATION_JSON ) )
+ .andExpect( status().isPreconditionFailed() );
+ }
+
+ @Test
public void testPostName() throws Exception
{
MockHttpSession session = getSession( "ALL" );
@@ -323,22 +352,33 @@
mvc.perform( post( "/v1/facilities" ).content( objectMapper.writeValueAsString( facility ) )
.session( session ).contentType( MediaType.APPLICATION_JSON ) )
.andExpect( content().contentType( MediaType.APPLICATION_JSON ) )
+ .andExpect( jsonPath( "$.uuid", Matchers.notNullValue() ) )
.andExpect( jsonPath( "$.name" ).value( "FacilityA" ) )
.andExpect( jsonPath( "$.active" ).value( true ) )
+ .andExpect( jsonPath( "$.createdAt", Matchers.notNullValue() ) )
+ .andExpect( jsonPath( "$.updatedAt", Matchers.notNullValue() ) )
+ .andExpect( header().string( "ETag", Matchers.notNullValue() ) )
.andExpect( status().isCreated() );
}
@Test
- public void testPostInvalidUuidShouldFail() throws Exception
+ public void testPostShouldKeepUuid() throws Exception
{
MockHttpSession session = getSession( "ALL" );
Facility facility = new Facility( "FacilityA" );
- facility.setUuid( "DUMMY_UUID" );
+ facility.setUuid( "aabbccdd-aabb-aabb-aabb-aabbccddeeff" );
mvc.perform( post( "/v1/facilities" ).content( objectMapper.writeValueAsString( facility ) )
.session( session ).contentType( MediaType.APPLICATION_JSON ) )
- .andExpect( status().isPreconditionFailed() );
+ .andExpect( content().contentType( MediaType.APPLICATION_JSON ) )
+ .andExpect( jsonPath( "$.uuid" ).value( "aabbccdd-aabb-aabb-aabb-aabbccddeeff" ) )
+ .andExpect( jsonPath( "$.name" ).value( "FacilityA" ) )
+ .andExpect( jsonPath( "$.active" ).value( true ) )
+ .andExpect( jsonPath( "$.createdAt", Matchers.notNullValue() ) )
+ .andExpect( jsonPath( "$.updatedAt", Matchers.notNullValue() ) )
+ .andExpect( header().string( "ETag", Matchers.notNullValue() ) )
+ .andExpect( status().isCreated() );
}
@Test
@@ -351,8 +391,12 @@
mvc.perform( post( "/v1/facilities" ).content( objectMapper.writeValueAsString( facility ) )
.session( session ).contentType( MediaType.APPLICATION_JSON ) )
.andExpect( content().contentType( MediaType.APPLICATION_JSON ) )
+ .andExpect( jsonPath( "$.uuid", Matchers.notNullValue() ) )
.andExpect( jsonPath( "$.name" ).value( "FacilityA" ) )
.andExpect( jsonPath( "$.active" ).value( false ) )
+ .andExpect( jsonPath( "$.createdAt", Matchers.notNullValue() ) )
+ .andExpect( jsonPath( "$.updatedAt", Matchers.notNullValue() ) )
+ .andExpect( header().string( "ETag", Matchers.notNullValue() ) )
.andExpect( status().isCreated() );
}
@@ -366,13 +410,23 @@
mvc.perform( post( "/v1/facilities" ).content( objectMapper.writeValueAsString( facility ) )
.session( session ).contentType( MediaType.APPLICATION_JSON ) )
.andExpect( content().contentType( MediaType.APPLICATION_JSON ) )
+ .andExpect( jsonPath( "$.uuid", Matchers.notNullValue() ) )
.andExpect( jsonPath( "$.name" ).value( "FacilityA" ) )
+ .andExpect( jsonPath( "$.active" ).value( true ) )
+ .andExpect( jsonPath( "$.createdAt", Matchers.notNullValue() ) )
+ .andExpect( jsonPath( "$.updatedAt", Matchers.notNullValue() ) )
+ .andExpect( header().string( "ETag", Matchers.notNullValue() ) )
.andExpect( status().isCreated() );
mvc.perform( post( "/v1/facilities" ).content( objectMapper.writeValueAsString( facility ) )
.session( session ).contentType( MediaType.APPLICATION_JSON ) )
.andExpect( content().contentType( MediaType.APPLICATION_JSON ) )
+ .andExpect( jsonPath( "$.uuid", Matchers.notNullValue() ) )
.andExpect( jsonPath( "$.name" ).value( "FacilityA" ) )
+ .andExpect( jsonPath( "$.active" ).value( true ) )
+ .andExpect( jsonPath( "$.createdAt", Matchers.notNullValue() ) )
+ .andExpect( jsonPath( "$.updatedAt", Matchers.notNullValue() ) )
+ .andExpect( header().string( "ETag", Matchers.notNullValue() ) )
.andExpect( status().isCreated() );
}
