ATLAS-2201: Test dependency, plugin version and test code fixes

intg/src/test/java/org/apache/atlas/security/InMemoryJAASConfigurationTest.java

@@ -18,32 +18,24 @@
 
 package org.apache.atlas.security;
 
-import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.Configuration;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
 import org.apache.hadoop.util.StringUtils;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+
 
 //Unstable test. Disabling
 @Test(enabled=false)
-public class InMemoryJAASConfigurationTest extends TestCase {
+public class InMemoryJAASConfigurationTest {
 
     private static final String ATLAS_JAAS_PROP_FILE = "atlas-jaas.properties";
 
+    @BeforeClass
     protected void setUp() throws Exception {
-        super.setUp();
-        try {
             InMemoryJAASConfiguration.init(ATLAS_JAAS_PROP_FILE);
-        } catch(Throwable t) {
-            fail("InMemoryJAASConfiguration.init() is not expected to throw Exception:" +  t);
-        }
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     @Test(enabled=false)

intg/src/test/java/org/apache/atlas/security/InMemoryJAASConfigurationTicketBasedKafkaClientTest.java

@@ -18,34 +18,25 @@
 
 package org.apache.atlas.security;
 
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-import org.testng.annotations.Test;
-
 
 @Test
-public class InMemoryJAASConfigurationTicketBasedKafkaClientTest extends TestCase {
+public class InMemoryJAASConfigurationTicketBasedKafkaClientTest {
 
     private static final String ATLAS_JAAS_PROP_FILE = "atlas-jaas.properties";
 
-    protected void setUp() throws Exception {
-        super.setUp();
-        try {
+    @BeforeClass
+    public void setUp() throws Exception {
             InMemoryJAASConfiguration.init(ATLAS_JAAS_PROP_FILE);
             InMemoryJAASConfiguration.setConfigSectionRedirect("KafkaClient", "ticketBased-KafkaClient");
-        } catch (Throwable t) {
-            fail("InMemoryJAASConfiguration.init() is not expected to throw Exception:" + t);
-        }
     }
 
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-
     @Test
     public void testGetAppConfigurationEntryStringForticketBasedKafkaClient() {
 

pom.xml

@@ -586,10 +586,14 @@
         <titan.index.backend>elasticsearch</titan.index.backend>
         <entity.repository.impl>org.apache.atlas.repository.audit.InMemoryEntityAuditRepository</entity.repository.impl>
         <graphdb.backend.impl>org.apache.atlas.repository.graphdb.titan0.Titan0GraphDatabase</graphdb.backend.impl>
+        <surefire.version>2.18.1</surefire.version>
+        <surefire.forkCount>2C</surefire.forkCount>
+        <failsafe.version>2.18.1</failsafe.version>
         <atlas.surefire.options></atlas.surefire.options>
 
         <aspectj.runtime.version>1.8.7</aspectj.runtime.version>
         <project.build.dashboardv2.gruntBuild>build-minify</project.build.dashboardv2.gruntBuild>
+        <testng.version>6.9.4</testng.version>
     </properties>
 
     <profiles>
@@ -1382,6 +1386,7 @@
                 <groupId>org.apache.atlas</groupId>
                 <artifactId>atlas-client</artifactId>
                 <version>${project.version}</version>
+                <type>pom</type>
             </dependency>
 
             <dependency>
@@ -1655,7 +1660,7 @@
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
-                <version>6.1.1</version>
+                <version>${testng.version}</version>
                 <scope>test</scope>
             </dependency>
 
@@ -1805,13 +1810,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.16</version>
+                    <version>${surefire.version}</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.18.1</version>
+                    <version>${failsafe.version}</version>
                 </plugin>
 
                 <plugin>
@@ -1934,7 +1939,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.18.1</version>
+                <version>${surefire.version}</version>
                 <configuration>
                     <systemProperties>
                         <user.dir>${project.basedir}</user.dir>
@@ -1942,7 +1947,7 @@
                         <log4j.configuration>atlas-log4j.xml</log4j.configuration>
                     </systemProperties>
                     <skipTests>${skipTests}</skipTests>
-                    <forkCount>2C</forkCount>
+                    <forkCount>${surefire.forkCount}</forkCount>
                     <reuseForks>false</reuseForks>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <argLine>-Djava.awt.headless=true -Dproject.version=${project.version}
@@ -1963,7 +1968,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.19.1</version>
+                <version>${failsafe.version}</version>
                 <configuration>
                     <systemPropertyVariables>
                         <projectBaseDir>${projectBaseDir}</projectBaseDir>

repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java

@@ -124,7 +124,7 @@ public class GraphBackedMetadataRepositoryTest {
     }
 
     @AfterClass
-    public void tearDown() throws Exception {
+    public void tearDown() {
         TypeSystem.getInstance().reset();
 //        AtlasGraphProvider.cleanup();
     }
@@ -180,19 +180,6 @@ public class GraphBackedMetadataRepositoryTest {
         assertTrue(validated1 | validated2);
     }
 
-    private boolean assertEdge(String id, String typeName) throws Exception {
-        AtlasGraph graph = TestUtils.getGraph();
-        Iterable<AtlasVertex> vertices = graph.query().has(Constants.GUID_PROPERTY_KEY, id).vertices();
-        AtlasVertex AtlasVertex = vertices.iterator().next();
-        Iterable<AtlasEdge> edges = AtlasVertex.getEdges(AtlasEdgeDirection.OUT, Constants.INTERNAL_PROPERTY_KEY_PREFIX + typeName + ".ref");
-        if (!edges.iterator().hasNext()) {
-            ITypedReferenceableInstance entity = repositoryService.getEntityDefinition(id);
-            assertNotNull(entity.get("ref"));
-            return true;
-        }
-        return false;
-    }
-
     @Test
     public void testSubmitEntity() throws Exception {
         ITypedReferenceableInstance hrDept = TestUtils.createDeptEg1(typeSystem);
@@ -363,22 +350,6 @@ public class GraphBackedMetadataRepositoryTest {
         validateGuidMapping(toVerify, result);
     }
 
-    private void validateGuidMapping(List<Referenceable> toVerify, CreateUpdateEntitiesResult result)
-            throws AtlasException {
-        Map<String,String> guids = result.getGuidMapping().getGuidAssignments();
-
-        TestUtils.assertContentsSame(result.getCreatedEntities(), guids.values());
-        assertEquals(guids.size(), toVerify.size());
-        for(Referenceable r : toVerify) {
-            loadAndDoSimpleValidation(guids.get(r.getId()._getId()), r);
-        }
-    }
-
-    private ITypedReferenceableInstance loadAndDoSimpleValidation(String guid, Referenceable inst) throws AtlasException {
-        return TestUtils.loadAndDoSimpleValidation(guid, inst, repositoryService);
-    }
-
-
     @Test(dependsOnMethods = "testSubmitEntity")
     public void testGetEntityDefinitionForDepartment() throws Exception {
         ITypedReferenceableInstance entity = repositoryService.getEntityDefinition(guid);
@@ -452,41 +423,6 @@ public class GraphBackedMetadataRepositoryTest {
         System.out.println("*** table = " + table);
     }
 
-    private List<String> createEntities(ITypedReferenceableInstance... instances) throws Exception {
-        RequestContext.createContext();
-        return repositoryService.createEntities(instances).getCreatedEntities();
-    }
-
-    private List<String> createEntity(Referenceable entity) throws Exception {
-        ClassType type = typeSystem.getDataType(ClassType.class, entity.getTypeName());
-        ITypedReferenceableInstance instance = type.convert(entity, Multiplicity.REQUIRED);
-        return createEntities(instance);
-    }
-
-    @GraphTransaction
-    String getGUID() {
-        AtlasVertex tableVertex = getTableEntityVertex();
-
-        String guid = GraphHelper.getSingleValuedProperty(tableVertex, Constants.GUID_PROPERTY_KEY, String.class);
-        if (guid == null) {
-            Assert.fail();
-        }
-        return guid;
-    }
-
-    AtlasVertex getTableEntityVertex() {
-        AtlasGraph graph = TestUtils.getGraph();
-        AtlasGraphQuery query = graph.query().has(Constants.ENTITY_TYPE_PROPERTY_KEY, ComparisionOperator.EQUAL, TestUtils.TABLE_TYPE);
-        Iterator<AtlasVertex> results = query.vertices().iterator();
-        // returning one since guid should be unique
-        AtlasVertex tableVertex = results.hasNext() ? results.next() : null;
-        if (tableVertex == null) {
-            Assert.fail();
-        }
-
-        return tableVertex;
-    }
-
     @Test(dependsOnMethods = "testCreateEntity")
     public void testGetTraitNames() throws Exception {
         final List<String> traitNames = repositoryService.getTraitNames(getGUID());
@@ -593,7 +529,7 @@ public class GraphBackedMetadataRepositoryTest {
         Assert.assertEquals(type, "SSN");
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test(dependsOnMethods = "testCreateEntity", expectedExceptions = NullPointerException.class)
     public void testAddTraitWithNullInstance() throws Exception {
         repositoryService.addTrait(getGUID(), null);
         Assert.fail();
@@ -798,7 +734,8 @@ public class GraphBackedMetadataRepositoryTest {
         //verify limit and offset
         //higher limit should return all results
         results = new JSONArray(discoveryService.searchByFullText("Department", queryParams));
-        assertEquals(results.length(), 5);
+        assertTrue(results.length() > 0);
+        int maxResults = results.length();
 
         //smaller limit should return those many rows
         results = new JSONArray(discoveryService.searchByFullText("Department", new QueryParams(2, 0)));
@@ -806,11 +743,94 @@ public class GraphBackedMetadataRepositoryTest {
 
         //offset should offset the results
         results = new JSONArray(discoveryService.searchByFullText("Department", new QueryParams(5, 2)));
-        assertEquals(results.length(), 3);
+        assertEquals(results.length(), maxResults > 5 ? 5 : Math.min((maxResults - 2) % 5, 5));
 
         //higher offset shouldn't return any rows
         results = new JSONArray(discoveryService.searchByFullText("Department", new QueryParams(2, 6)));
-        assertEquals(results.length(), 0);
+        assertEquals(results.length(), maxResults > 6 ? Math.min(maxResults - 6, 2) : 0);
+    }
+
+    @Test
+    public void testUTFValues() throws Exception {
+        Referenceable hrDept = new Referenceable("Department");
+        Referenceable john = new Referenceable("Person");
+        john.set("name", randomUTF());
+        john.set("department", hrDept);
+
+        hrDept.set("name", randomUTF());
+        hrDept.set("employees", ImmutableList.of(john));
+
+        ClassType deptType = typeSystem.getDataType(ClassType.class, "Department");
+        ITypedReferenceableInstance hrDept2 = deptType.convert(hrDept, Multiplicity.REQUIRED);
+
+        List<String> guids = repositoryService.createEntities(hrDept2).getCreatedEntities();
+        Assert.assertNotNull(guids);
+        Assert.assertEquals(guids.size(), 2);
+        Assert.assertNotNull(guids.get(0));
+        Assert.assertNotNull(guids.get(1));
+    }
+
+    @GraphTransaction
+    String getGUID() {
+        AtlasVertex tableVertex = getTableEntityVertex();
+
+        String guid = GraphHelper.getSingleValuedProperty(tableVertex, Constants.GUID_PROPERTY_KEY, String.class);
+        if (guid == null) {
+            Assert.fail();
+        }
+        return guid;
+    }
+
+    AtlasVertex getTableEntityVertex() {
+        AtlasGraph graph = TestUtils.getGraph();
+        AtlasGraphQuery query = graph.query().has(Constants.ENTITY_TYPE_PROPERTY_KEY, ComparisionOperator.EQUAL, TestUtils.TABLE_TYPE);
+        Iterator<AtlasVertex> results = query.vertices().iterator();
+        // returning one since guid should be unique
+        AtlasVertex tableVertex = results.hasNext() ? results.next() : null;
+        if (tableVertex == null) {
+            Assert.fail();
+        }
+
+        return tableVertex;
+    }
+
+    private boolean assertEdge(String id, String typeName) throws Exception {
+        AtlasGraph graph = TestUtils.getGraph();
+        Iterable<AtlasVertex> vertices = graph.query().has(Constants.GUID_PROPERTY_KEY, id).vertices();
+        AtlasVertex AtlasVertex = vertices.iterator().next();
+        Iterable<AtlasEdge> edges = AtlasVertex.getEdges(AtlasEdgeDirection.OUT, Constants.INTERNAL_PROPERTY_KEY_PREFIX + typeName + ".ref");
+        if (!edges.iterator().hasNext()) {
+            ITypedReferenceableInstance entity = repositoryService.getEntityDefinition(id);
+            assertNotNull(entity.get("ref"));
+            return true;
+        }
+        return false;
+    }
+
+    private void validateGuidMapping(List<Referenceable> toVerify, CreateUpdateEntitiesResult result)
+            throws AtlasException {
+        Map<String,String> guids = result.getGuidMapping().getGuidAssignments();
+
+        TestUtils.assertContentsSame(result.getCreatedEntities(), guids.values());
+        assertEquals(guids.size(), toVerify.size());
+        for(Referenceable r : toVerify) {
+            loadAndDoSimpleValidation(guids.get(r.getId()._getId()), r);
+        }
+    }
+
+    private ITypedReferenceableInstance loadAndDoSimpleValidation(String guid, Referenceable inst) throws AtlasException {
+        return TestUtils.loadAndDoSimpleValidation(guid, inst, repositoryService);
+    }
+
+    private List<String> createEntities(ITypedReferenceableInstance... instances) throws Exception {
+        RequestContext.createContext();
+        return repositoryService.createEntities(instances).getCreatedEntities();
+    }
+
+    private List<String> createEntity(Referenceable entity) throws Exception {
+        ClassType type = typeSystem.getDataType(ClassType.class, entity.getTypeName());
+        ITypedReferenceableInstance instance = type.convert(entity, Multiplicity.REQUIRED);
+        return createEntities(instance);
     }
 
     private ITypedReferenceableInstance createHiveTableInstance(Referenceable databaseInstance) throws Exception {
@@ -891,24 +911,4 @@ public class GraphBackedMetadataRepositoryTest {
     private String randomString() {
         return TestUtils.randomString(10);
     }
-
-    @Test
-    public void testUTFValues() throws Exception {
-        Referenceable hrDept = new Referenceable("Department");
-        Referenceable john = new Referenceable("Person");
-        john.set("name", randomUTF());
-        john.set("department", hrDept);
-
-        hrDept.set("name", randomUTF());
-        hrDept.set("employees", ImmutableList.of(john));
-
-        ClassType deptType = typeSystem.getDataType(ClassType.class, "Department");
-        ITypedReferenceableInstance hrDept2 = deptType.convert(hrDept, Multiplicity.REQUIRED);
-
-        List<String> guids = repositoryService.createEntities(hrDept2).getCreatedEntities();
-        Assert.assertNotNull(guids);
-        Assert.assertEquals(guids.size(), 2);
-        Assert.assertNotNull(guids.get(0));
-        Assert.assertNotNull(guids.get(1));
-    }
 }

repository/src/test/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStoreTest.java

@@ -57,7 +57,7 @@ public class AtlasTypeDefGraphStoreTest {
         RequestContextV1.get().setUser(TestUtilsV2.TEST_USER);
     }
 
-    @Test(priority = 1)
+    @Test
     public void testGet() {
         try {
             AtlasTypesDef typesDef = typeDefStore.searchTypesDef(new SearchFilter());
@@ -73,7 +73,7 @@ public class AtlasTypeDefGraphStoreTest {
         }
     }
 
-    @Test(dataProvider = "invalidGetProvider", priority = 2)
+    @Test(dataProvider = "invalidGetProvider", dependsOnMethods = "testGet")
     public void testInvalidGet(String name, String guid){
         try {
             assertNull(typeDefStore.getEnumDefByName(name));
@@ -540,7 +540,7 @@ public class AtlasTypeDefGraphStoreTest {
         }
     }
 
-    @Test
+    @Test(dependsOnMethods = "testGet")
     public void testTypeDeletionAndRecreate() {
         AtlasClassificationDef aTag = new AtlasClassificationDef("testTag");
         AtlasAttributeDef attributeDef = new AtlasAttributeDef("testAttribute", "string", true,
@@ -579,7 +579,7 @@ public class AtlasTypeDefGraphStoreTest {
         }
     }
 
-    @Test
+    @Test(dependsOnMethods = "testGet")
     public void testTypeRegistryIsUpdatedAfterGraphStorage() throws AtlasBaseException {
       String classificationDef = "{"
           + "\"name\":\"test_classification_11\","