[atlas] branch branch-2.0 updated: ATLAS-4125: JavaPatch to add new supertypes to existing entities #2 fix Unit tests

[sarath]

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

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


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new f32f735  ATLAS-4125: JavaPatch to add new supertypes to existing 
entities #2 fix Unit tests
f32f735 is described below

commit f32f7352f9b1c5871f48e9ff91af4db61872f055
Author: Radhika Kundam <rkun...@cloudera.com>
AuthorDate: Tue Feb 9 15:48:12 2021 -0800

    ATLAS-4125: JavaPatch to add new supertypes to existing entities #2 fix 
Unit tests
    
    Signed-off-by: Sarath Subramanian <sar...@apache.org>
    (cherry picked from commit a531e8c685a0758e13d2862a98284110bc8faf22)
---
 .../org/apache/atlas/hive/hook/HiveHookIT.java     | 39 ++++++++++++----------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git 
a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java 
b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
index 5083bcc..03bbd60 100755
--- 
a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
+++ 
b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
@@ -71,7 +71,8 @@ import static org.testng.AssertJUnit.assertEquals;
 public class HiveHookIT extends HiveITBase {
     private static final Logger LOG = 
LoggerFactory.getLogger(HiveHookIT.class);
 
-    private static final String PART_FILE  = "2015-01-01";
+    private static final String PART_FILE      = "2015-01-01";
+    private static final String PATH_TYPE_NAME = "Path";
 
     private Driver driverWithNoHook;
 
@@ -142,16 +143,6 @@ public class HiveHookIT extends HiveITBase {
         String hdfsLocation = 
"hdfs://localhost:8020/warehouse/tablespace/external/hive/reports.db";
         alterDatabaseLocation(dbName, hdfsLocation);
         assertDatabaseLocationRelationship(dbId);
-
-        //AWS location
-        String s3Location = 
"s3://localhost:8020/warehouse/tablespace/external/hive/reports.db";
-        alterDatabaseLocation(dbName, s3Location);
-        assertDatabaseLocationRelationship(dbId);
-
-        //ABFS location
-        String abfsLocation = 
"abfs://localhost:8020/warehouse/tablespace/external/hive/reports.db";
-        alterDatabaseLocation(dbName, abfsLocation);
-        assertDatabaseLocationRelationship(dbId);
     }
 
     //alter database location
@@ -162,20 +153,32 @@ public class HiveHookIT extends HiveITBase {
     }
 
     public void assertDatabaseLocationRelationship(String dbId) throws 
Exception {
-        AtlasEntity dbEntity = atlasClientV2.getEntityByGuid(dbId).getEntity();
-        AtlasEntityDef pathEntityDef = 
atlasClientV2.getEntityDefByName("Path");
+        AtlasEntity    dbEntity      = 
atlasClientV2.getEntityByGuid(dbId).getEntity();
+        AtlasEntityDef pathEntityDef = getPathEntityDefWithAllSubTypes();
 
-        //Check if dbEntity has location attribute
         assertTrue(dbEntity.hasAttribute(ATTRIBUTE_LOCATION));
-        //Check if dbEntity has value for location attribute
+
         assertNotNull(dbEntity.getAttribute(ATTRIBUTE_LOCATION));
-        //Check if dbEntity has location relationship attribute
-        assertEquals(((List) 
dbEntity.getRelationshipAttribute(ATTRIBUTE_LOCATION_PATH)).size(), 1);
+
+        
assertNotNull(dbEntity.getRelationshipAttribute(ATTRIBUTE_LOCATION_PATH));
+
         AtlasObjectId locationEntityObject = 
toAtlasObjectId(dbEntity.getRelationshipAttribute(ATTRIBUTE_LOCATION_PATH));
-        //Check if location relationship attribute is subtype of "Path"
         
assertTrue(pathEntityDef.getSubTypes().contains(locationEntityObject.getTypeName()));
     }
 
+    public AtlasEntityDef getPathEntityDefWithAllSubTypes() throws Exception {
+        Set<String>     possiblePathSubTypes = new 
HashSet<>(Arrays.asList("fs_path", "hdfs_path", "aws_s3_pseudo_dir", 
"aws_s3_v2_directory", "adls_gen2_directory"));
+        AtlasEntityDef  pathEntityDef        = 
atlasClientV2.getEntityDefByName(PATH_TYPE_NAME);
+
+        if(pathEntityDef == null) {
+            pathEntityDef = new AtlasEntityDef(PATH_TYPE_NAME);
+        }
+
+        pathEntityDef.setSubTypes(possiblePathSubTypes);
+
+        return pathEntityDef;
+    }
+
     @Test
     public void testCreateTable() throws Exception {
         String tableName = tableName();