dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27006
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13388: Removed test class
------------------------------------------------------------
revno: 13388
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-12-22 15:22:33 +0100
message:
Removed test class
removed:
dhis-2/dhis-web/dhis-web-commons/src/test/java/
dhis-2/dhis-web/dhis-web-commons/src/test/java/org/
dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/
dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/
dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/
dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager/
dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager/OrganisationUnitSelectionManagerTest.java
dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager/SessionReplacerOUSManager.java
dhis-2/dhis-web/dhis-web-commons/src/test/resources/
--
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
=== removed directory 'dhis-2/dhis-web/dhis-web-commons/src/test/java'
=== removed directory 'dhis-2/dhis-web/dhis-web-commons/src/test/java/org'
=== removed directory 'dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp'
=== removed directory 'dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis'
=== removed directory 'dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt'
=== removed directory 'dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager'
=== removed file 'dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager/OrganisationUnitSelectionManagerTest.java'
--- dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager/OrganisationUnitSelectionManagerTest.java 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager/OrganisationUnitSelectionManagerTest.java 1970-01-01 00:00:00 +0000
@@ -1,188 +0,0 @@
-package org.hisp.dhis.ouwt.manager;
-
-/*
- * Copyright (c) 2004-2013, 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 java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.hisp.dhis.DhisSpringTest;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * @author Torgeir Lorange Ostby
- */
-public class OrganisationUnitSelectionManagerTest
- extends DhisSpringTest
-{
- private OrganisationUnitService organisationUnitService;
-
- private OrganisationUnitSelectionManager selectionManager;
-
- @Override
- public void setUpTest()
- throws Exception
- {
- organisationUnitService = (OrganisationUnitService) getBean( OrganisationUnitService.ID );
-
- // ---------------------------------------------------------------------
- // Have to replace the session part with a dummy
- // ---------------------------------------------------------------------
-
- SessionReplacerOUSManager selectionManager = new SessionReplacerOUSManager();
- selectionManager.setOrganisationUnitService( organisationUnitService );
- this.selectionManager = selectionManager;
-
- // ---------------------------------------------------------------------
- // Add a couple of org units
- // ---------------------------------------------------------------------
-
- OrganisationUnit parentUnit = new OrganisationUnit( "OrganisationUnit1", "OrgUnit1", "OU1", new Date(),
- new Date(), true, "Comment1" );
- organisationUnitService.addOrganisationUnit( parentUnit );
- OrganisationUnit childUnit = new OrganisationUnit( "OrganisationUnit2", parentUnit, "OrgUnit2", "OU2",
- new Date(), new Date(), true, "Comment2" );
- parentUnit.getChildren().add( childUnit );
- organisationUnitService.addOrganisationUnit( childUnit );
- }
-
- @Test
- public void testRoot()
- throws Exception
- {
- OrganisationUnit rootUnit = getSingleRootOrganisationUnit();
- OrganisationUnit child = rootUnit.getChildren().iterator().next();
-
- assertNotNull( rootUnit );
-
- setSingleRootOrganisationUnitParent( child );
- assertEquals( child.getId(), getSingleRootOrganisationUnit().getId() );
-
- selectionManager.resetRootOrganisationUnits();
- assertEquals( rootUnit.getId(), getSingleRootOrganisationUnit().getId() );
- }
-
- @Test
- public void testSelection()
- throws Exception
- {
- assertTrue( selectionManager.getSelectedOrganisationUnits().isEmpty() );
-
- OrganisationUnit rootUnit = getSingleRootOrganisationUnit();
- OrganisationUnit child = rootUnit.getChildren().iterator().next();
-
- setSingleSelectedOrganisationUnit( child );
- assertEquals( child.getId(), getSingleSelectedOrganisationUnit().getId() );
-
- selectionManager.clearSelectedOrganisationUnits();
- assertTrue( selectionManager.getSelectedOrganisationUnits().isEmpty() );
- }
-
- @Test
- public void testParentChildPaths()
- throws Exception
- {
- OrganisationUnit rootUnit = getSingleRootOrganisationUnit();
- OrganisationUnit child = rootUnit.getChildren().iterator().next();
-
- setSingleRootOrganisationUnitParent( rootUnit );
- setSingleSelectedOrganisationUnit( child );
- assertEquals( rootUnit.getId(), getSingleRootOrganisationUnit().getId() );
- assertEquals( child.getId(), getSingleSelectedOrganisationUnit().getId() );
-
- setSingleRootOrganisationUnitParent( child );
- assertEquals( child.getId(), getSingleRootOrganisationUnit().getId() );
- assertNull( getSingleSelectedOrganisationUnit() );
-
- setSingleSelectedOrganisationUnit( rootUnit );
-
- setSingleRootOrganisationUnitParent( rootUnit );
- setSingleSelectedOrganisationUnit( rootUnit );
- assertEquals( rootUnit.getId(), getSingleRootOrganisationUnit().getId() );
- assertEquals( rootUnit.getId(), getSingleSelectedOrganisationUnit().getId() );
-
- setSingleRootOrganisationUnitParent( child );
- assertEquals( child.getId(), getSingleRootOrganisationUnit().getId() );
- assertNull( getSingleSelectedOrganisationUnit() );
- }
-
- private void setSingleRootOrganisationUnitParent( OrganisationUnit unit )
- throws Exception
- {
- OrganisationUnit parent = unit.getParent();
-
- if ( parent == null )
- {
- selectionManager.resetRootOrganisationUnits();
- }
- else
- {
- selectionManager.setRootOrganisationUnitsParent( parent );
- }
- }
-
- private void setSingleSelectedOrganisationUnit( OrganisationUnit unit )
- throws Exception
- {
- Set<OrganisationUnit> selectedUnits = new HashSet<OrganisationUnit>( 1 );
- selectedUnits.add( unit );
- selectionManager.setSelectedOrganisationUnits( selectedUnits );
- }
-
- private OrganisationUnit getSingleRootOrganisationUnit()
- throws Exception
- {
- Collection<OrganisationUnit> rootUnits = getRootOrganisationUnits();
-
- return rootUnits.iterator().next();
- }
-
- private OrganisationUnit getSingleSelectedOrganisationUnit()
- throws Exception
- {
- Collection<OrganisationUnit> selectedUnits = selectionManager.getSelectedOrganisationUnits();
-
- if ( selectedUnits.isEmpty() )
- {
- return null;
- }
- return selectedUnits.iterator().next();
- }
-
- private Collection<OrganisationUnit> getRootOrganisationUnits()
- throws Exception
- {
- return selectionManager.getRootOrganisationUnits();
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager/SessionReplacerOUSManager.java'
--- dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager/SessionReplacerOUSManager.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager/SessionReplacerOUSManager.java 1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-package org.hisp.dhis.ouwt.manager;
-
-/*
- * Copyright (c) 2004-2013, 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 java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Torgeir Lorange Ostby
- * @version $Id: SessionReplacerOUSManager.java 6335 2008-11-20 11:11:26Z larshelg $
- */
-public class SessionReplacerOUSManager
- extends DefaultOrganisationUnitSelectionManager
-{
- private Map<String, Object> session = new HashMap<String, Object>();
-
- protected Map<String, Object> getSession()
- {
- return session;
- }
-}
=== removed directory 'dhis-2/dhis-web/dhis-web-commons/src/test/resources'
