usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [16/16] incubator-usergrid git commit: Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into USERGRID-313
Date Wed, 07 Jan 2015 19:18:37 GMT
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into USERGRID-313

# By grey (5) and ryan bridges (5)
# Via Rod Simpson (4) and grey (2)
* 'two-dot-o' of github.com:apache/incubator-usergrid:
  Removed test duplicated test. Fixed logic issue with helper method.
  Added a helper method to collections. Changed the test to use this new helper method.
  Removed test that was never properly implemented. Cleaned up all the tests with helper methods.
Added comments detailing what each test does.
  Removed different PagingEntitiesTest and just consolidated tests into PagingResourceIT.
Added helper methods and removed a lot of duplicated code. Added queryParameters to getNextPage
method since we can do queryGets. Added a note to have the collection remember its own name
  Fixed PagingEntities and PagingResourceTest. Fixed bug where proper resource wasn't being
used in the delete call. Added a queryParameter get call to the Entity method for testing
purposes. Added a way to get the response from Collection
  [USERGRID-288]Updated GeoPagingTests
  Added comments to configuration options. removed 'root' declaration
  Adding editorconfig settings file to help with consistent formatting
  fixed formatting
  Adding excludes to rat


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

Branch: refs/heads/USERGRID-313
Commit: 421a1d9d855d95cfadb481036cd3a13ec023c684
Parents: e031087 323ef95
Author: grey <greyes@apigee.com>
Authored: Wed Jan 7 11:01:42 2015 -0800
Committer: grey <greyes@apigee.com>
Committed: Wed Jan 7 11:01:42 2015 -0800

----------------------------------------------------------------------
 stack/.editorconfig                             |  26 +
 stack/pom.xml                                   |   2 +
 .../collection/paging/PagingEntitiesTest.java   | 132 -----
 .../collection/paging/PagingResourceIT.java     | 442 ++++++++-------
 .../applications/queries/GeoPagingTest.java     | 563 +++++++++----------
 .../endpoints/CollectionEndpoint.java           |  10 +-
 .../endpoints/EntityEndpoint.java               |  11 +
 .../test/resource2point0/model/Collection.java  |  11 +-
 8 files changed, 566 insertions(+), 631 deletions(-)
----------------------------------------------------------------------



Mime
View raw message