You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/02/27 22:40:26 UTC
[2/2] incubator-usergrid git commit: Removing unnecessary test class
and commented out dependencies.
Removing unnecessary test class and commented out dependencies.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/489bf458
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/489bf458
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/489bf458
Branch: refs/heads/two-dot-o
Commit: 489bf458e561833ed0d84c7e290b2986e3c8280e
Parents: 2f6edd7
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Feb 27 16:36:58 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Feb 27 16:36:58 2015 -0500
----------------------------------------------------------------------
.../org/apache/usergrid/rest/SimplestTest.java | 71 --------------------
stack/test-utils/pom.xml | 11 ---
2 files changed, 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/489bf458/stack/rest/src/test/java/org/apache/usergrid/rest/SimplestTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/SimplestTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/SimplestTest.java
deleted file mode 100644
index 27898a9..0000000
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/SimplestTest.java
+++ /dev/null
@@ -1,71 +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;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.usergrid.persistence.DynamicEntity;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
-import org.apache.usergrid.utils.MapUtils;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collections;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-
-/**
- * Simple test verifies if REST test infrastructure is functioning.
- */
-public class SimplestTest extends org.apache.usergrid.rest.test.resource2point0.AbstractRestIT {
- private static final Logger logger = LoggerFactory.getLogger(SimplestTest.class);
-
- @Test
- public void getGetToken() {
- assertNotNull( getAdminToken() );
- }
-
- @Test
- public void testEntityPost() {
-
- Entity cat = new Entity();
- cat.put("name", "Bertha");
- cat.put("property1", "value1");
- Entity savedCat = this.app().collection("cats").post(cat);
-
- assertEquals( cat.get("property1"), savedCat.get("property1"));
- }
-
- @Test
- public void testEntityPostAndGet() {
-
- Entity dog = new Entity();
- dog.put("name", "Pokey");
- dog.put("property1", "value1");
- this.app().collection("dogs").post(dog);
- refreshIndex();
-
- Collection savedDogs = this.app().collection("dogs").get();
- Entity savedDog = (Entity)savedDogs.iterator().next();
- assertEquals( dog.get("property1"), savedDog.get("property1"));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/489bf458/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index d9728af..fecf069 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -242,12 +242,6 @@
<!-- we need this in all scopes, not just test -->
</dependency>
- <!-- "The artifact junit:junit-dep:jar:4.11 has been relocated to junit:junit:jar:4.11"
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- </dependency>-->
-
<!-- Test Dependencies -->
<dependency>
@@ -256,11 +250,6 @@
<scope>test</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.codehaus.jackson</groupId>-->
- <!--<artifactId>jackson-mapper-asl</artifactId>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>