usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [12/21] usergrid git commit: Remove unnecessary ignores in some places, add new ignores for broken tests that were once excluded via moms.
Date Tue, 17 Nov 2015 23:47:27 GMT
Remove unnecessary ignores in some places, add new ignores for broken tests that were once
excluded via moms.


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

Branch: refs/heads/master
Commit: 41dde128cc04d211a29bf5af13520a7755246325
Parents: 99b932a
Author: Dave Johnson <snoopdave@apache.org>
Authored: Tue Nov 17 07:55:32 2015 -0500
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Tue Nov 17 07:55:32 2015 -0500

----------------------------------------------------------------------
 .../usergrid/batch/job/CountdownLatchJob.java   |  1 -
 .../usergrid/batch/job/DelayExecution.java      |  1 -
 .../usergrid/batch/job/DelayHeartbeat.java      |  1 -
 .../usergrid/batch/job/FailureJobExecution.java |  1 -
 .../usergrid/persistence/CoreSchemaManager.java |  1 -
 .../mvcc/stage/delete/UniqueCleanupTest.java    |  1 -
 .../apache/usergrid/rest/NotificationsIT.java   |  2 +
 .../applications/ApplicationResourceIT.java     | 61 ----------------
 .../users/extensions/TestResource.java          |  1 -
 .../rest/applications/utils/TestUtils.java      |  1 -
 .../usergrid/rest/management/AdminUsersIT.java  |  1 -
 .../rest/management/ExportResourceIT.java       | 22 +-----
 .../rest/management/ImportResourceIT.java       | 11 +--
 .../management/export/ExportServiceIT.java      | 75 --------------------
 .../management/importer/ImportServiceIT.java    |  1 -
 15 files changed, 4 insertions(+), 177 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/core/src/test/java/org/apache/usergrid/batch/job/CountdownLatchJob.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/CountdownLatchJob.java
b/stack/core/src/test/java/org/apache/usergrid/batch/job/CountdownLatchJob.java
index 53996a2..4149150 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/CountdownLatchJob.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/CountdownLatchJob.java
@@ -33,7 +33,6 @@ import org.apache.usergrid.batch.JobExecution;
  * @author tnine
  */
 @Component("countdownLatch")
