You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/02 17:12:29 UTC
git commit: Fixes compilation issue with tests and 4.10 4.11 conflict
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 38885fa8e -> b644cc0aa
Fixes compilation issue with tests and 4.10 4.11 conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b644cc0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b644cc0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b644cc0a
Branch: refs/heads/two-dot-o
Commit: b644cc0aa2db25833e525e1386678ce04ae05569
Parents: 38885fa
Author: Todd Nine <to...@apache.org>
Authored: Thu Oct 2 01:56:24 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Thu Oct 2 01:56:24 2014 -0600
----------------------------------------------------------------------
stack/pom.xml | 2 +-
.../java/org/apache/usergrid/rest/PartialUpdateTest.java | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b644cc0a/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index c56942c..e105c79 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1243,7 +1243,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b644cc0a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
index 7053160..ec8cf44 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
@@ -29,8 +29,10 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
/**
@@ -103,8 +105,9 @@ public class PartialUpdateTest extends AbstractRestIT {
.get(String.class));
assertNotNull(userNode);
assertEquals("Initech", userNode.withArray("entities").get(0).get("employer").asText());
- assertNotEquals(latitude, userNode.withArray("entities").get(0).get("location").get("latitude"));
- assertNotEquals(longitude, userNode.withArray("entities").get(0).get("location").get("longitude"));
+ //TODO Alex fix this, it doesn't compile
+ assertNotEquals(latitude, userNode.withArray("entities").get(0).get("location").get("latitude").asDouble(), 0d);
+ assertNotEquals(longitude, userNode.withArray("entities").get(0).get("location").get("longitude").asDouble(), 0d);
}
// Update bart's employer without specifying any required fields