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/02/16 21:43:26 UTC
[1/3] incubator-usergrid git commit: Test for correct fail and
success counts,
and for JSON parsing error message for the one file that failed.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-import c46d0d1f3 -> 1385ffe8e
Test for correct fail and success counts, and for JSON parsing error message for the one file that failed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0612dc7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0612dc7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0612dc7f
Branch: refs/heads/two-dot-o-import
Commit: 0612dc7f2a6c758419dd5688f28c72a26b61ad71
Parents: bb0132d
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Feb 16 11:58:15 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Feb 16 11:58:15 2015 -0500
----------------------------------------------------------------------
.../management/importer/ImportCollectionIT.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0612dc7f/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
index e6ae945..1dee889 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
@@ -449,6 +449,21 @@ public class ImportCollectionIT {
assertEquals( "There four file imports", 4, results.size() );
+ int successCount = 0;
+ int failCount = 0;
+
+ for ( Entity e : results.getEntities() ) {
+ FileImport fileImport = (FileImport)e;
+ if ( fileImport.getState().equals( FileImport.State.FINISHED )) {
+ successCount++;
+ } else {
+ failCount++;
+ assertTrue( fileImport.getErrorMessage().startsWith("Unexpected character"));
+ }
+ }
+
+ assertEquals( 3, successCount );
+ assertEquals( 1, failCount );
}
[3/3] incubator-usergrid git commit: Merge branch 'two-dot-o-import'
of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-import
Posted by sn...@apache.org.
Merge branch 'two-dot-o-import' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-import
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1385ffe8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1385ffe8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1385ffe8
Branch: refs/heads/two-dot-o-import
Commit: 1385ffe8e6ed903fcf77f36367b9a4b837eac6e9
Parents: 1b5af8a c46d0d1
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Feb 16 13:29:16 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Feb 16 13:29:16 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/usergrid/utils/JsonUtils.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] incubator-usergrid git commit: Merge branch 'two-dot-o-import'
of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-import
Posted by sn...@apache.org.
Merge branch 'two-dot-o-import' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-import
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1b5af8ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1b5af8ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1b5af8ac
Branch: refs/heads/two-dot-o-import
Commit: 1b5af8acf9b7d8ccfe28374742a15db71df365a7
Parents: 0612dc7 b9aae3c
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Feb 16 13:18:35 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Feb 16 13:18:35 2015 -0500
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 14 +----
.../corepersistence/CpRelationManager.java | 40 ++++++++------
.../corepersistence/util/CpEntityMapUtils.java | 55 ++++++++++++++------
.../usergrid/rest/filters/MeteringFilter.java | 6 +--
4 files changed, 67 insertions(+), 48 deletions(-)
----------------------------------------------------------------------