dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13444
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-12-27 13:47:38 +0100
message:
  Minor
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java
  dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java
  dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java
  dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.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-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java	2013-12-27 12:39:33 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java	2013-12-27 12:47:38 +0000
@@ -124,7 +124,7 @@
         programA.getProgramInstances().add( programInstance );
         identifiableObjectManager.update( programA );
 
-        createUserAndInjectSecurityContext( 'A', true );
+        createUserAndInjectSecurityContext( true );
 
         // mocked format
         I18nFormat mockFormat = mock( I18nFormat.class );

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java	2013-12-27 12:39:33 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java	2013-12-27 12:47:38 +0000
@@ -179,7 +179,7 @@
         identifiableObjectManager.update( programStageB );
         identifiableObjectManager.update( programA );
 
-        createUserAndInjectSecurityContext( 'A', true );
+        createUserAndInjectSecurityContext( true );
 
         // mocked format
         I18nFormat mockFormat = mock( I18nFormat.class );

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java	2013-12-27 12:39:33 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java	2013-12-27 12:47:38 +0000
@@ -146,7 +146,7 @@
         identifiableObjectManager.update( programStageA );
         identifiableObjectManager.update( programA );
 
-        createUserAndInjectSecurityContext( 'A', true );
+        createUserAndInjectSecurityContext( true );
 
         // mocked format
         I18nFormat mockFormat = mock( I18nFormat.class );

=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java	2013-12-27 12:39:33 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java	2013-12-27 12:47:38 +0000
@@ -1336,16 +1336,15 @@
     // -------------------------------------------------------------------------
 
     /**
-     * Creates a user and injects into the security context. Requires 
-     * <code>identifiableObjectManager</code> and <code>userService</code> to be
-     * injected into the test.
+     * Creates a user and injects into the security context with username 
+     * "username". Requires <code>identifiableObjectManager</code> and 
+     * <code>userService</code> to be injected into the test.
      * 
-     * @param uniqueCharacter uniquey character for username.
      * @param allAuth whether to grant ALL authority to user.
      * @param auths authorities to grant to user.
      * @return the user.
      */
-    public User createUserAndInjectSecurityContext( char uniqueCharacter, boolean allAuth, String... auths )
+    public User createUserAndInjectSecurityContext( boolean allAuth, String... auths )
     {
         Assert.notNull( identifiableObjectManager );
         Assert.notNull( userService );