You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sh...@apache.org on 2016/01/25 07:49:53 UTC

incubator-atlas git commit: ATLAS-439 Investigate apache build failure - EntityJerseyResourceIT.testEntityDeduping (shwethags)

Repository: incubator-atlas
Updated Branches:
  refs/heads/master 9f28540b5 -> a1fb9edae


ATLAS-439 Investigate apache build failure - EntityJerseyResourceIT.testEntityDeduping (shwethags)


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

Branch: refs/heads/master
Commit: a1fb9edae97c199670291c6c383b14bdeeb00ff5
Parents: 9f28540
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Mon Jan 25 12:19:47 2016 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Mon Jan 25 12:19:47 2016 +0530

----------------------------------------------------------------------
 release-log.txt                                             | 1 +
 .../apache/atlas/web/resources/EntityJerseyResourceIT.java  | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a1fb9eda/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 0beb28e..673f20a 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -7,6 +7,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
 ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
 
 ALL CHANGES:
+ATLAS-439 Investigate apache build failure - EntityJerseyResourceIT.testEntityDeduping (shwethags)
 ATLAS-426 atlas_start fails on cygwin (dkantor via shwethags)
 ATLAS-448 Hive IllegalArgumentException with Atlas hook enabled on SHOW TRANSACTIONS AND SHOW COMPACTIONS (shwethags)
 ATLAS-181 Integrate storm topology metadata into Atlas (svenkat,yhemanth via shwethags)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a1fb9eda/webapp/src/test/java/org/apache/atlas/web/resources/EntityJerseyResourceIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/resources/EntityJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/resources/EntityJerseyResourceIT.java
index 73d26ce..f19463f 100755
--- a/webapp/src/test/java/org/apache/atlas/web/resources/EntityJerseyResourceIT.java
+++ b/webapp/src/test/java/org/apache/atlas/web/resources/EntityJerseyResourceIT.java
@@ -141,12 +141,12 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
         db.set("name", dbName);
         db.set("description", randomString());
 
-        serviceClient.createEntity(db).getString(0);
+        final String dbid = serviceClient.createEntity(db).getString(0);
 
         waitForNotification(notificationConsumer, MAX_WAIT_TIME, new NotificationPredicate() {
             @Override
             public boolean evaluate(EntityNotification notification) throws Exception {
-                return notification != null && notification.getEntity().get("name").equals(dbName);
+                return notification != null && notification.getEntity().getId()._getId().equals(dbid);
             }
         });
 
@@ -155,12 +155,13 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
         assertEquals(results.length(), 1);
 
         //create entity again shouldn't create another instance with same unique attribute value
-        serviceClient.createEntity(db);
+        results = serviceClient.createEntity(db);
+        assertEquals(results.length(), 0);
         try {
             waitForNotification(notificationConsumer, MAX_WAIT_TIME, new NotificationPredicate() {
                 @Override
                 public boolean evaluate(EntityNotification notification) throws Exception {
-                    return notification != null && notification.getEntity().get("name").equals(dbName);
+                    return notification != null && notification.getEntity().getId()._getId().equals(dbid);
                 }
             });
             fail("Expected time out exception");