=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/userkeyjsonvalue/UserKeyJsonValueStoreTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/userkeyjsonvalue/UserKeyJsonValueStoreTest.java 2016-02-03 02:17:44 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/userkeyjsonvalue/UserKeyJsonValueStoreTest.java 2016-02-03 10:14:04 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.DhisSpringTest; import org.hisp.dhis.user.User; -import org.junit.Ignore; +import org.hisp.dhis.user.UserService; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -41,14 +41,22 @@ /** * @author Stian Sandvold. */ -@Ignore public class UserKeyJsonValueStoreTest extends DhisSpringTest { @Autowired private UserKeyJsonValueStore userKeyJsonValueStore; - private User user; // = userService.getAllUsers().get( 0 ); + @Autowired + private UserService injectUserService; + + private User user; + + @Override + public void setUpTest() { + this.userService = injectUserService; + user = createUserAndInjectSecurityContext( true ); + } @Test public void testAddUserKeyJsonValue() @@ -74,12 +82,16 @@ userKeyJsonValueA.setKey( "test_a" ); userKeyJsonValueA.setUser( user ); + userKeyJsonValueStore.save(userKeyJsonValueA); + UserKeyJsonValue userKeyJsonValueB = new UserKeyJsonValue(); userKeyJsonValueB.setValue( "{}" ); userKeyJsonValueB.setKey( "test_b" ); userKeyJsonValueB.setUser( user ); + userKeyJsonValueStore.save(userKeyJsonValueB); + List list = userKeyJsonValueStore.getKeysByUser( user ); assertTrue( list.contains( "test_a" ) ); @@ -87,7 +99,7 @@ } @Test - public void testAddUserKeyJsonValuesAndGetUserKEyJsonValuesByUser() + public void testAddUserKeyJsonValuesAndGetUserKeyJsonValuesByUser() { UserKeyJsonValue userKeyJsonValueA = new UserKeyJsonValue(); @@ -95,12 +107,16 @@ userKeyJsonValueA.setKey( "test_a" ); userKeyJsonValueA.setUser( user ); + userKeyJsonValueStore.save(userKeyJsonValueA); + UserKeyJsonValue userKeyJsonValueB = new UserKeyJsonValue(); userKeyJsonValueB.setValue( "{}" ); userKeyJsonValueB.setKey( "test_b" ); userKeyJsonValueB.setUser( user ); + userKeyJsonValueStore.save(userKeyJsonValueB); + List list = userKeyJsonValueStore.getUserKeyJsonValueByUser( user ); assertTrue( list.contains( userKeyJsonValueA ) );