-@Ignore("Not a test")
 public class CountdownLatchJob implements Job {
 
     private CountDownLatch latch = null;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/core/src/test/java/org/apache/usergrid/batch/job/DelayExecution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/DelayExecution.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/DelayExecution.java
index aaa7071..4c8bda6 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/DelayExecution.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/DelayExecution.java
@@ -35,7 +35,6 @@ import org.apache.usergrid.batch.JobExecution;
  * @author tnine
  */
 @Component("delayExecution")
-@Ignore("Not a test")
 public class DelayExecution implements Job {
 
     private static final Logger logger = LoggerFactory.getLogger( DelayExecution.class );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/core/src/test/java/org/apache/usergrid/batch/job/DelayHeartbeat.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/DelayHeartbeat.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/DelayHeartbeat.java
index 0fc104b..391b18b 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/DelayHeartbeat.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/DelayHeartbeat.java
@@ -35,7 +35,6 @@ import org.apache.usergrid.batch.JobExecution;
  * @author tnine
  */
 @Component("delayHeartbeat")
-@Ignore("Not a test")
 public class DelayHeartbeat implements Job {
 
     private static final Logger logger = LoggerFactory.getLogger( DelayHeartbeat.class );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/core/src/test/java/org/apache/usergrid/batch/job/FailureJobExecution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/FailureJobExecution.java
b/stack/core/src/test/java/org/apache/usergrid/batch/job/FailureJobExecution.java
index b31b520..5072e4a 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/FailureJobExecution.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/FailureJobExecution.java
@@ -33,7 +33,6 @@ import org.apache.usergrid.batch.JobExecution;
  * @author tnine
  */
 @Component("failureJobExceuction")
-@Ignore("Not a test")
 public class FailureJobExecution implements Job {
 
     private CountDownLatch latch = null;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
index adecc40..e9de76e 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
@@ -33,7 +33,6 @@ import me.prettyprint.hector.api.Cluster;
 
 
 /** @author zznate */
-@Ignore( "Not a test" )
 public class CoreSchemaManager implements SchemaManager {
     private static final Logger LOG = LoggerFactory.getLogger( CoreSchemaManager.class );
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/UniqueCleanupTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/UniqueCleanupTest.java
b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/UniqueCleanupTest.java
index c1f76f2..e361f42 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/UniqueCleanupTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/UniqueCleanupTest.java
@@ -430,7 +430,6 @@ public class UniqueCleanupTest {
 //    /**
 //     * Tests what happens when our listeners are VERY slow
 //     */
-////    @Ignore( "Test is a work in progress" )
 //    @Test( timeout = 10000 )
 //    public void multipleListenerMultipleVersionsNoThreadsToRun()
 //            throws ExecutionException, InterruptedException, ConnectionException {

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
index 22785dc..63e7b49 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
@@ -35,6 +35,7 @@ import org.junit.After;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,6 +44,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Test creating, sending and paging through Notifications via the REST API.
  */
+@Ignore
 public class NotificationsIT extends org.apache.usergrid.rest.test.resource.AbstractRestIT
{
     private static final Logger logger = LoggerFactory.getLogger( NotificationsIT.class );
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
index cd42262..5915eca 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
@@ -225,40 +225,6 @@ public class ApplicationResourceIT extends AbstractRestIT {
 
     }
 
-    /**
-     * Verifies that we return JSON even when text/html is requested.
-     * (for backwards compatibility)
-     */
-    @Test
-    @Ignore("no longer relevant - this type of backwards compatibility no longer needed")
-    public void jsonForAcceptsTextHtml() throws Exception {
-
-        //Create the organization resource
-        OrganizationResource orgResource = clientSetup.getRestClient()
-            .management().orgs().org( clientSetup.getOrganizationName() );
-
-        //retrieve the credentials
-        Credentials orgCredentials = new Credentials( orgResource.credentials().get(ApiResponse.class));
-        String clientId = orgCredentials.getClientId();
-        String clientSecret = orgCredentials.getClientSecret();
-
-        //retrieve the users collection, setting the "Accept" header to text/html
-        Invocation.Builder builder = this.app().collection( "users" ).getTarget()
-            //Add the org credentials to the query
-            .queryParam( "grant_type", "client_credentials" )
-            .queryParam( "client_id", clientId )
-            .queryParam( "client_secret", clientSecret )
-            .request();
-
-        ApiResponse apiResponse = builder
-            .accept(MediaType.TEXT_HTML)
-            .get(ApiResponse.class);
-
-        Collection users = new Collection(apiResponse);
-        //make sure that a valid response is returned without error
-        assertNotNull(users);
-        assertNull(users.getResponse().getError());
-    }
 
     /**
      * Retrieve an application using password credentials
@@ -762,33 +728,6 @@ public class ApplicationResourceIT extends AbstractRestIT {
         assertNotNull("It has expires_in.", apiResponse.getExpirationDate());
     }
 
-    /**
-     * Ensure that the Apigee Mobile Analytics config returns valid JSON
-     */
-    @Test
-    @Ignore("No longer relevant - Apigee internal")
-    public void validateApigeeApmConfigAPP() throws IOException {
-        String orgName = clientSetup.getOrganizationName().toLowerCase();
-        String appName = clientSetup.getAppName().toLowerCase();
-
-        try {
-            //GET the APM endpoint
-            String response = target().path( String.format( "/%s/%s/apm/apigeeMobileConfig",
orgName, appName ) )
-                .request()
-                .accept( MediaType.APPLICATION_JSON )
-                .get(String.class);
-            //Parse the response
-            JsonNode node = mapper.readTree(response);
-
-            //if things are kosher then JSON should have value for instaOpsApplicationId
-            assertTrue("it's valid json for APM", node.has("instaOpsApplicationId"));
-        } catch (ClientErrorException uie) {
-            //Validate that APM config exists
-            assertNotEquals("APM Config API exists", Response.Status.NOT_FOUND,
-                uie.getResponse().getStatus()); //i.e It should not be "Not Found"
-        }
-    }
-
 
     /**
      * Retrieve an application token using organization credentials

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/extensions/TestResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/extensions/TestResource.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/extensions/TestResource.java
index b74a162..969430e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/extensions/TestResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/extensions/TestResource.java
@@ -29,7 +29,6 @@ import org.springframework.stereotype.Component;
 import org.apache.usergrid.rest.applications.users.AbstractUserExtensionResource;
 
 
-@Ignore("Not a test")
 @Component("TestResource")
 @Scope("prototype")
 @Produces(MediaType.APPLICATION_JSON)

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/TestUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/TestUtils.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/TestUtils.java
index fa8356d..9a7d71c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/TestUtils.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/TestUtils.java
@@ -27,7 +27,6 @@ import org.apache.usergrid.utils.UUIDUtils;
 
 
 /** @author tnine */
-@Ignore("Not a test")
 public class TestUtils {
 
     /** Get the uuid at the given index for the root node.  If it doesn't exist, null is
returned */

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
index 3aed997..fba0c43 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
@@ -437,7 +437,6 @@ public class AdminUsersIT extends AbstractRestIT {
 
 //    // TODO: will work once resetpw viewables work
 //    @Test
-//    @Ignore( "causes problems in build" )
 //    public void passwordResetIncorrectUserName() throws Exception {
 //
 //        String email = "test2@usergrid.com";

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
index 939363f..79590b8 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
@@ -32,6 +32,7 @@ import java.util.UUID;
 import static org.junit.Assert.*;
 
 
+@Ignore
 public class ExportResourceIT extends AbstractRestIT {
 
 
@@ -40,7 +41,6 @@ public class ExportResourceIT extends AbstractRestIT {
 
     }
 
-    @Ignore
     @Test
     public void exportApplicationUUIDRetTest() throws Exception {
 
@@ -54,7 +54,6 @@ public class ExportResourceIT extends AbstractRestIT {
 
     }
 
-    @Ignore
     @Test
     public void exportCollectionUUIDRetTest() throws Exception {
 
@@ -81,7 +80,6 @@ public class ExportResourceIT extends AbstractRestIT {
      * Check that you can get the org export uuid returned and that you can check the status
of the job using that uuid.
      * @throws Exception
      */
-    @Ignore
     @Test
     public void exportGetOrganizationJobStatTest() throws Exception {
 
@@ -123,7 +121,6 @@ public class ExportResourceIT extends AbstractRestIT {
      * @throws Exception
      */
 
-    @Ignore
     @Test
     public void exportGetApplicationJobStatTest() throws Exception {
 
@@ -160,7 +157,6 @@ public class ExportResourceIT extends AbstractRestIT {
     }
 
 
-    @Ignore
     @Test
     public void exportGetCollectionJobStatTest() throws Exception {
 
@@ -192,7 +188,6 @@ public class ExportResourceIT extends AbstractRestIT {
 //
 //
 //    //    //do an unauthorized test for both post and get
-@Ignore
 @Test
     public void exportGetWrongUUID() throws Exception {
         UUID fake = UUID.fromString( "AAAAAAAA-FFFF-FFFF-FFFF-AAAAAAAAAAAA" );
@@ -209,7 +204,6 @@ public class ExportResourceIT extends AbstractRestIT {
 
 
     //
-    @Ignore
     @Test
     public void exportPostApplicationNullPointerProperties() throws Exception {
         try {
@@ -225,7 +219,6 @@ public class ExportResourceIT extends AbstractRestIT {
     }
 
 
-    @Ignore
     @Test
     public void exportPostOrganizationNullPointerProperties() throws Exception {
         try {
@@ -239,7 +232,6 @@ public class ExportResourceIT extends AbstractRestIT {
     }
 
     //
-    @Ignore
     @Test
     public void exportPostCollectionNullPointer() throws Exception {
         try {
@@ -255,7 +247,6 @@ public class ExportResourceIT extends AbstractRestIT {
         }
     }
 
-    @Ignore
     @Test
     public void exportGetCollectionUnauthorized() throws Exception {
         UUID fake = UUID.fromString( "AAAAAAAA-FFFF-FFFF-FFFF-AAAAAAAAAAAA" );
@@ -272,7 +263,6 @@ public class ExportResourceIT extends AbstractRestIT {
         }
     }
 
-    @Ignore
     @Test
     public void exportGetApplicationUnauthorized() throws Exception {
         UUID fake = UUID.fromString( "AAAAAAAA-FFFF-FFFF-FFFF-AAAAAAAAAAAA" );
@@ -288,7 +278,6 @@ public class ExportResourceIT extends AbstractRestIT {
         }
     }
 
-    @Ignore
     @Test
     public void exportGetOrganizationUnauthorized() throws Exception {
         UUID fake = UUID.fromString( "AAAAAAAA-FFFF-FFFF-FFFF-AAAAAAAAAAAA" );
@@ -303,7 +292,6 @@ public class ExportResourceIT extends AbstractRestIT {
         }
     }
 
-    @Ignore
     @Test
     public void exportPostOrganizationNullPointerStorageInfo() throws Exception {
         HashMap<String, Object> payload = payloadBuilder();
@@ -323,7 +311,6 @@ public class ExportResourceIT extends AbstractRestIT {
     }
 
 
-    @Ignore
     @Test
     public void exportPostApplicationNullPointerStorageInfo() throws Exception {
         HashMap<String, Object> payload = payloadBuilder();
@@ -344,7 +331,6 @@ public class ExportResourceIT extends AbstractRestIT {
         }
     }
 
-    @Ignore
     @Test
     public void exportPostCollectionNullPointerStorageInfo() throws Exception {
         HashMap<String, Object> payload = payloadBuilder();
@@ -366,7 +352,6 @@ public class ExportResourceIT extends AbstractRestIT {
         }
     }
 
-    @Ignore
     @Test
     public void exportPostOrganizationNullPointerStorageProvider() throws Exception {
         HashMap<String, Object> payload = payloadBuilder();
@@ -386,7 +371,6 @@ public class ExportResourceIT extends AbstractRestIT {
     }
 
 
-    @Ignore
     @Test
     public void exportPostApplicationNullPointerStorageProvider() throws Exception {
         HashMap<String, Object> payload = payloadBuilder();
@@ -407,7 +391,6 @@ public class ExportResourceIT extends AbstractRestIT {
         }
     }
 
-    @Ignore
     @Test
     public void exportPostCollectionNullPointerStorageProvider() throws Exception {
         HashMap<String, Object> payload = payloadBuilder();
@@ -430,7 +413,6 @@ public class ExportResourceIT extends AbstractRestIT {
     }
 
 
-    @Ignore
     @Test
     public void exportPostOrganizationNullPointerStorageVerification() throws Exception {
         HashMap<String, Object> payload = payloadBuilder();
@@ -482,7 +464,6 @@ public class ExportResourceIT extends AbstractRestIT {
         }
     }
 
-    @Ignore
     @Test
     public void exportPostApplicationNullPointerStorageVerification() throws Exception {
         HashMap<String, Object> payload = payloadBuilder();
@@ -537,7 +518,6 @@ public class ExportResourceIT extends AbstractRestIT {
         }
     }
 
-    @Ignore
     @Test
     public void exportPostCollectionNullPointerStorageVerification() throws Exception {
         HashMap<String, Object> payload = payloadBuilder();

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
index 784ff67..ee6ed8e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
@@ -60,6 +60,7 @@ import java.util.Properties;
 import static org.junit.Assert.*;
 
 
+@Ignore
 public class ImportResourceIT extends AbstractRestIT {
 
     private static final Logger logger = LoggerFactory.getLogger(ImportResourceIT.class);
@@ -127,7 +128,6 @@ public class ImportResourceIT extends AbstractRestIT {
      *
      * @throws Exception
      */
-    @Ignore
     @Test
     public void importGetCollectionJobStatTest() throws Exception {
 
@@ -162,7 +162,6 @@ public class ImportResourceIT extends AbstractRestIT {
      * Verify that import job can only be read with an authorized token and cannot be read
      * with an invalid/notAllowed token.
      */
-    @Ignore
     @Test
     public void importTokenAuthorizationTest() throws Exception {
 
@@ -218,7 +217,6 @@ public class ImportResourceIT extends AbstractRestIT {
     }
 
 
-    @Ignore
     @Test
     public void importPostApplicationNullPointerProperties() throws Exception {
         String org = clientSetup.getOrganizationName();
@@ -235,7 +233,6 @@ public class ImportResourceIT extends AbstractRestIT {
         assertEquals(Response.Status.BAD_REQUEST, responseStatus);
     }
 
-    @Ignore
     @Test
     public void importPostApplicationNullPointerStorageInfo() throws Exception {
         String org = clientSetup.getOrganizationName();
@@ -256,7 +253,6 @@ public class ImportResourceIT extends AbstractRestIT {
     }
 
 
-    @Ignore
     @Test
     public void importPostApplicationNullPointerStorageProvider() throws Exception {
         String org = clientSetup.getOrganizationName();
@@ -278,7 +274,6 @@ public class ImportResourceIT extends AbstractRestIT {
     }
 
 
-    @Ignore
     @Test
     public void importPostApplicationNullPointerStorageVerification() throws Exception {
         String org = clientSetup.getOrganizationName();
@@ -412,7 +407,6 @@ public class ImportResourceIT extends AbstractRestIT {
     /**
      * TODO: Test that importing bad JSON will result in an informative error message.
      */
-    @Ignore
     @Test
     public void testImportGoodJson() throws Exception {
         // import from a bad JSON file
@@ -484,7 +478,6 @@ public class ImportResourceIT extends AbstractRestIT {
     /**
      * TODO: Test that importing bad JSON will result in an informative error message.
      */
-    @Ignore
     @Test
     public void testImportOneGoodOneBad() throws Exception {
 
@@ -532,7 +525,6 @@ public class ImportResourceIT extends AbstractRestIT {
     /**
      * TODO: Test that importing bad JSON will result in an informative error message.
      */
-    @Ignore
     @Test
     public void testImportOneBadFile() throws Exception {
         // import from a bad JSON file
@@ -581,7 +573,6 @@ public class ImportResourceIT extends AbstractRestIT {
     /**
      * TODO: Test that importing bad JSON will result in an informative error message.
      */
-    @Ignore
     @Test
     public void testImportBadJson() throws Exception {
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/services/src/test/java/org/apache/usergrid/management/export/ExportServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/export/ExportServiceIT.java
b/stack/services/src/test/java/org/apache/usergrid/management/export/ExportServiceIT.java
index 8f67e85..4f78b92 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/export/ExportServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/export/ExportServiceIT.java
@@ -663,81 +663,6 @@ public class ExportServiceIT {
 
 
     @Test
-    @Ignore("this is a meaningless test because our export format does not support export
of organizations")
-    public void testExportOneOrganization() throws Exception {
-
-        // create a bunch of organizations, each with applications and collections of entities
-
-        int maxOrgs = 3;
-        int maxApps = 3;
-        int maxEntities = 20;
-
-        List<ApplicationInfo> appsMade = new ArrayList<>();
-        List<OrganizationInfo> orgsMade = new ArrayList<>();
-
-        for ( int orgIndex = 0; orgIndex < maxOrgs; orgIndex++ ) {
-
-
-            String orgName = "org_" + RandomStringUtils.randomAlphanumeric(10);
-            OrganizationInfo orgMade = setup.getMgmtSvc().createOrganization( orgName, adminUser,
true );
-            orgsMade.add( orgMade );
-            logger.debug("Created org {}", orgName);
-
-            for ( int appIndex = 0; appIndex < maxApps; appIndex++ ) {
-
-                String appName =  "app_" + RandomStringUtils.randomAlphanumeric(10);
-                ApplicationInfo appMade = setup.getMgmtSvc().createApplication( orgMade.getUuid(),
appName );
-                appsMade.add( appMade );
-                logger.debug("Created app {}", appName);
-
-                for (int entityIndex = 0; entityIndex < maxEntities; entityIndex++) {
-
-                    EntityManager appEm = setup.getEmf().getEntityManager( appMade.getId()
);
-                    appEm.create( appName + "_type", new HashMap<String, Object>()
{{
-                        put("property1", "value1");
-                        put("property2", "value2");
-                    }});
-                }
-            }
-        }
-
-        // export one of the organizations only, using mock S3 export that writes to local
disk
-
-        String exportFileName = "exportOneOrganization.json";
-        S3Export s3Export = new MockS3ExportImpl( exportFileName );
-
-        HashMap<String, Object> payload = payloadBuilder(appsMade.get(0).getName());
-        payload.put("organizationId", orgsMade.get(0).getUuid() );
-        payload.put( "applicationId", appsMade.get(0).getId() );
-
-        ExportService exportService = setup.getExportService();
-        UUID exportUUID = exportService.schedule( payload );
-
-        JobData jobData = jobDataCreator( payload, exportUUID, s3Export );
-        JobExecution jobExecution = mock( JobExecution.class );
-        when( jobExecution.getJobData() ).thenReturn(jobData);
-
-        exportService.doExport( jobExecution );
-
-        // finally, we check that file was created and contains the right number of entities
in the array
-
-        File exportedFile = new File( exportFileName );
-        exportedFile.deleteOnExit();
-
-        TypeReference<HashMap<String,Object>> typeRef
-            = new TypeReference<HashMap<String,Object>>() {};
-
-        ObjectMapper mapper = new ObjectMapper();
-        Map<String,Object> jsonMap = mapper.readValue(new FileReader( exportedFile
), typeRef);
-        Map collectionsMap = (Map)jsonMap.get("collections");
-
-        List collectionList = (List)collectionsMap.get("users");
-
-        assertEquals( 3, collectionList.size() );
-    }
-
-
-    @Test
     public void testExportDoJob() throws Exception {
 
         String appName = newOrgAppAdminRule.getApplicationInfo().getName();

http://git-wip-us.apache.org/repos/asf/usergrid/blob/41dde128/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
index e8d6081..d7d7028 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
@@ -64,7 +64,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 
-//@Concurrent
 public class ImportServiceIT {
 
     private static final Logger logger = LoggerFactory.getLogger(ImportServiceIT.class);


Mime
View raw message