dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #36959
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18905: Add DataApprovalServiceCategoryOptionGroupTest (work in progress)
------------------------------------------------------------
revno: 18905
committer: jimgrace@xxxxxxxxx
branch nick: dhis2
timestamp: Wed 2015-04-15 07:58:48 -0400
message:
Add DataApprovalServiceCategoryOptionGroupTest (work in progress)
added:
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceCategoryOptionGroupTest.java
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java
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/mock/MockCurrentUserService.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/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java 2015-03-31 00:55:04 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java 2015-04-15 11:58:48 +0000
@@ -189,19 +189,19 @@
da.setDataApprovalLevel( status.getDataApproval().getDataApprovalLevel() );
}
- if ( status == null || !status.getState().isApproved() ||
+ if ( status == null || !status.getPermissions().isMayUnapprove() )
+ {
+ log.warn( "unapproveData: data may not be unapproved, state " + ( status == null ? "(null)" : status.getState().name() ) + " " + da );
+
+ throw new DataMayNotBeUnapprovedException();
+ }
+
+ if ( !status.getState().isApproved() ||
da.getDataApprovalLevel().getLevel() < status.getDataApprovalLevel().getLevel() )
{
continue; // Already unapproved at or below this level
}
- if ( !status.getPermissions().isMayUnapprove() )
- {
- log.warn( "unapproveData: data may not be unapproved, state " + status.getState().name() + " " + da );
-
- throw new DataMayNotBeUnapprovedException();
- }
-
checkedList.add ( da );
}
@@ -245,7 +245,8 @@
da.setDataApprovalLevel( status.getDataApproval().getDataApprovalLevel() );
}
- if ( status != null && ( status.getState().isAccepted() && da.getDataApprovalLevel().getLevel() == status.getDataApprovalLevel().getLevel() ||
+ if ( status != null && status.getState() != null && status.getDataApprovalLevel() != null &&
+ ( status.getState().isAccepted() && da.getDataApprovalLevel().getLevel() == status.getDataApprovalLevel().getLevel() ||
da.getDataApprovalLevel().getLevel() > status.getDataApprovalLevel().getLevel() ) )
{
continue; // Already accepted at, or approved above, this level
=== added file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceCategoryOptionGroupTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceCategoryOptionGroupTest.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceCategoryOptionGroupTest.java 2015-04-15 11:58:48 +0000
@@ -0,0 +1,1846 @@
+package org.hisp.dhis.dataapproval;
+
+/*
+ * Copyright (c) 2004-2015, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import static org.hisp.dhis.setting.SystemSettingManager.KEY_HIDE_UNAPPROVED_DATA_IN_ANALYTICS;
+import static org.hisp.dhis.setting.SystemSettingManager.KEY_ACCEPTANCE_REQUIRED_FOR_APPROVAL;
+import static org.junit.Assert.*;
+
+import org.hisp.dhis.DhisTest;
+import org.hisp.dhis.common.BaseIdentifiableObject;
+import org.hisp.dhis.common.CodeGenerator;
+import org.hisp.dhis.common.IdentifiableObjectManager;
+import org.hisp.dhis.dataapproval.exceptions.DataApprovalException;
+import org.hisp.dhis.dataelement.CategoryOptionGroup;
+import org.hisp.dhis.dataelement.CategoryOptionGroupSet;
+import org.hisp.dhis.dataelement.CategoryOptionGroupStore;
+import org.hisp.dhis.dataelement.DataElementCategory;
+import org.hisp.dhis.dataelement.DataElementCategoryCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryOption;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
+import org.hisp.dhis.dataelement.hibernate.HibernateCategoryOptionGroupStore;
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.mock.MockCurrentUserService;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.period.Period;
+import org.hisp.dhis.period.PeriodService;
+import org.hisp.dhis.period.PeriodType;
+import org.hisp.dhis.setting.SystemSettingManager;
+import org.hisp.dhis.user.CurrentUserService;
+import org.hisp.dhis.user.User;
+import org.hisp.dhis.user.UserAuthorityGroup;
+import org.hisp.dhis.user.UserCredentials;
+import org.hisp.dhis.user.UserGroup;
+import org.hisp.dhis.user.UserGroupAccess;
+import org.hisp.dhis.user.UserGroupAccessService;
+import org.hisp.dhis.user.UserGroupService;
+import org.hisp.dhis.user.UserService;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import static org.hisp.dhis.system.util.CollectionUtils.asSet;
+
+/**
+ * @author Jim Grace
+ */
+public class DataApprovalServiceCategoryOptionGroupTest
+ extends DhisTest
+{
+ private static final String ACCESS_NONE = "--------";
+ private static final String ACCESS_READ = "r-------";
+
+ @Autowired
+ private DataApprovalService dataApprovalService;
+
+ @Autowired
+ private DataApprovalStore dataApprovalStore;
+
+ @Autowired
+ private DataApprovalLevelService dataApprovalLevelService;
+
+ @Autowired
+ private PeriodService periodService;
+
+ @Autowired
+ private DataElementCategoryService categoryService;
+
+ @Autowired
+ private CategoryOptionGroupStore categoryOptionGroupStore;
+
+ @Autowired
+ private HibernateCategoryOptionGroupStore hibernateCategoryOptionGroupStore;
+
+ @Autowired
+ private DataSetService dataSetService;
+
+ @Autowired
+ private OrganisationUnitService organisationUnitService;
+
+ @Autowired
+ protected IdentifiableObjectManager _identifiableObjectManager;
+
+ @Autowired
+ private SystemSettingManager systemSettingManager;
+
+ @Autowired
+ protected UserGroupAccessService userGroupAccessService;
+
+ @Autowired
+ protected UserGroupService userGroupService;
+
+ @Autowired
+ protected UserService _userService;
+
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
+
+ // -------------------------------------------------------------------------
+ // Supporting data
+ // -------------------------------------------------------------------------
+
+ private OrganisationUnit global;
+ private OrganisationUnit americas;
+ private OrganisationUnit asia;
+ private OrganisationUnit brazil;
+ private OrganisationUnit china;
+ private OrganisationUnit india;
+
+ private User userA;
+
+ private Date dateA;
+
+ private CurrentUserService superUser;
+ private CurrentUserService globalConsultant;
+ private CurrentUserService globalUser;
+ private CurrentUserService globalReadEverything;
+ private CurrentUserService brazilInteragencyUser;
+ private CurrentUserService chinaInteragencyUser;
+ private CurrentUserService indiaInteragencyUser;
+ private CurrentUserService brazilAgencyAUser;
+ private CurrentUserService chinaAgencyAUser;
+ private CurrentUserService chinaAgencyBUser;
+ private CurrentUserService indiaAgencyAUser;
+ private CurrentUserService brazilPartner1User;
+ private CurrentUserService chinaPartner1User;
+ private CurrentUserService chinaPartner2User;
+ private CurrentUserService indiaPartner1User;
+ private CurrentUserService currentMockUserService;
+
+ private DataElementCategoryOption brazilA1;
+ private DataElementCategoryOption chinaA1_1;
+ private DataElementCategoryOption chinaA1_2;
+ private DataElementCategoryOption chinaA2;
+ private DataElementCategoryOption chinaB2;
+ private DataElementCategoryOption indiaA1;
+
+ private DataElementCategory mechanismCategory;
+
+ private DataElementCategoryCombo mechanismCategoryCombo;
+
+ private DataElementCategoryOptionCombo brazilA1Combo;
+ private DataElementCategoryOptionCombo chinaA1_1Combo;
+ private DataElementCategoryOptionCombo chinaA1_2Combo;
+ private DataElementCategoryOptionCombo chinaA2Combo;
+ private DataElementCategoryOptionCombo chinaB2Combo;
+ private DataElementCategoryOptionCombo indiaA1Combo;
+
+ private CategoryOptionGroup agencyA;
+ private CategoryOptionGroup agencyB;
+ private CategoryOptionGroup partner1;
+ private CategoryOptionGroup partner2;
+
+ private CategoryOptionGroupSet agencies;
+ private CategoryOptionGroupSet partners;
+
+ private DataApprovalLevel globalLevel1;
+ private DataApprovalLevel countryLevel2;
+ private DataApprovalLevel agencyLevel3;
+ private DataApprovalLevel partnerLevel4;
+
+ private DataSet dataSetA;
+
+ private Period periodA;
+
+ // -------------------------------------------------------------------------
+ // Set up/tear down helper methods
+ // -------------------------------------------------------------------------
+
+ private CurrentUserService mockCurrentUserService( String userName, boolean superUserFlag, OrganisationUnit orgUnit, String... auths )
+ {
+ CurrentUserService mockCurrentUserService = new MockCurrentUserService( superUserFlag, asSet( orgUnit ), asSet( orgUnit ), auths );
+
+ User user = mockCurrentUserService.getCurrentUser();
+
+ user.setFirstName( "Test" );
+ user.setSurname( userName );
+
+ UserCredentials credentials = user.getUserCredentials();
+
+ credentials.setUsername( userName );
+
+ for ( UserAuthorityGroup role : credentials.getUserAuthorityGroups() )
+ {
+ role.setName( CodeGenerator.generateCode() ); // Give the role an arbitrary name.
+
+ userService.addUserAuthorityGroup( role );
+ }
+
+ userService.addUserCredentials( credentials );
+ userService.addUser( user );
+
+ return mockCurrentUserService;
+ }
+
+ private UserGroup userGroup( String userGroupName, Set<User> users )
+ {
+ UserGroup userGroup = new UserGroup();
+ userGroup.setAutoFields();
+
+ userGroup.setName( userGroupName );
+ userGroup.setMembers( users );
+
+ userGroupService.addUserGroup( userGroup );
+
+ return userGroup;
+ }
+
+ private void setPrivateAccess(BaseIdentifiableObject object, UserGroup... userGroups)
+ {
+ object.setPublicAccess( ACCESS_NONE );
+ object.setUser( userA ); // Needed for sharing to work!
+
+ for ( UserGroup group : userGroups )
+ {
+ UserGroupAccess userGroupAccess = new UserGroupAccess();
+
+ userGroupAccess.setAccess( ACCESS_READ );
+
+ userGroupAccess.setUserGroup( group );
+
+ userGroupAccessService.addUserGroupAccess( userGroupAccess );
+
+ object.getUserGroupAccesses().add( userGroupAccess );
+ }
+
+ identifiableObjectManager.updateNoAcl( object );
+ }
+
+ // -------------------------------------------------------------------------
+ // Set up/tear down
+ // -------------------------------------------------------------------------
+
+ @Override
+ public void setUpTest() throws Exception
+ {
+ identifiableObjectManager = _identifiableObjectManager;
+ userService = _userService;
+
+ // ---------------------------------------------------------------------
+ // Add supporting data
+ // ---------------------------------------------------------------------
+
+ global = createOrganisationUnit( "Global" );
+ americas = createOrganisationUnit( "Americas", global );
+ asia = createOrganisationUnit( "Asia", global );
+ brazil = createOrganisationUnit( "Brazil", americas );
+ china = createOrganisationUnit( "China", asia );
+ india = createOrganisationUnit( "India", asia );
+
+ global.setLevel( 1 );
+ americas.setLevel( 2 );
+ asia.setLevel( 2 );
+ brazil.setLevel( 3 );
+ china.setLevel( 3 );
+ india.setLevel( 3 );
+
+ organisationUnitService.addOrganisationUnit( global );
+ organisationUnitService.addOrganisationUnit( americas );
+ organisationUnitService.addOrganisationUnit( asia );
+ organisationUnitService.addOrganisationUnit( brazil );
+ organisationUnitService.addOrganisationUnit( china );
+ organisationUnitService.addOrganisationUnit( india );
+
+ int globalId = global.getId();
+ int americasId = americas.getId();
+ int asiaId = asia.getId();
+ int brazilId = brazil.getId();
+ int chinaId = china.getId();
+ int indiaId = india.getId();
+
+ jdbcTemplate.execute(
+ "CREATE TABLE _orgunitstructure "+
+ "(" +
+ " organisationunitid integer NOT NULL, " +
+ " level integer, " +
+ " idlevel1 integer, " +
+ " idlevel2 integer, " +
+ " idlevel3 integer, " +
+ " CONSTRAINT _orgunitstructure_pkey PRIMARY KEY (organisationunitid)" +
+ ");" );
+
+ jdbcTemplate.execute( "INSERT INTO _orgunitstructure VALUES (" + globalId + ", 1, " + globalId + ", null, null);" );
+ jdbcTemplate.execute( "INSERT INTO _orgunitstructure VALUES (" + americasId + ", 2, " + globalId + ", " + americasId + ", null);" );
+ jdbcTemplate.execute( "INSERT INTO _orgunitstructure VALUES (" + asiaId + ", 2, " + globalId + ", " + asiaId + ", null);" );
+ jdbcTemplate.execute( "INSERT INTO _orgunitstructure VALUES (" + brazilId + ", 3, " + globalId + ", " + americasId + ", " + brazilId + ");" );
+ jdbcTemplate.execute( "INSERT INTO _orgunitstructure VALUES (" + chinaId + ", 3, " + globalId + ", " + asiaId + ", " + chinaId + ");" );
+ jdbcTemplate.execute( "INSERT INTO _orgunitstructure VALUES (" + indiaId + ", 3, " + globalId + ", " + asiaId + ", " + indiaId + ");" );
+
+ userA = createUser( 'A' );
+ userService.addUser( userA );
+
+ dateA = new Date();
+
+ superUser = mockCurrentUserService( "SuperUser", true, global, UserAuthorityGroup.AUTHORITY_ALL );
+ globalConsultant = mockCurrentUserService( "GlobalConsultant", false, global, DataApproval.AUTH_APPROVE, DataApproval.AUTH_ACCEPT_LOWER_LEVELS, DataApproval.AUTH_APPROVE_LOWER_LEVELS );
+ globalUser = mockCurrentUserService( "GlobalUser", false, global, DataApproval.AUTH_APPROVE, DataApproval.AUTH_ACCEPT_LOWER_LEVELS );
+ globalReadEverything = mockCurrentUserService( "GlobalReadEverything", false, global, DataApproval.AUTH_VIEW_UNAPPROVED_DATA );
+ brazilInteragencyUser = mockCurrentUserService( "BrazilInteragencyUser", false, brazil, DataApproval.AUTH_APPROVE, DataApproval.AUTH_ACCEPT_LOWER_LEVELS );
+ chinaInteragencyUser = mockCurrentUserService( "ChinaInteragencyUser", false, china, DataApproval.AUTH_APPROVE, DataApproval.AUTH_ACCEPT_LOWER_LEVELS );
+ indiaInteragencyUser = mockCurrentUserService( "IndiaInteragencyUser", false, india, DataApproval.AUTH_APPROVE, DataApproval.AUTH_ACCEPT_LOWER_LEVELS );
+ brazilAgencyAUser = mockCurrentUserService( "BrazilAgencyAUser", false, brazil, DataApproval.AUTH_APPROVE, DataApproval.AUTH_ACCEPT_LOWER_LEVELS );
+ chinaAgencyAUser = mockCurrentUserService( "ChinaAgencyAUser", false, china, DataApproval.AUTH_APPROVE, DataApproval.AUTH_ACCEPT_LOWER_LEVELS );
+ chinaAgencyBUser = mockCurrentUserService( "ChinaAgencyBUser", false, china, DataApproval.AUTH_APPROVE, DataApproval.AUTH_ACCEPT_LOWER_LEVELS );
+ indiaAgencyAUser = mockCurrentUserService( "IndiaAgencyAUser", false, india, DataApproval.AUTH_APPROVE, DataApproval.AUTH_ACCEPT_LOWER_LEVELS );
+ brazilPartner1User = mockCurrentUserService( "BrazilPartner1User", false, brazil, DataApproval.AUTH_APPROVE );
+ chinaPartner1User = mockCurrentUserService( "ChinaPartner1User", false, china, DataApproval.AUTH_APPROVE );
+ chinaPartner2User = mockCurrentUserService( "ChinaPartner2User", false, china, DataApproval.AUTH_APPROVE );
+ indiaPartner1User = mockCurrentUserService( "IndiaPartner1User", false, india, DataApproval.AUTH_APPROVE );
+ currentMockUserService = null;
+
+ UserGroup globalUsers = userGroup( "GlobalUsers", asSet( globalUser.getCurrentUser(), globalConsultant.getCurrentUser(), globalReadEverything.getCurrentUser() ) );
+ UserGroup brazilInteragencyUsers = userGroup( "BrazilInteragencyUsers", asSet( brazilInteragencyUser.getCurrentUser() ) );
+ UserGroup chinaInteragencyUsers = userGroup( "ChinaInteragencyUsers", asSet( chinaInteragencyUser.getCurrentUser() ) );
+ UserGroup indiaInteragencyUsers = userGroup( "IndiaInteragencyUsers", asSet( indiaInteragencyUser.getCurrentUser() ) );
+ UserGroup brazilAgencyAUsers = userGroup( "BrazilAgencyAUsers", asSet( brazilAgencyAUser.getCurrentUser() ) );
+ UserGroup chinaAgencyAUsers = userGroup( "ChinaAgencyAUsers", asSet( chinaAgencyAUser.getCurrentUser() ) );
+ UserGroup chinaAgencyBUsers = userGroup( "ChinaAgencyBUsers", asSet( chinaAgencyBUser.getCurrentUser() ) );
+ UserGroup indiaAgencyAUsers = userGroup( "IndiaAgencyAUsers", asSet( indiaAgencyAUser.getCurrentUser() ) );
+ UserGroup brazilPartner1Users = userGroup( "BrazilPartner1Users", asSet( brazilPartner1User.getCurrentUser() ) );
+ UserGroup chinaPartner1Users = userGroup( "ChinaPartner1Users", asSet( chinaPartner1User.getCurrentUser() ) );
+ UserGroup chinaPartner2Users = userGroup( "ChinaPartner2Users", asSet( chinaPartner2User.getCurrentUser() ) );
+ UserGroup indiaPartner1Users = userGroup( "IndiaPartner1Users", asSet( indiaPartner1User.getCurrentUser() ) );
+
+ brazilA1 = new DataElementCategoryOption( "BrazilA1" );
+ chinaA1_1 = new DataElementCategoryOption( "ChinaA1_1" );
+ chinaA1_2 = new DataElementCategoryOption( "ChinaA1_2" );
+ chinaA2 = new DataElementCategoryOption( "ChinaA2" );
+ chinaB2 = new DataElementCategoryOption( "ChinaB2" );
+ indiaA1 = new DataElementCategoryOption( "IndiaA1" );
+
+ brazilA1.setOrganisationUnits( asSet( brazil ) );
+ chinaA1_1.setOrganisationUnits( asSet( china ) );
+ chinaA1_2.setOrganisationUnits( asSet( china ) );
+ chinaA2.setOrganisationUnits( asSet( china ) );
+ chinaB2.setOrganisationUnits( asSet( china ) );
+ indiaA1.setOrganisationUnits( asSet( india ) );
+
+ categoryService.addDataElementCategoryOption( brazilA1 );
+ categoryService.addDataElementCategoryOption( chinaA1_1 );
+ categoryService.addDataElementCategoryOption( chinaA1_2 );
+ categoryService.addDataElementCategoryOption( chinaA2 );
+ categoryService.addDataElementCategoryOption( chinaB2 );
+ categoryService.addDataElementCategoryOption( indiaA1 );
+
+ setPrivateAccess( brazilA1, globalUsers, brazilInteragencyUsers, brazilAgencyAUsers, brazilPartner1Users );
+ setPrivateAccess( chinaA1_1, globalUsers, chinaInteragencyUsers, chinaAgencyAUsers, chinaPartner1Users );
+ setPrivateAccess( chinaA1_2, globalUsers, chinaInteragencyUsers, chinaAgencyAUsers, chinaPartner1Users );
+ setPrivateAccess( chinaA2, globalUsers, chinaInteragencyUsers, chinaAgencyAUsers, chinaPartner2Users );
+ setPrivateAccess( chinaB2, globalUsers, chinaInteragencyUsers, chinaAgencyBUsers, chinaPartner2Users );
+ setPrivateAccess( indiaA1, globalUsers, indiaInteragencyUsers, indiaAgencyAUsers, indiaPartner1Users );
+
+ mechanismCategory = createDataElementCategory( 'A', brazilA1, chinaA1_1, chinaA1_2, chinaA2, chinaB2, indiaA1 );
+ categoryService.addDataElementCategory( mechanismCategory );
+
+ mechanismCategoryCombo = createCategoryCombo( 'A', mechanismCategory );
+ categoryService.addDataElementCategoryCombo( mechanismCategoryCombo );
+
+ brazilAgencyAUser.getCurrentUser().getUserCredentials().getCatDimensionConstraints().add( mechanismCategory );
+ chinaAgencyAUser.getCurrentUser().getUserCredentials().getCatDimensionConstraints().add( mechanismCategory );
+ chinaAgencyBUser.getCurrentUser().getUserCredentials().getCatDimensionConstraints().add( mechanismCategory );
+ indiaAgencyAUser.getCurrentUser().getUserCredentials().getCatDimensionConstraints().add( mechanismCategory );
+ brazilPartner1User.getCurrentUser().getUserCredentials().getCatDimensionConstraints().add( mechanismCategory );
+ chinaPartner1User.getCurrentUser().getUserCredentials().getCatDimensionConstraints().add( mechanismCategory );
+ chinaPartner2User.getCurrentUser().getUserCredentials().getCatDimensionConstraints().add( mechanismCategory );
+ indiaPartner1User.getCurrentUser().getUserCredentials().getCatDimensionConstraints().add( mechanismCategory );
+
+ userService.updateUser( brazilAgencyAUser.getCurrentUser() );
+ userService.updateUser( chinaAgencyAUser.getCurrentUser() );
+ userService.updateUser( chinaAgencyBUser.getCurrentUser() );
+ userService.updateUser( indiaAgencyAUser.getCurrentUser() );
+ userService.updateUser( brazilPartner1User.getCurrentUser() );
+ userService.updateUser( chinaPartner1User.getCurrentUser() );
+ userService.updateUser( chinaPartner2User.getCurrentUser() );
+ userService.updateUser( indiaPartner1User.getCurrentUser() );
+
+ brazilA1Combo = createCategoryOptionCombo( 'A', mechanismCategoryCombo, brazilA1 );
+ chinaA1_1Combo = createCategoryOptionCombo( 'B', mechanismCategoryCombo, chinaA1_1 );
+ chinaA1_2Combo = createCategoryOptionCombo( 'C', mechanismCategoryCombo, chinaA1_2 );
+ chinaA2Combo = createCategoryOptionCombo( 'D', mechanismCategoryCombo, chinaA2 );
+ chinaB2Combo = createCategoryOptionCombo( 'E', mechanismCategoryCombo, chinaB2 );
+ indiaA1Combo = createCategoryOptionCombo( 'F', mechanismCategoryCombo, indiaA1 );
+
+ categoryService.addDataElementCategoryOptionCombo( brazilA1Combo );
+ categoryService.addDataElementCategoryOptionCombo( chinaA1_1Combo );
+ categoryService.addDataElementCategoryOptionCombo( chinaA1_2Combo );
+ categoryService.addDataElementCategoryOptionCombo( chinaA2Combo );
+ categoryService.addDataElementCategoryOptionCombo( chinaB2Combo );
+ categoryService.addDataElementCategoryOptionCombo( indiaA1Combo );
+
+ agencyA = createCategoryOptionGroup( 'A', brazilA1, chinaA1_1, chinaA1_2, chinaA2, indiaA1 );
+ agencyB = createCategoryOptionGroup( 'B', chinaB2 );
+ partner1 = createCategoryOptionGroup( '1', brazilA1, chinaA1_1, chinaA1_2, indiaA1 );
+ partner2 = createCategoryOptionGroup( '2', chinaA2, chinaB2 );
+
+ categoryService.saveCategoryOptionGroup( agencyA );
+ categoryService.saveCategoryOptionGroup( agencyB );
+ categoryService.saveCategoryOptionGroup( partner1 );
+ categoryService.saveCategoryOptionGroup( partner2 );
+
+ setPrivateAccess( agencyA, globalUsers, brazilInteragencyUsers, chinaInteragencyUsers, indiaInteragencyUsers,
+ brazilAgencyAUsers, chinaAgencyAUsers, indiaAgencyAUsers );
+ setPrivateAccess( agencyB, globalUsers, chinaInteragencyUsers, chinaAgencyBUsers );
+ setPrivateAccess( partner1, globalUsers, brazilInteragencyUsers, chinaInteragencyUsers, indiaInteragencyUsers,
+ brazilAgencyAUsers, chinaAgencyAUsers, indiaAgencyAUsers,
+ brazilPartner1Users, chinaPartner1Users, indiaPartner1Users );
+ setPrivateAccess( partner2, globalUsers, chinaInteragencyUsers, chinaAgencyAUsers, chinaPartner2Users );
+
+ agencies = new CategoryOptionGroupSet( "Agencies" );
+ partners = new CategoryOptionGroupSet( "Partners" );
+
+ categoryService.saveCategoryOptionGroupSet( partners );
+ categoryService.saveCategoryOptionGroupSet( agencies );
+
+ setPrivateAccess( agencies, globalUsers, brazilInteragencyUsers, chinaInteragencyUsers, indiaInteragencyUsers,
+ brazilAgencyAUsers, chinaAgencyAUsers, chinaAgencyBUsers, chinaAgencyBUsers, indiaAgencyAUsers );
+
+ setPrivateAccess( partners, globalUsers, brazilInteragencyUsers, chinaInteragencyUsers, indiaInteragencyUsers,
+ brazilAgencyAUsers, chinaAgencyAUsers, chinaAgencyBUsers, chinaAgencyBUsers, indiaAgencyAUsers,
+ brazilPartner1Users, chinaPartner1Users, chinaPartner2Users, indiaPartner1Users);
+
+ agencies.addCategoryOptionGroup( agencyA );
+ agencies.addCategoryOptionGroup( agencyB );
+ partners.addCategoryOptionGroup( partner1 );
+ partners.addCategoryOptionGroup( partner2 );
+
+ agencyA.setGroupSet( agencies );
+ agencyB.setGroupSet( agencies );
+ partner1.setGroupSet( partners );
+ partner2.setGroupSet( partners );
+
+ categoryService.updateCategoryOptionGroupSet( partners );
+ categoryService.updateCategoryOptionGroupSet( agencies );
+
+ categoryService.updateCategoryOptionGroup( agencyA );
+ categoryService.updateCategoryOptionGroup( agencyB );
+ categoryService.updateCategoryOptionGroup( partner1 );
+ categoryService.updateCategoryOptionGroup( partner2 );
+
+ globalLevel1 = new DataApprovalLevel( "GlobalLevel1", 1, null );
+ countryLevel2 = new DataApprovalLevel( "CountryLevel2", 3, null );
+ agencyLevel3 = new DataApprovalLevel( "AgencyLevel3", 3, agencies );
+ partnerLevel4 = new DataApprovalLevel( "PartnerLevel4", 3, partners );
+
+ dataApprovalLevelService.addDataApprovalLevel( globalLevel1, 1 );
+ dataApprovalLevelService.addDataApprovalLevel( countryLevel2, 2 );
+ dataApprovalLevelService.addDataApprovalLevel( agencyLevel3, 3 );
+ dataApprovalLevelService.addDataApprovalLevel( partnerLevel4, 4 );
+
+ dataSetA = createDataSet( 'A', PeriodType.getPeriodTypeByName( "Monthly" ) );
+ dataSetA.setCategoryCombo( mechanismCategoryCombo );
+ dataSetA.setApproveData( true );
+ dataSetService.addDataSet( dataSetA );
+
+ periodA = createPeriod( "201801" );
+ periodService.addPeriod( periodA );
+
+ systemSettingManager.saveSystemSetting( KEY_HIDE_UNAPPROVED_DATA_IN_ANALYTICS, true );
+ systemSettingManager.saveSystemSetting( KEY_ACCEPTANCE_REQUIRED_FOR_APPROVAL, true );
+ }
+
+ @Override
+ public void tearDownTest()
+ {
+ jdbcTemplate.execute( "DROP TABLE _orgunitstructure;" );
+ }
+
+ @Override
+ public boolean emptyDatabaseAfterTest()
+ {
+ return true;
+ }
+
+ // -------------------------------------------------------------------------
+ // Test helper methods
+ // -------------------------------------------------------------------------
+
+ private void setUser( CurrentUserService mockUserService )
+ {
+ if ( mockUserService != currentMockUserService )
+ {
+ setDependency( dataApprovalService, "currentUserService", mockUserService, CurrentUserService.class );
+ setDependency( dataApprovalStore, "currentUserService", mockUserService, CurrentUserService.class );
+ setDependency( dataApprovalLevelService, "currentUserService", mockUserService, CurrentUserService.class );
+ setDependency( organisationUnitService, "currentUserService", mockUserService, CurrentUserService.class );
+ setDependency( hibernateCategoryOptionGroupStore, "currentUserService", mockUserService, CurrentUserService.class );
+
+ currentMockUserService = mockUserService;
+ }
+ }
+
+ private String getOptionNamesFromCombo( DataElementCategoryOptionCombo combo )
+ {
+ return combo.getName().substring( 1, combo.getName().length() - 1);
+ }
+
+ private String statusString( DataApprovalStatus status )
+ {
+ DataApproval a = status.getDataApproval();
+ String approval = a == null ? "approval=null" :
+ "ou=" + ( a.getOrganisationUnit() == null ? "(null)" : a.getOrganisationUnit().getName() )
+ + " mechanism=" + ( a.getAttributeOptionCombo() == null ? "(null)" : getOptionNamesFromCombo( a.getAttributeOptionCombo() ) )
+ + " level=" + ( a.getDataApprovalLevel() == null ? "(null)" : a.getDataApprovalLevel().getLevel() );
+
+ DataApprovalPermissions p = status.getPermissions();
+
+ return approval + " " + status.getState().toString()
+ + " approve=" + ( p.isMayApprove() ? "T" : "F" )
+ + " unapprove=" + ( p.isMayUnapprove() ? "T" : "F" )
+ + " accept=" + ( p.isMayAccept() ? "T" : "F" )
+ + " unaccept=" + ( p.isMayUnaccept() ? "T" : "F" )
+ + " read=" + ( p.isMayReadData() ? "T" : "F" );
+ }
+
+ /**
+ * Returns approval status and permissions information as a string.
+ * This allows a test to compare the result against a string and test
+ * several things at once. More importantly, it shows in the log
+ * all of the ways in which the test status and permissions differs from
+ * expected, instead of showing only one different value. This can
+ * save time in understanding the difference between the expected value
+ * and the test result.
+ *
+ * @param mockUserService user to execute the test
+ * @param dataSet Approval data set
+ * @param period Approval period
+ * @param organisationUnit Approval orgaisation unit
+ * @param attributeOptionCombo Approval attribute option combination
+ * @return A String representing the state, level, and allowed user actions
+ */
+ private String statusAndPermissions( CurrentUserService mockUserService, DataSet dataSet,
+ Period period, OrganisationUnit organisationUnit,
+ DataElementCategoryOptionCombo attributeOptionCombo )
+ {
+ setUser( mockUserService );
+
+ DataApprovalStatus status = dataApprovalService.getDataApprovalStatusAndPermissions( dataSet, period, organisationUnit, attributeOptionCombo );
+
+ return statusString( status );
+ }
+
+ private String[] userApprovalsAndPermissions( CurrentUserService mockUserService, DataSet dataSet, Period period, OrganisationUnit orgUnit )
+ {
+ setUser( mockUserService );
+
+ List<DataApprovalStatus> approvals = dataApprovalService.getUserDataApprovalsAndPermissions( asSet( dataSet ), period, orgUnit );
+
+ List<String> approvalStrings = new ArrayList<>();
+
+ for ( DataApprovalStatus status : approvals )
+ {
+ approvalStrings.add( statusString ( status ) );
+ }
+
+ Collections.sort( approvalStrings );
+
+ return Arrays.copyOf( approvalStrings.toArray(), approvalStrings.size(), String[].class );
+ }
+
+ private boolean approve( CurrentUserService mockUserService, DataApprovalLevel dataApprovalLevel,
+ DataSet dataSet, Period period, OrganisationUnit organisationUnit,
+ DataElementCategoryOptionCombo mechanismCombo )
+ {
+ DataApproval da = new DataApproval( dataApprovalLevel, dataSet, period,
+ organisationUnit, mechanismCombo, false, dateA, userA );
+
+ setUser( mockUserService );
+
+ try
+ {
+ dataApprovalService.approveData( Arrays.asList( da ) );
+
+ return true;
+ }
+ catch ( DataApprovalException ex )
+ {
+ return false;
+ }
+ }
+
+ private boolean unapprove( CurrentUserService mockUserService, DataApprovalLevel dataApprovalLevel,
+ DataSet dataSet, Period period, OrganisationUnit organisationUnit,
+ DataElementCategoryOptionCombo mechanismCombo )
+ {
+ DataApproval da = new DataApproval( dataApprovalLevel, dataSet, period,
+ organisationUnit, mechanismCombo, false, dateA, userA );
+
+ setUser( mockUserService );
+
+ try
+ {
+ dataApprovalService.unapproveData( Arrays.asList( da ) );
+
+ return true;
+ }
+ catch ( DataApprovalException ex )
+ {
+ return false;
+ }
+ }
+
+ private boolean accept( CurrentUserService mockUserService, DataApprovalLevel dataApprovalLevel,
+ DataSet dataSet, Period period, OrganisationUnit organisationUnit,
+ DataElementCategoryOptionCombo mechanismCombo )
+ {
+ DataApproval da = new DataApproval( dataApprovalLevel, dataSet, period,
+ organisationUnit, mechanismCombo, false, dateA, userA );
+
+ setUser( mockUserService );
+
+ try
+ {
+ dataApprovalService.acceptData( Arrays.asList( da ) );
+
+ return true;
+ }
+ catch ( DataApprovalException ex )
+ {
+ return false;
+ }
+ }
+
+ private boolean unaccept( CurrentUserService mockUserService, DataApprovalLevel dataApprovalLevel,
+ DataSet dataSet, Period period, OrganisationUnit organisationUnit,
+ DataElementCategoryOptionCombo mechanismCombo )
+ {
+ DataApproval da = new DataApproval( dataApprovalLevel, dataSet, period,
+ organisationUnit, mechanismCombo, false, dateA, userA );
+
+ setUser( mockUserService );
+
+ try
+ {
+ dataApprovalService.unacceptData( Arrays.asList( da ) );
+
+ return true;
+ }
+ catch ( DataApprovalException ex )
+ {
+ return false;
+ }
+ }
+
+ // -------------------------------------------------------------------------
+ // Generate test code helper methods
+ //
+ // (used to help automate writing new test cases)
+ // -------------------------------------------------------------------------
+
+ private void generateUserApprovalsAndPermissions( CurrentUserService mockUserService, DataSet dataSet, Period period, OrganisationUnit orgUnit )
+ {
+ String[] approvalStrings = userApprovalsAndPermissions( mockUserService, dataSet, period, orgUnit );
+
+ System.out.println( "assertArrayEquals( new String[] {" );
+
+ int count = 0;
+
+ for ( String s : approvalStrings )
+ {
+ System.out.println( " \"" + s + "\"" + ( ++count < approvalStrings.length ? "," : " }," ) );
+ }
+
+ String username = mockUserService.getCurrentUsername();
+
+ System.out.println( " userApprovalsAndPermissions( "
+ + username.substring( 0, 1 ).toLowerCase() + username.substring( 1, username.length() )
+ + ", dataSetA, periodA, null ) );" );
+
+ System.out.println();
+ }
+
+ private void generateAllApprovalsAndPermissions()
+ {
+ generateUserApprovalsAndPermissions( superUser, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( globalConsultant, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( globalUser, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( globalReadEverything, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( brazilInteragencyUser, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( chinaInteragencyUser, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( indiaInteragencyUser, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( brazilAgencyAUser, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( chinaAgencyAUser, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( chinaAgencyBUser, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( indiaAgencyAUser, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( brazilPartner1User, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( chinaPartner1User, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( chinaPartner2User, dataSetA, periodA, null );
+ generateUserApprovalsAndPermissions( indiaPartner1User, dataSetA, periodA, null );
+ }
+
+ // -------------------------------------------------------------------------
+ // Tests
+ // -------------------------------------------------------------------------
+
+ @Ignore // TODO: Enabling this test causes DataApprovalServiceTest to fail. Determine why and Fix.
+ @Test
+ public void test()
+ {
+ // ---------------------------------------------------------------------
+ // Nothing approved yet
+ // ---------------------------------------------------------------------
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( superUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalConsultant, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( globalUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalReadEverything, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyBUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( brazilPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner2User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( indiaPartner1User, dataSetA, periodA, null ) );
+
+ // ---------------------------------------------------------------------
+ // Approve ChinaA1_1 at level 4
+ // ---------------------------------------------------------------------
+
+ assertEquals( true, approve( superUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unapprove( superUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, approve( globalConsultant, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unapprove( globalConsultant, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( globalUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( globalReadEverything, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilInteragencyUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaInteragencyUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaInteragencyUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilAgencyAUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaAgencyAUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaAgencyBUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaAgencyAUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilPartner1User, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaPartner2User, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaPartner1User, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, approve( chinaPartner1User, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ // ---------------------------------------------------------------------
+ // ChinaA1_1 is approved at level 4
+ // ---------------------------------------------------------------------
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( superUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalConsultant, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( globalUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalReadEverything, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyBUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( brazilPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner2User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( indiaPartner1User, dataSetA, periodA, null ) );
+
+ // ---------------------------------------------------------------------
+ // Approve ChinaA1_2 at level 4
+ // ---------------------------------------------------------------------
+
+ //TODO: test approving at wrong levels
+
+ assertEquals( true, approve( superUser, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+ assertEquals( true, unapprove( superUser, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+
+ assertEquals( true, approve( globalConsultant, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+ assertEquals( true, unapprove( globalConsultant, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+
+ assertEquals( false, approve( globalUser, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+ assertEquals( false, approve( globalReadEverything, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+
+ assertEquals( false, approve( brazilInteragencyUser, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+ assertEquals( false, approve( chinaInteragencyUser, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+ assertEquals( false, approve( indiaInteragencyUser, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+
+ assertEquals( false, approve( brazilAgencyAUser, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+ assertEquals( false, approve( chinaAgencyAUser, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+ assertEquals( false, approve( chinaAgencyBUser, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+ assertEquals( false, approve( indiaAgencyAUser, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+
+ assertEquals( false, approve( brazilPartner1User, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+ assertEquals( false, approve( chinaPartner2User, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+ assertEquals( false, approve( indiaPartner1User, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+
+ assertEquals( true, approve( chinaPartner1User, partnerLevel4, dataSetA, periodA, china, chinaA1_2Combo ) );
+
+ // ---------------------------------------------------------------------
+ // ChinaA1_1 is approved at level 4
+ // ChinaA1_2 is approved at level 4
+ // ---------------------------------------------------------------------
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( superUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalConsultant, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( globalUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalReadEverything, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyBUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( brazilPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner2User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( indiaPartner1User, dataSetA, periodA, null ) );
+
+ // ---------------------------------------------------------------------
+ // Accept ChinaA1_1 at level 4
+ // ---------------------------------------------------------------------
+
+ assertEquals( true, accept( superUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unaccept( superUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, accept( globalConsultant, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unaccept( globalConsultant, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( globalUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( globalReadEverything, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( brazilInteragencyUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaInteragencyUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( indiaInteragencyUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( brazilAgencyAUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaAgencyBUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( indiaAgencyAUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( brazilPartner1User, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaPartner1User, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaPartner2User, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( indiaPartner1User, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, accept( chinaAgencyAUser, partnerLevel4, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ // ---------------------------------------------------------------------
+ // ChinaA1_1 is accepted at level 4
+ // ChinaA1_2 is approved at level 4
+ // ---------------------------------------------------------------------
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 ACCEPTED_HERE approve=T unapprove=T accept=F unaccept=T read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( superUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 ACCEPTED_HERE approve=T unapprove=T accept=F unaccept=T read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalConsultant, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_1 level=4 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( globalUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=4 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalReadEverything, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 ACCEPTED_HERE approve=T unapprove=T accept=F unaccept=T read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyBUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( brazilPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=4 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner2User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( indiaPartner1User, dataSetA, periodA, null ) );
+
+ // ---------------------------------------------------------------------
+ // Approve ChinaA1_1 at level 3
+ // ---------------------------------------------------------------------
+ assertEquals( true, approve( superUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unapprove( superUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, approve( globalConsultant, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unapprove( globalConsultant, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( globalUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( globalReadEverything, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilInteragencyUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaInteragencyUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaInteragencyUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilAgencyAUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaAgencyBUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaAgencyAUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilPartner1User, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaPartner1User, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaPartner2User, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaPartner1User, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, approve( chinaAgencyAUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ // ---------------------------------------------------------------------
+ // ChinaA1_1 is approved at level 3
+ // ChinaA1_2 is approved at level 4
+ // ---------------------------------------------------------------------
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=3 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( superUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=3 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalConsultant, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_1 level=3 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( globalUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=3 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalReadEverything, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=3 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=3 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyBUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( brazilPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=3 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner2User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( indiaPartner1User, dataSetA, periodA, null ) );
+
+ // ---------------------------------------------------------------------
+ // Accept ChinaA1_1 at level 3
+ // ---------------------------------------------------------------------
+
+ assertEquals( true, accept( superUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unaccept( superUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, accept( globalConsultant, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unaccept( globalConsultant, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( globalUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( globalReadEverything, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( brazilInteragencyUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( indiaInteragencyUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( brazilAgencyAUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaAgencyAUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaAgencyBUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( indiaAgencyAUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( brazilPartner1User, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaPartner1User, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaPartner2User, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( indiaPartner1User, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, accept( chinaInteragencyUser, agencyLevel3, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ // ---------------------------------------------------------------------
+ // ChinaA1_1 is accepted at level 3
+ // ChinaA1_2 is approved at level 4
+ // ---------------------------------------------------------------------
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=3 ACCEPTED_HERE approve=T unapprove=T accept=F unaccept=T read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( superUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=3 ACCEPTED_HERE approve=T unapprove=T accept=F unaccept=T read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalConsultant, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_1 level=3 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( globalUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=3 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalReadEverything, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=3 ACCEPTED_HERE approve=T unapprove=T accept=F unaccept=T read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=3 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyBUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( brazilPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=3 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner2User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( indiaPartner1User, dataSetA, periodA, null ) );
+
+ // ---------------------------------------------------------------------
+ // Approve ChinaA1_1 at level 2
+ // ---------------------------------------------------------------------
+
+ assertEquals( true, approve( superUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unapprove( superUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, approve( globalConsultant, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unapprove( globalConsultant, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( globalUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( globalReadEverything, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilInteragencyUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaInteragencyUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilAgencyAUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaAgencyAUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaAgencyBUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaAgencyAUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilPartner1User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaPartner1User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaPartner2User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaPartner1User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, approve( chinaInteragencyUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ // ---------------------------------------------------------------------
+ // ChinaA1_1 is approved at level 2
+ // ChinaA1_2 is approved at level 4
+ // ---------------------------------------------------------------------
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=2 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( superUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=2 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalConsultant, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_1 level=2 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( globalUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=2 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalReadEverything, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=2 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=2 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyBUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( brazilPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=2 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner2User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( indiaPartner1User, dataSetA, periodA, null ) );
+
+ // ---------------------------------------------------------------------
+ // Accept ChinaA1_1 at level 2
+ // ---------------------------------------------------------------------
+
+ assertEquals( true, accept( superUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unaccept( superUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, accept( globalConsultant, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unaccept( globalConsultant, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( globalReadEverything, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( brazilInteragencyUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaInteragencyUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( indiaInteragencyUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( brazilAgencyAUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaAgencyAUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaAgencyBUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( indiaAgencyAUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, accept( brazilPartner1User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaPartner1User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( chinaPartner2User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, accept( indiaPartner1User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, accept( globalUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ // ---------------------------------------------------------------------
+ // ChinaA1_1 is accepted at level 2
+ // ChinaA1_2 is approved at level 4
+ // ---------------------------------------------------------------------
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=2 ACCEPTED_HERE approve=T unapprove=T accept=F unaccept=T read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( superUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=2 ACCEPTED_HERE approve=T unapprove=T accept=F unaccept=T read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalConsultant, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_1 level=2 ACCEPTED_HERE approve=T unapprove=T accept=F unaccept=T read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( globalUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=2 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalReadEverything, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=2 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=2 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyBUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( brazilPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=2 ACCEPTED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner2User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( indiaPartner1User, dataSetA, periodA, null ) );
+
+ // ---------------------------------------------------------------------
+ // Approve ChinaA1_1 at level 1
+ // ---------------------------------------------------------------------
+
+ assertEquals( true, approve( superUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unapprove( superUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, approve( globalConsultant, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, unapprove( globalConsultant, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( globalReadEverything, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilInteragencyUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaInteragencyUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaInteragencyUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilAgencyAUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaAgencyAUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaAgencyBUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaAgencyAUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, approve( brazilPartner1User, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaPartner1User, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( chinaPartner2User, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, approve( indiaPartner1User, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, approve( globalUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ // ---------------------------------------------------------------------
+ // ChinaA1_1 is approved at level 1
+ // ChinaA1_2 is approved at level 4
+ // ---------------------------------------------------------------------
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=1 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( superUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=1 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalConsultant, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA1_1 level=1 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( globalUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=1 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( globalReadEverything, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=1 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaInteragencyUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( brazilAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=1 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( chinaAgencyBUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=F unapprove=F accept=F unaccept=F read=F" },
+ userApprovalsAndPermissions( indiaAgencyAUser, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( brazilPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA1_1 level=1 APPROVED_HERE approve=F unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner1User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( chinaPartner2User, dataSetA, periodA, null ) );
+
+ assertArrayEquals( new String[] {
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( indiaPartner1User, dataSetA, periodA, null ) );
+
+ // ---------------------------------------------------------------------
+ // Unapprove ChinaA1_1 at level 1
+ // ---------------------------------------------------------------------
+
+ assertEquals( true, unapprove( superUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, approve( superUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, unapprove( globalConsultant, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, approve( globalConsultant, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, unapprove( globalReadEverything, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, unapprove( brazilInteragencyUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, unapprove( chinaInteragencyUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, unapprove( indiaInteragencyUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, unapprove( brazilAgencyAUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, unapprove( chinaAgencyAUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, unapprove( chinaAgencyBUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, unapprove( indiaAgencyAUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( false, unapprove( brazilPartner1User, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, unapprove( chinaPartner1User, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, unapprove( chinaPartner2User, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( false, unapprove( indiaPartner1User, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, unapprove( globalUser, globalLevel1, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertArrayEquals( new String[] {
+ "ou=Brazil mechanism=BrazilA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaA1_1 level=2 ACCEPTED_HERE approve=T unapprove=T accept=F unaccept=T read=T",
+ "ou=China mechanism=ChinaA1_2 level=4 APPROVED_HERE approve=F unapprove=T accept=T unaccept=F read=T",
+ "ou=China mechanism=ChinaA2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=China mechanism=ChinaB2 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T",
+ "ou=India mechanism=IndiaA1 level=4 UNAPPROVED_READY approve=T unapprove=F accept=F unaccept=F read=T" },
+ userApprovalsAndPermissions( superUser, dataSetA, periodA, null ) );
+
+ // ---------------------------------------------------------------------
+ // Unaccept ChinaA1_1 at level 2
+ // ---------------------------------------------------------------------
+
+ assertEquals( true, unaccept( superUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, accept( superUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ assertEquals( true, unaccept( globalConsultant, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+ assertEquals( true, accept( globalConsultant, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+
+ //TODO: Fix and test:
+// assertEquals( false, accept( globalReadEverything, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+//
+// assertEquals( false, unaccept( brazilInteragencyUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+// assertEquals( false, unaccept( chinaInteragencyUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+// assertEquals( false, unaccept( indiaInteragencyUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+//
+// assertEquals( false, unaccept( brazilAgencyAUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+// assertEquals( false, unaccept( chinaAgencyAUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+// assertEquals( false, unaccept( chinaAgencyBUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+// assertEquals( false, unaccept( indiaAgencyAUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+//
+// assertEquals( false, unaccept( brazilPartner1User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+// assertEquals( false, unaccept( chinaPartner1User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+// assertEquals( false, unaccept( chinaPartner2User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+// assertEquals( false, unaccept( indiaPartner1User, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+//
+// assertEquals( true, unaccept( globalUser, countryLevel2, dataSetA, periodA, china, chinaA1_1Combo ) );
+//
+// generateAllApprovalsAndPermissions();
+ }
+}
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java 2015-04-15 11:58:48 +0000
@@ -120,13 +120,19 @@
emptyTable( "chart_categorydimensions" );
emptyTable( "chart" );
+ emptyTable( "categoryoptiongroupusergroupaccesses" );
+ emptyTable( "categoryoptiongroupsetusergroupaccesses" );
+ emptyTable( "dataelementcategoryoptionusergroupaccesses" );
+ emptyTable( "usergroupaccess" );
+
+ emptyTable( "users_catdimensionconstraints" );
emptyTable( "userrolemembers" );
emptyTable( "userroledataset" );
emptyTable( "userroleauthorities" );
emptyTable( "usergroupmembers" );
emptyTable( "usergroup" );
- emptyTable( "users" );
- emptyTable( "userinfo" );
+ emptyTable( "userdatavieworgunits" );
+ emptyTable( "usermembership" );
emptyTable( "userrole" );
emptyTable( "orgunitgroupsetmembers" );
@@ -170,6 +176,7 @@
emptyTable( "categorycombos_categories" );
emptyTable( "categories_categoryoptions" );
+ emptyTable( "categoryoption_organisationunits" );
emptyTable( "orgunitgroupsetmembers" );
emptyTable( "orgunitgroupmembers" );
emptyTable( "orgunitgroupset" );
@@ -201,6 +208,11 @@
emptyTable( "optionvalue" );
emptyTable( "optionset" );
+ emptyTable( "systemsetting" );
+
+ emptyTable( "users" );
+ emptyTable( "userinfo" );
+
dropTable( "aggregateddatavalue" );
dropTable( "aggregatedindicatorvalue" );
dropTable( "aggregateddatasetcompleteness" );
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java 2015-04-07 07:56:59 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java 2015-04-15 11:58:48 +0000
@@ -92,6 +92,14 @@
@Autowired
protected CurrentUserService currentUserService;
+ /**
+ * Allows rewiring (e.g. by a unit test)
+ */
+ public void setCurrentUserService( CurrentUserService currentUserService )
+ {
+ this.currentUserService = currentUserService;
+ }
+
@Autowired
protected AclService aclService;
=== 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 2015-03-13 08:24:36 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2015-04-15 11:58:48 +0000
@@ -51,6 +51,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hisp.dhis.chart.Chart;
+import org.hisp.dhis.common.CodeGenerator;
import org.hisp.dhis.common.DimensionalObject;
import org.hisp.dhis.common.IdentifiableObjectManager;
import org.hisp.dhis.constant.Constant;
@@ -722,6 +723,39 @@
}
/**
+ * @param name The name, short name and code of the organisation unit.
+ */
+ public static OrganisationUnit createOrganisationUnit( String name )
+ {
+ OrganisationUnit unit = new OrganisationUnit();
+ unit.setAutoFields();
+
+ unit.setUid( CodeGenerator.generateCode() );
+ unit.setName( name );
+ unit.setShortName( name );
+ unit.setCode( name );
+ unit.setOpeningDate( date );
+ unit.setClosedDate( date );
+ unit.setComment( "Comment " + name );
+
+ return unit;
+ }
+
+ /**
+ * @param name The name, short name and code of the organisation unit.
+ * @param parent The parent.
+ */
+ public static OrganisationUnit createOrganisationUnit( String name, OrganisationUnit parent )
+ {
+ OrganisationUnit unit = createOrganisationUnit( name );
+
+ unit.setParent( parent );
+ parent.getChildren().add( unit );
+
+ return unit;
+ }
+
+ /**
* @param uniqueCharacter A unique character to identify the object.
*/
public static OrganisationUnitGroup createOrganisationUnitGroup( char uniqueCharacter )
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/MockCurrentUserService.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/MockCurrentUserService.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/MockCurrentUserService.java 2015-04-15 11:58:48 +0000
@@ -44,17 +44,25 @@
implements CurrentUserService
{
private User currentUser;
+
+ private boolean superUserFlag;
public MockCurrentUserService( User currentUser )
{
this.currentUser = currentUser;
}
-
+
public MockCurrentUserService( Set<OrganisationUnit> organisationUnits, Set<OrganisationUnit> dataViewOrganisationUnits, String... auths )
{
+ this( true, organisationUnits, dataViewOrganisationUnits, auths );
+ }
+
+ public MockCurrentUserService( boolean superUserFlag, Set<OrganisationUnit> organisationUnits, Set<OrganisationUnit> dataViewOrganisationUnits, String... auths )
+ {
UserAuthorityGroup userRole = new UserAuthorityGroup();
userRole.getAuthorities().addAll( Arrays.asList( auths ) );
+ this.superUserFlag = superUserFlag;
UserCredentials credentials = new UserCredentials();
credentials.setUsername( "currentUser" );
credentials.getUserAuthorityGroups().add( userRole );
@@ -83,7 +91,7 @@
@Override
public boolean currentUserIsSuper()
{
- return true;
+ return superUserFlag;
}
@Override
