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:27:47 UTC
[26/50] usergrid git commit: Remove some unnecessary ignore
annotations and some unnecessary code.
Remove some unnecessary ignore annotations and some unnecessary code.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1434deaa
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1434deaa
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1434deaa
Branch: refs/heads/USERGRID-872
Commit: 1434deaace2bd9bb9a237b1a5da9fbaab70ec1e7
Parents: f1aa450
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Nov 13 10:54:13 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Nov 13 10:54:13 2015 -0500
----------------------------------------------------------------------
.../corepersistence/StaleIndexCleanupTest.java | 2 +-
.../usergrid/corepersistence/index/RxTest.java | 2 +-
.../collection/CollectionsResourceIT.java | 18 ------
.../usergrid/rest/test/resource/DumbClient.java | 58 --------------------
.../usergrid/cassandra/FakeSchemaManager.java | 4 --
5 files changed, 2 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1434deaa/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
index 5e0e062..2f96c18 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
@@ -196,7 +196,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT {
* it is building search results.
*/
@Test
- @Ignore("Broken until search connections is fixed")
+ @Ignore("Breaks other tests - or would if we reenabled that EVENTS_DISABLED property")
public void testStaleIndexCleanup() throws Exception {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1434deaa/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java
index 020371d..1a94aac 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java
@@ -64,7 +64,7 @@ public class RxTest {
@Test
- @Ignore("This seems like it should work, yet blocks forever")
+ @Ignore("Experimental - seems like it should work, yet blocks forever")
public void testConnectableObserver() throws InterruptedException {
final int count = 10;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1434deaa/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
index 92eac90..57f7b2c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
@@ -103,24 +103,6 @@ public class CollectionsResourceIT extends AbstractRestIT {
}
- @Ignore("Not sure that this test makes any sense")
- @Test
- public void postToEmptyCollection() throws IOException {
-/*
- Entity payload = new Entity();
- Entity entity = this.app().collection("cities").post(payload);
- assertNull(entity.get("name"));
-
-
- Map<String, String> payload = new HashMap<String, String>();
-
- JsonNode node = mapper.readTree( resource().path( "/test-organization/test-app/cities" ).queryParam( "access_token", access_token )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .post( String.class, payload ));
- assertNull( getEntity( node, 0 ) );
- assertNull( node.get( "count" ) );
-*/
- }
@Test
public void postToReservedField() throws Exception {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1434deaa/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/DumbClient.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/DumbClient.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/DumbClient.java
deleted file mode 100644
index ae74d4b..0000000
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/DumbClient.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.usergrid.rest.test.resource;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import org.apache.usergrid.persistence.index.utils.UUIDUtils;
-
-
-
-/**
- * Test Class used to model if the client is working or doing what it is supposed to be doing.
- * ask if this is for test purposes and if so if I can mark it with junit
- */
-
-public class DumbClient extends AbstractRestIT {
-
- @Test
- public void stuff(){
-
- String name = "stuff"+ UUIDUtils.newTimeUUID();
- // User user = new User( "derp","derp", "derp" );
-
-
- //Organization org = clientSetup.getRestClient().management().orgs().post( )
- // clientSetup.getRestClient().management().orgs().delete(org.getName);
- // OrganizationResource response = clientSetup.getRestClient().management().orgs().organization( "" );
- //assertNotNull( response );
- //EntityResponse itr = client.org( "test" ).getApp( "test" ).users().getEntityResponse();
- //for(Entity entity: itr){
- }
-
-
- @Ignore
- public void stateful(){
-
-// EntityResponse itr = client.org( "test" ).getApp( "test" ).users().getEntityResponse();
-//
-// for(Entity entity: itr){
-//
-// }
- }
-}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1434deaa/stack/test-utils/src/test/java/org/apache/usergrid/cassandra/FakeSchemaManager.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/test/java/org/apache/usergrid/cassandra/FakeSchemaManager.java b/stack/test-utils/src/test/java/org/apache/usergrid/cassandra/FakeSchemaManager.java
index 7d80c6e..bb6a933 100644
--- a/stack/test-utils/src/test/java/org/apache/usergrid/cassandra/FakeSchemaManager.java
+++ b/stack/test-utils/src/test/java/org/apache/usergrid/cassandra/FakeSchemaManager.java
@@ -17,11 +17,7 @@
package org.apache.usergrid.cassandra;
-import org.junit.Ignore;
-
-
/** @author zznate */
-@Ignore
public class FakeSchemaManager implements SchemaManager {
@Override
public void create() {