You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by si...@apache.org on 2021/08/03 05:59:26 UTC

[atlas] 11/11: ATLAS-3489: Import API: Deleted entity handling improvement.

This is an automated email from the ASF dual-hosted git repository.

sidmishra pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git

commit 803d7edd503df79d33f378e2bf26259236b3167a
Author: Ashutosh Mestry <am...@hortonworks.com>
AuthorDate: Sun Oct 27 21:53:49 2019 -0700

    ATLAS-3489: Import API: Deleted entity handling improvement.
    
    (cherry picked from commit c6ee27790db7905f8d9b5b02f2961d59cc76b5cb)
---
 .../atlas/repository/impexp/ImportServiceTest.java | 61 +++++++++++-----------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/repository/src/test/java/org/apache/atlas/repository/impexp/ImportServiceTest.java b/repository/src/test/java/org/apache/atlas/repository/impexp/ImportServiceTest.java
index 3b23f12..e3410aa 100644
--- a/repository/src/test/java/org/apache/atlas/repository/impexp/ImportServiceTest.java
+++ b/repository/src/test/java/org/apache/atlas/repository/impexp/ImportServiceTest.java
@@ -29,8 +29,8 @@ import org.apache.atlas.model.impexp.AtlasImportRequest;
 import org.apache.atlas.model.instance.AtlasEntity;
 import org.apache.atlas.model.instance.AtlasEntityHeader;
 import org.apache.atlas.model.instance.AtlasObjectId;
-import org.apache.atlas.model.instance.AtlasRelatedObjectId;
 import org.apache.atlas.model.instance.AtlasRelationship;
+import org.apache.atlas.model.instance.AtlasRelatedObjectId;
 import org.apache.atlas.model.instance.EntityMutationResponse;
 import org.apache.atlas.repository.Constants;
 import org.apache.atlas.repository.AtlasTestBase;
@@ -519,6 +519,35 @@ public class ImportServiceTest extends AtlasTestBase {
         assertFalse(importService.checkHiveTableIncrementalSkipLineage(importRequest, exportRequest));
     }
 
+    @Test(dataProvider = "dup_col_data")
+    public void testImportDuplicateColumnsWithDifferentStatus(InputStream inputStream) throws IOException, AtlasBaseException {
+        loadBaseModel();
+        loadFsModel();
+        loadHiveModel();
+
+        runImportWithNoParameters(importService, inputStream);
+
+        AtlasEntity.AtlasEntityWithExtInfo atlasEntityWithExtInfo = entityStore.getById("e18e15de-1810-4724-881a-5cb6b2160077");
+        assertNotNull(atlasEntityWithExtInfo);
+
+        AtlasEntity atlasEntity = atlasEntityWithExtInfo.getEntity();
+        assertNotNull(atlasEntity);
+
+        List<AtlasRelatedObjectId> columns = (List<AtlasRelatedObjectId>) atlasEntity.getRelationshipAttribute("columns");
+        assertEquals( columns.size(), 4);
+
+        for(AtlasRelatedObjectId id : columns){
+            if(id.getGuid().equals("a3de3e3b-4bcd-4e57-a988-1101a2360200")){
+                assertEquals(id.getEntityStatus(), AtlasEntity.Status.DELETED);
+                assertEquals(id.getRelationshipStatus(), AtlasRelationship.Status.DELETED);
+            }
+            if(id.getGuid().equals("f7fa3768-f3de-48a8-92a5-38ec4070152c")) {
+                assertEquals(id.getEntityStatus(), AtlasEntity.Status.ACTIVE);
+                assertEquals(id.getRelationshipStatus(), AtlasRelationship.Status.ACTIVE);
+            }
+        }
+    }
+
     private AtlasImportRequest getImportRequest(String replicatedFrom){
         AtlasImportRequest importRequest = getDefaultImportRequest();
 
@@ -557,34 +586,4 @@ public class ImportServiceTest extends AtlasTestBase {
 
         return options;
     }
-
-    @Test(dataProvider = "dup_col_data")
-    public void testImportDuplicateColumnsWithDifferentStatus(InputStream inputStream) throws IOException, AtlasBaseException {
-        loadBaseModel();
-        loadFsModel();
-        loadHiveModel();
-
-        runImportWithNoParameters(importService, inputStream);
-
-        AtlasEntity.AtlasEntityWithExtInfo atlasEntityWithExtInfo = entityStore.getById("e18e15de-1810-4724-881a-5cb6b2160077");
-        assertNotNull(atlasEntityWithExtInfo);
-
-        AtlasEntity atlasEntity = atlasEntityWithExtInfo.getEntity();
-        assertNotNull(atlasEntity);
-
-        List<AtlasRelatedObjectId> columns = (List<AtlasRelatedObjectId>) atlasEntity.getRelationshipAttribute("columns");
-        assertEquals( columns.size(), 4);
-
-        for(AtlasRelatedObjectId id : columns){
-            if(id.getGuid().equals("a3de3e3b-4bcd-4e57-a988-1101a2360200")){
-                assertEquals(id.getEntityStatus(), AtlasEntity.Status.DELETED);
-                assertEquals(id.getRelationshipStatus(), AtlasRelationship.Status.DELETED);
-            }
-            if(id.getGuid().equals("f7fa3768-f3de-48a8-92a5-38ec4070152c")) {
-                assertEquals(id.getEntityStatus(), AtlasEntity.Status.ACTIVE);
-                assertEquals(id.getRelationshipStatus(), AtlasRelationship.Status.ACTIVE);
-            }
-        }
-    }
-
 }