Change test to verify that dry-run uses dry-run manager, plus a logging fix.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0316b57f Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0316b57f Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0316b57f Branch: refs/heads/1.x Commit: 0316b57fa41829ce06e866d160b9197df27544c5 Parents: ceb8107 Author: Dave Johnson <[email protected]> Authored: Tue Jan 12 08:03:42 2016 -0500 Committer: Dave Johnson <[email protected]> Committed: Tue Jan 12 08:03:42 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/usergrid/tools/DuplicateAdminRepair.java | 3 +-- .../org/apache/usergrid/tools/DuplicateAdminRepairTest.java | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/0316b57f/stack/tools/src/main/java/org/apache/usergrid/tools/DuplicateAdminRepair.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/DuplicateAdminRepair.java b/stack/tools/src/main/java/org/apache/usergrid/tools/DuplicateAdminRepair.java index f38e3d6..9909918 100644 --- a/stack/tools/src/main/java/org/apache/usergrid/tools/DuplicateAdminRepair.java +++ b/stack/tools/src/main/java/org/apache/usergrid/tools/DuplicateAdminRepair.java @@ -275,13 +275,12 @@ public class DuplicateAdminRepair extends ToolBase { } } - logger.info( "Deleting admin with email {} and id {}", sourceUser.getEmail(), sourceUser.getId() ); - if ( dryRun ) { logger.info( "Would remove user {}:{}", new Object[]{ sourceUser.getUsername(), sourceUser.getId() } ); } else { + logger.info( "Deleting admin with email {} and id {}", sourceUser.getEmail(), sourceUser.getId() ); manager.removeOrgUser( sourceUser ); } } http://git-wip-us.apache.org/repos/asf/usergrid/blob/0316b57f/stack/tools/src/test/java/org/apache/usergrid/tools/DuplicateAdminRepairTest.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/test/java/org/apache/usergrid/tools/DuplicateAdminRepairTest.java b/stack/tools/src/test/java/org/apache/usergrid/tools/DuplicateAdminRepairTest.java index e5e9d43..1583468 100644 --- a/stack/tools/src/test/java/org/apache/usergrid/tools/DuplicateAdminRepairTest.java +++ b/stack/tools/src/test/java/org/apache/usergrid/tools/DuplicateAdminRepairTest.java @@ -132,10 +132,10 @@ public class DuplicateAdminRepairTest { /** - * Smoke test: does "real" manager run without throwing exceptions? + * Verify that dry-run manager will be used when dry-run specified. */ @org.junit.Test - public void testManagerNoDups() throws Exception { + public void testManagerDryRunNoDups() throws Exception { // create two orgs each with owning user @@ -156,7 +156,9 @@ public class DuplicateAdminRepairTest { DuplicateAdminRepair dor = new DuplicateAdminRepair(); - dor.startTool( new String[]{}, false ); // false means do not call System.exit() + dor.startTool( new String[] { "-dryrun", "true" }, false ); // false means do not call System.exit() + + assertTrue( DryRunUserOrgManager.class.isAssignableFrom( dor.manager.getClass() ) ); assertTrue( true ); // we're happy if we get to this point }
