You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/07/15 18:34:30 UTC

incubator-usergrid git commit: Minor test fixes.

Repository: incubator-usergrid
Updated Branches:
  refs/heads/rxportapp 7b168b91d -> dab84e95b


Minor test fixes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dab84e95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dab84e95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dab84e95

Branch: refs/heads/rxportapp
Commit: dab84e95b54ff9ac573cfa291708938b5e181b61
Parents: 7b168b9
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jul 15 12:34:26 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Jul 15 12:34:26 2015 -0400

----------------------------------------------------------------------
 .../apache/usergrid/tools/ExportAppTest.java    | 33 ++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dab84e95/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java b/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java
index eeaae13..c5411fd 100644
--- a/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java
+++ b/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java
@@ -24,12 +24,15 @@ import org.apache.usergrid.management.ApplicationInfo;
 import org.apache.usergrid.management.OrganizationOwnerInfo;
 import org.apache.usergrid.persistence.Entity;
 import org.apache.usergrid.persistence.EntityManager;
+import org.junit.Assert;
 import org.junit.ClassRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import rx.Scheduler;
 import rx.schedulers.Schedulers;
 
+import java.io.File;
+import java.io.FileFilter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -37,7 +40,13 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
+
+/**
+ * TODO: better test, this is really just a smoke test.
+ */
 public class ExportAppTest {
     static final Logger logger = LoggerFactory.getLogger( ExportAppTest.class );
     
@@ -119,8 +128,15 @@ public class ExportAppTest {
                 "-outputDir", directoryName
         }, false );
 
-        logger.info("100 read and 100 write threads = " + (System.currentTimeMillis() - start)/1000 + "s");
+        logger.info( "100 read and 100 write threads = " + (System.currentTimeMillis() - start) / 1000 + "s" );
+        
+        File exportDir = new File(directoryName);
+        assertTrue( getFileCount( exportDir, "entities"    ) > 0 );
+        assertTrue( getFileCount( exportDir, "collections" ) > 0 );
+        assertTrue( getFileCount( exportDir, "entities" ) >= 100 );
+        assertTrue( getFileCount( exportDir, "collections" ) >= 100 );
 
+        File exportDir1 = new File(directoryName + "1");
         exportApp.startTool( new String[]{
                 "-application", appInfo.getName(),
                 "-readThreads", "1",
@@ -129,6 +145,19 @@ public class ExportAppTest {
                 "-outputDir", directoryName + "1"
         }, false );
 
-        logger.info("1 thread time = " + (System.currentTimeMillis() - start)/1000 + "s");
+        logger.info( "1 thread time = " + (System.currentTimeMillis() - start) / 1000 + "s" );
+
+        exportDir = new File(directoryName);
+        assertEquals( 1, getFileCount( exportDir, "entities" ));
+        assertEquals( 1, getFileCount( exportDir, "collections" ));
+    }
+
+    private static int getFileCount(File exportDir, final String ext ) {
+        return exportDir.listFiles( new FileFilter() {
+            @Override
+            public boolean accept(File pathname) {
+                return pathname.getAbsolutePath().endsWith("." + ext);
+            }
+        } ).length;
     }
 }
\ No newline at end of file