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/11/18 17:28:05 UTC
[44/50] usergrid git commit: Add pending comment to import/export
tests that are awaiting merge of the export-feature branch.
Add pending comment to import/export tests that are awaiting merge of the export-feature branch.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/22c29fb7
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/22c29fb7
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/22c29fb7
Branch: refs/heads/USERGRID-872
Commit: 22c29fb7ca455c05739d1c2724e33dd0429bab1a
Parents: a9c1e84
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Nov 17 09:32:08 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Nov 17 09:32:08 2015 -0500
----------------------------------------------------------------------
.../usergrid/rest/management/ExportResourceIT.java | 2 +-
.../usergrid/rest/management/ImportResourceIT.java | 2 +-
.../usergrid/management/export/ExportServiceIT.java | 9 +++++----
.../usergrid/management/importer/ImportServiceIT.java | 12 ++++++------
4 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/22c29fb7/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 79590b8..81ff2d3 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,7 +32,7 @@ import java.util.UUID;
import static org.junit.Assert.*;
-@Ignore
+@Ignore("Pending merge of export-feature branch. ")
public class ExportResourceIT extends AbstractRestIT {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/22c29fb7/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 ee6ed8e..60b872d 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,7 +60,7 @@ import java.util.Properties;
import static org.junit.Assert.*;
-@Ignore
+@Ignore("Pending merge of export-feature branch. ")
public class ImportResourceIT extends AbstractRestIT {
private static final Logger logger = LoggerFactory.getLogger(ImportResourceIT.class);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/22c29fb7/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 4f78b92..c31f07c 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
@@ -150,7 +150,8 @@ public class ExportServiceIT {
//Tests to make sure we can call the job with mock data and it runs.
- @Ignore("Connections won't save when run with maven, but on local builds it will.")
+ // Connections won't save when run with maven, but on local builds it will.
+ @Ignore("Pending merge of export-feature branch")
public void testConnectionsOnCollectionExport() throws Exception {
File f = null;
@@ -746,7 +747,7 @@ public class ExportServiceIT {
@Test
- @Ignore // TODO: fix this test...
+ @Ignore("Pending merge of export-feature branch")
public void testIntegration100EntitiesOn() throws Exception {
logger.debug("testIntegration100EntitiesOn(): starting...");
@@ -834,8 +835,8 @@ public class ExportServiceIT {
}
}
- @Ignore("Why is this ignored?")
@Test
+ @Ignore("Pending merge of export-feature branch")
public void testIntegration100EntitiesForAllApps() throws Exception {
S3Export s3Export = new S3ExportImpl();
@@ -917,8 +918,8 @@ public class ExportServiceIT {
}
- @Ignore("Why is this ignored")
@Test
+ @Ignore("Pending merge of export-feature branch")
public void testIntegration100EntitiesOnOneOrg() throws Exception {
S3Export s3Export = new S3ExportImpl();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/22c29fb7/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 d7d7028..7dc075c 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
@@ -138,7 +138,7 @@ public class ImportServiceIT {
// test case to check if application is imported correctly
@Test
- @Ignore("Import organization not supported")
+ @Ignore("Pending merge of export-feature branch. Import organization not supported")
public void testImportApplication() throws Exception {
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -260,7 +260,7 @@ public class ImportServiceIT {
// test case to check if all applications file for an organization are imported correctly
@Test
- @Ignore("Import organization not supported")
+ @Ignore("Pending merge of export-feature branch. Import organization not supported")
public void testImportOrganization() throws Exception {
// creates 5 entities in usertests collection
@@ -455,7 +455,7 @@ public class ImportServiceIT {
* Test to the doImport method with null organziation ID
*/
@Test
- @Ignore("Import organization not supported")
+ @Ignore("Pending merge of export-feature branch. Import organization not supported")
public void testDoImportWithNullOrganizationID() throws Exception {
// import
S3Import s3Import = new S3ImportImpl();
@@ -481,7 +481,7 @@ public class ImportServiceIT {
* Test to the doImport method with fake organization ID
*/
@Test
- @Ignore("Import organization not supported")
+ @Ignore("Pending merge of export-feature branch. Import organization not supported")
public void testDoImportWithFakeOrganizationID() throws Exception {
UUID fakeOrgId = UUID.fromString( "AAAAAAAA-FFFF-FFFF-FFFF-AAAAAAAAAAAA" );
@@ -511,7 +511,7 @@ public class ImportServiceIT {
* Test to the doImport method with fake application ID
*/
@Test
- @Ignore("Import application not supported")
+ @Ignore("Pending merge of export-feature branch. Import application not supported")
public void testDoImportWithFakeApplicationID() throws Exception {
UUID fakeappId = UUID.fromString( "AAAAAAAA-FFFF-FFFF-FFFF-AAAAAAAAAAAA" );
@@ -543,7 +543,7 @@ public class ImportServiceIT {
* Test to the doImport Collection method with fake application ID
*/
@Test
- @Ignore("Import application not supported")
+ @Ignore("Pending merge of export-feature branch. Import application not supported")
public void testDoImportCollectionWithFakeApplicationID() throws Exception {
UUID fakeappId = UUID.fromString( "AAAAAAAA-FFFF-FFFF-FFFF-AAAAAAAAAAAA" );