dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21604
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2016-01-05 19:41:55 +0100
message:
  MessageServiceTest fix
modified:
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/message/MessageServiceTest.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-services/dhis-service-core/src/test/java/org/hisp/dhis/message/MessageServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/message/MessageServiceTest.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/message/MessageServiceTest.java	2016-01-05 18:41:55 +0000
@@ -40,7 +40,6 @@
 import org.hisp.dhis.DhisSpringTest;
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.user.UserService;
-import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -68,20 +67,22 @@
     // -------------------------------------------------------------------------
 
     @Override
-    @Before
     public void setUpTest()
-    {
+    {        
         userService = _userService;
         
         sender = createUser( 'S' );
         userA = createUser( 'A' );
         userB = createUser( 'B' );
-       
-
+        
         userService.addUser( sender );
+        userService.addUserCredentials( sender.getUserCredentials() );
+
         userService.addUser( userA );
+        userService.addUserCredentials( userA.getUserCredentials() );
+        
         userService.addUser( userB );
-       
+        userService.addUserCredentials( userB.getUserCredentials() );
         
         users = new HashSet<>();
         users.add( userA );