Merge pull request AppiumTestDistribution#38 from SushanthN/individual_tests

Added code to handle individual tests execution

Author: AnilPatidar

src/main/java/com/appium/executor/ATDExecutor.java

@@ -1,12 +1,7 @@
 package com.appium.executor;
 
 import static com.appium.filelocations.FileLocations.PARALLEL_XML_LOCATION;
-import static com.appium.utils.ConfigFileManager.CATEGORY;
-import static com.appium.utils.ConfigFileManager.EXCLUDE_GROUPS;
-import static com.appium.utils.ConfigFileManager.INCLUDE_GROUPS;
-import static com.appium.utils.ConfigFileManager.LISTENERS;
-import static com.appium.utils.ConfigFileManager.RUNNER_LEVEL;
-import static com.appium.utils.ConfigFileManager.SUITE_NAME;
+import static com.appium.utils.ConfigFileManager.*;
 import static com.appium.utils.FigletHelper.figlet;
 import static java.lang.System.getProperty;
 import static java.util.Collections.addAll;
@@ -23,6 +18,7 @@
 import org.testng.annotations.Test;
 import org.testng.collections.Lists;
 import org.testng.xml.XmlClass;
+import org.testng.xml.XmlInclude;
 import org.testng.xml.XmlSuite;
 import org.testng.xml.XmlSuite.ParallelMode;
 import org.testng.xml.XmlTest;
@@ -33,13 +29,7 @@
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public class ATDExecutor {
     private final DeviceAllocationManager deviceAllocationManager;
@@ -65,7 +55,9 @@ public boolean constructXMLAndTriggerParallelRunner(List<String> test, String pa
             if (runnerLevel != null && runnerLevel.equalsIgnoreCase("class")) {
                 constructXmlSuiteForClassLevelDistributionRunner(test, getTestMethods(setOfMethods),
                         suiteName, categoryName, deviceCount);
-            } else {
+            } else if(test!=null && !test.isEmpty()){
+                    constructXmlAndExecuteTestCaseAtRuntime(test, getTestMethods(setOfMethods), suiteName, categoryName, deviceCount);
+            }else {
                 constructXmlSuiteForMethodLevelDistributionRunner(test,
                         getTestMethods(setOfMethods), suiteName, categoryName, deviceCount);
             }
@@ -112,8 +104,8 @@ public XmlSuite constructXmlSuiteForParallelRunner(List<String> tests,
     }
 
     public XmlSuite constructXmlSuiteForClassLevelDistributionRunner(List<String> tests,
-                   Map<String, List<Method>> methods,
-                   String suiteName, String categoryName, int deviceCount) {
+                                                                     Map<String, List<Method>> methods,
+                                                                     String suiteName, String categoryName, int deviceCount) {
         XmlSuite suite = new XmlSuite();
         suite.setName(suiteName);
         suite.setThreadCount(deviceCount);
@@ -138,8 +130,8 @@ public XmlSuite constructXmlSuiteForClassLevelDistributionRunner(List<String> te
 
 
     public XmlSuite constructXmlSuiteForMethodLevelDistributionRunner(List<String> tests,
-                             Map<String, List<Method>> methods, String suiteName,
-                             String category, int deviceCount) {
+                                                                      Map<String, List<Method>> methods, String suiteName,
+                                                                      String category, int deviceCount) {
         include(groupsInclude, INCLUDE_GROUPS);
         XmlSuite suite = new XmlSuite();
         suite.setName(suiteName);
@@ -163,6 +155,42 @@ public XmlSuite constructXmlSuiteForMethodLevelDistributionRunner(List<String> t
         return suite;
     }
 
+    public XmlSuite constructXmlAndExecuteTestCaseAtRuntime(List<String> testCases,
+                                                            Map<String, List<Method>> methods, String suiteName, String category, int deviceCount) {
+
+        List<XmlClass> classes = new ArrayList<>(); // equivalent of <classes> tag
+        XmlSuite suite = new XmlSuite();
+        suite.setName(suiteName);
+        XmlTest test = new XmlTest(suite);
+        test.setName("regression");
+        suite.setThreadCount(deviceCount);
+        suite.setDataProviderThreadCount(deviceCount);
+        suite.setVerbose(2);
+        suite.setParallel(ParallelMode.METHODS);
+        listeners.add("com.appium.manager.AppiumParallelMethodTestListener");
+        include(listeners, LISTENERS);
+        suite.setListeners(listeners);
+        for (Map.Entry<String, List<Method>> mapElement : methods.entrySet()) {
+            XmlClass xmlClass = new XmlClass(mapElement.getKey());
+            for (String testName : testCases) {
+                for (Method methodName : mapElement.getValue()) {
+                    if (methodName.getName().equalsIgnoreCase(testName)) {
+                        List<XmlInclude> includedMethodsList = new ArrayList<>();
+                        XmlInclude includedTestMethod = new XmlInclude(testName);
+                        includedMethodsList.add(includedTestMethod);
+                        xmlClass.setIncludedMethods(includedMethodsList);
+                        classes.add(xmlClass);
+                    }
+                }
+            }
+        }
+
+        test.setXmlClasses(classes);
+        writeTestNGFile(suite);
+        return suite;
+
+    }
+
     public boolean testNGParallelRunner() {
         TestNG testNG = new TestNG();
         List<String> suites = Lists.newArrayList();
@@ -194,7 +222,7 @@ private Set<Method> getMethods(String pack) throws MalformedURLException {
             a++;
         }
         Reflections reflections = new Reflections(new ConfigurationBuilder().setUrls(newUrls)
-            .setScanners(new MethodAnnotationsScanner()));
+                .setScanners(new MethodAnnotationsScanner()));
         return reflections.getMethodsAnnotatedWith(Test.class);
     }
 
@@ -224,7 +252,7 @@ private List<XmlClass> writeXmlClass(List<String> testCases, Map<String,
 
     private void writeTestNGFile(XmlSuite suite) {
         try (FileWriter writer = new FileWriter(new File(
-            getProperty("user.dir") + PARALLEL_XML_LOCATION))) {
+                getProperty("user.dir") + PARALLEL_XML_LOCATION))) {
             writer.write(suite.toXml());
             writer.flush();
         } catch (IOException e) {
@@ -243,9 +271,9 @@ public Map<String, List<Method>> getTestMethods(Set<Method> methods) {
         Map<String, List<Method>> listOfMethods = new HashMap<>();
         methods.forEach(method -> {
             List<Method> methodsList = listOfMethods.computeIfAbsent(
-                method.getDeclaringClass().getPackage().getName()
-                    + "." + method.getDeclaringClass()
-                    .getSimpleName(), k -> new ArrayList<>());
+                    method.getDeclaringClass().getPackage().getName()
+                            + "." + method.getDeclaringClass()
+                            .getSimpleName(), k -> new ArrayList<>());
             methodsList.add(method);
         });
         return listOfMethods;