KITE Version 2.0.5

Author: namvuCosmo

KITE-AppRTC-Test/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.webrtc.kite</groupId>
     <artifactId>kite-base</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
   </parent>
 
   <artifactId>apprtc-test</artifactId>

KITE-AppRTC-Test/src/main/java/org/webrtc/kite/apprtc/checks/BitrateCheck.java

@@ -65,7 +65,7 @@ protected void step() throws KiteTestException {
     double avgBitrate = computeBitrate(stats.getJsonArray("statsArray"), stat, mediaType);
     System.out.println("avgBitrate lah =>>>>>> " + avgBitrate);
     // Assuming that there's a 10% tolerance to the test result:
-    Reporter.getInstance().textAttachment(report, "Bitrate check",
+    reporter.textAttachment(report, "Bitrate check",
       "Expected : [" + 0.9*expectedBitrate + " -> " + 1.1*expectedBitrate + "], found " + avgBitrate  , "plain" );
     if (avgBitrate < 0.9*expectedBitrate || 1.1*expectedBitrate < avgBitrate) {
       throw new KiteTestException("Expected bitrate to be in [" + 0.9*expectedBitrate + "," + 1.1*expectedBitrate + "], found " + avgBitrate, Status.FAILED);

KITE-AppRTC-Test/src/main/java/org/webrtc/kite/apprtc/checks/RemoteVideoDisplayCheck.java

@@ -40,7 +40,7 @@ protected void step() throws KiteTestException {
     logger.info("Looking for video object");
     String videoCheck = appRTCMeetingPage.remoteVideoCheck();
     if (!"video".equalsIgnoreCase(videoCheck)) {
-      Reporter.getInstance().textAttachment(report, "Remote Video", videoCheck, "plain");
+      reporter.textAttachment(report, "Remote Video", videoCheck, "plain");
       throw new KiteTestException("The first video is " + videoCheck, Status.FAILED);
     }
   }

KITE-AppRTC-Test/src/main/java/org/webrtc/kite/apprtc/checks/RemoteVideoHDCheck.java

@@ -52,7 +52,7 @@ protected void step() throws KiteTestException {
         , Status.FAILED);
     }
 
-    Reporter.getInstance().textAttachment(this.report, "Remote video resolution:  width:", width + ", height:" + height, "plain");
+    reporter.textAttachment(this.report, "Remote video resolution:  width:", width + ", height:" + height, "plain");
   }
 
 

KITE-AppRTC-Test/src/main/java/org/webrtc/kite/apprtc/steps/GetStatsStep.java

@@ -49,8 +49,8 @@ protected void step() throws KiteTestException {
     try {
       JsonObject stats = getPCStatOvertime(webDriver, getStatsConfig).get(0);
       JsonObject statsSummary = appRTCMeetingPage.buildstatSummary(stats, getStatsConfig.getJsonArray("selectedStats"));
-      Reporter.getInstance().jsonAttachment(report, "getStatsRaw", stats);
-      Reporter.getInstance().jsonAttachment(this.report, "Stats Summary", statsSummary);
+      reporter.jsonAttachment(report, "getStatsRaw", stats);
+      reporter.jsonAttachment(this.report, "Stats Summary", statsSummary);
     } catch (Exception e) {
       logger.error(getStackTrace(e));
       throw new KiteTestException("Failed to getStats", Status.BROKEN, e);

KITE-Engine/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.webrtc.kite</groupId>
     <artifactId>kite-base</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
   </parent>
 
   <artifactId>kite-engine</artifactId>

KITE-Engine/src/main/java/org/webrtc/kite/Engine.java

@@ -19,6 +19,7 @@
 import io.cosmosoftware.kite.report.KiteLogger;
 import org.webrtc.kite.config.Configurator;
 import org.webrtc.kite.config.client.Client;
+import org.webrtc.kite.config.client.MobileSpecs;
 import org.webrtc.kite.config.paas.Paas;
 import org.webrtc.kite.config.test.TestConfig;
 import org.webrtc.kite.config.test.Tuple;
@@ -29,6 +30,7 @@
 import javax.json.JsonException;
 import java.io.FileNotFoundException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -45,14 +47,14 @@ public class Engine {
     SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HHmmss");
     System.setProperty("current.date", dateFormat.format(new Date()));
   }
-  
+
   private static final KiteLogger logger = KiteLogger.getLogger(Engine.class.getName());
 
-  public static void buildConfig(String pathToConfigFile) {
+  public static void buildConfig(Configurator configurator, String pathToConfigFile) {
     try {
-      Configurator.getInstance().setConfigFilePath(pathToConfigFile);
-      Configurator.getInstance().buildConfig();
-      Configurator.getInstance().setTimeStamp();
+      configurator.setConfigFilePath(pathToConfigFile);
+      configurator.buildConfig();
+      configurator.setTimeStamp();
     } catch (FileNotFoundException e) {
       logger
         .fatal("Error [File Not Found]: '" + pathToConfigFile + "' either doesn't exist or is not a file.",
@@ -73,11 +75,12 @@ public static void buildConfig(String pathToConfigFile) {
     }
   }
 
-  private static void distributeRemote(List<Tuple> tupleList) {
+  public static void distributeRemote(Configurator configurator, List<Tuple> tupleList) {
     // setting remote hub address to client, using circular linked list
     // each tuple will be prioritised to be in the same hub
+    //need to handle mobile == null
     for (Tuple tuple : tupleList) {
-      Paas paas = Configurator.getInstance().getRemoteList().get();
+      Paas paas = configurator.getRemoteList().get();
       for (Client client : tuple.getClients()) {
         if (client.getPaas() == null) {
           client.setPaas(paas);
@@ -96,13 +99,30 @@ public static void main(String[] args) {
       logger.error("Error [Missing Argument]: Use java -jar KITE.jar <absolute path/config.json>");
       return;
     }
-    
-    buildConfig(args[0]);
-    
-    for (TestConfig testConfig : Configurator.getInstance().getConfigHandler().getTestList()) {
+    Configurator configurator = new Configurator();
+    buildConfig(configurator, args[0]);
+
+
+    for (TestConfig testConfig : configurator.getConfigHandler().getTestList()) {
+      List<Tuple> tupleList = new ArrayList<>();
+      List<List<Integer>> matrix = testConfig.getMatrix();
+      if (matrix != null && !matrix.isEmpty()) {
+        for (List<Integer> indexList: matrix ) {
+          Tuple tuple = new Tuple();
+          for (int index: indexList) {
+            tuple.add(configurator.getConfigHandler().getClientList().get(index));
+          }
+          tupleList.add(tuple);
+        }
+      } else {
+        tupleList = configurator
+          .buildTuples(testConfig.getTupleSize(), testConfig.isPermute(), testConfig.isRegression());
+      }
+      distributeRemote(configurator, tupleList);
+      testConfig.setReportPath(configurator.getReportPath());
       ExecutorService service = Executors.newSingleThreadExecutor();
       try {
-        runInterop(service, testConfig);
+        runInterop(service, configurator.getName(), testConfig, tupleList);
       } catch (Exception e) {
         e.printStackTrace();
       } finally {
@@ -111,17 +131,10 @@ public static void main(String[] args) {
     }
   }
 
-  public static List<Future<Object>> runInterop(ExecutorService service, TestConfig testConfig) throws ExecutionException, InterruptedException {
-    if (service == null) {
-      service = Executors.newSingleThreadExecutor();
-    }
-    List<Tuple> tupleList = Configurator.getInstance()
-      .buildTuples(testConfig.getTupleSize(), testConfig.isPermute(), testConfig.isRegression());
-    distributeRemote(tupleList);
-    return runInterop(service, testConfig, tupleList);
-  }
 
-  public static List<Future<Object>> runInterop(ExecutorService service, TestConfig testConfig, List<Tuple> tupleList) throws ExecutionException, InterruptedException {
-    return service.submit(new TestRunThread(testConfig, tupleList)).get();
+  public static List<Future<Object>> runInterop(ExecutorService service, String testSuiteName, TestConfig testConfig, List<Tuple> tupleList) throws ExecutionException, InterruptedException {
+    TestRunThread runThread = new TestRunThread(testConfig, tupleList);
+    runThread.setName(testSuiteName);
+    return service.submit(runThread).get();
   }
 }

KITE-Engine/src/main/java/org/webrtc/kite/MatrixRunner.java

@@ -16,10 +16,8 @@
 
 package org.webrtc.kite;
 
-import io.cosmosoftware.kite.manager.RoomManager;
 import io.cosmosoftware.kite.report.Container;
 import io.cosmosoftware.kite.report.KiteLogger;
-import io.cosmosoftware.kite.report.Reporter;
 import org.webrtc.kite.config.test.TestConfig;
 import org.webrtc.kite.config.test.Tuple;
 
@@ -36,31 +34,35 @@
  * A class to manage the asynchronous execution of TestManager objects.
  */
 public class MatrixRunner {
-  
+
   private final KiteLogger logger = KiteLogger.getLogger(MatrixRunner.class.getName());
   private final TestConfig testConfig;
   private boolean interrupted;
   private ExecutorService multiExecutorService;
   private List<Tuple> tupleList = new ArrayList<>();
-  
+  Container testSuite;
+
   /**
    * Constructs a new MatrixRunner with the given TestConfig and List<Tuple>.
    *
    * @param testConfig   TestConfig
    * @param listOfTuples a list of tuples (containing 1 or multiples kite config objects).
    */
-  public MatrixRunner(TestConfig testConfig, List<Tuple> listOfTuples) {
+  public MatrixRunner(TestConfig testConfig, List<Tuple> listOfTuples, String parentSuiteName) {
     this.testConfig = testConfig;
     this.tupleList.addAll(listOfTuples);
+    testSuite = new Container(testConfig.getName());
+    testSuite.setParentSuite(parentSuiteName);
+    testSuite.setReporter(testConfig.getReporter());
+
   }
-  
+
   /**
    * Returns a sublist of the given futureList exclusive of the type of objects specified by the
    * objectClass.
    *
    * @param futureList  List of Future<Object>
    * @param objectClass The class for the undesired required object.
-   *
    * @return A sublist of the given futureList exclusive of the type of objects specified by the
    * objectClass.
    */
@@ -79,13 +81,12 @@ private List<Future<Object>> getExclusiveSubList(List<Future<Object>> futureList
     }
     return listOfFutureObjects;
   }
-  
+
   /**
    * Returns a sublist from the given list of the type of objects specified by the objectClass.
    *
    * @param futureList  List of Future<Object>
    * @param objectClass The class for the desired required object list.
-   *
    * @return A sublist from the given list of the type of objects specified by the objectClass.
    */
   private List<?> getSubList(List<Future<Object>> futureList, Class<?> objectClass) {
@@ -102,34 +103,31 @@ private List<?> getSubList(List<Future<Object>> futureList, Class<?> objectClass
     }
     return listOfObject;
   }
-  
+
   /**
    * Interrupt.
    */
   public void interrupt() {
     this.interrupted = true;
     this.shutdownExecutors();
   }
-  
+
   /**
    * Executes the test contained inside the TestManager for the provided matrix.
    *
    * @return List<Future < Object>>
    */
   public List<Future<Object>> run() {
-    Container testSuite = new Container(testConfig.getName());
-    
     int totalTestCases = this.tupleList.size();
     if (totalTestCases < 1) {
       return null;
     }
-    
+
     List<TestManager> testManagerList = new ArrayList<>();
     List<Future<Object>> futureList = new ArrayList<>();
-    RoomManager.init();
     this.multiExecutorService =
-      Executors.newFixedThreadPool(this.testConfig.getNoOfThreads());
-    
+        Executors.newFixedThreadPool(this.testConfig.getNoOfThreads());
+
     logger.info("Executing " + this.testConfig + " for " + totalTestCases + " browser tuples with size :" + tupleList.get(0).size());
     try {
       for (int index = 0; index < this.tupleList.size(); index++) {
@@ -140,27 +138,27 @@ public List<Future<Object>> run() {
         }
         testManagerList.add(manager);
       }
-      
+
       List<Future<Object>> tempFutureList;
       while (testManagerList.size() > 0) {
         tempFutureList = multiExecutorService.invokeAll(testManagerList);
         testManagerList = (List<TestManager>) this.getSubList(tempFutureList, TestManager.class);
         futureList.addAll(this.getExclusiveSubList(tempFutureList, TestManager.class));
       }
-      
+
       testManagerList.clear();
-      
+
     } catch (Exception e) {
       logger.error(getStackTrace(e));
     } finally {
       testSuite.setStopTimestamp();
-      Reporter.getInstance().generateReportFiles();
+      testConfig.getReporter().generateReportFiles();
       this.shutdownExecutors();
     }
-    
+
     return futureList;
   }
-  
+
   /**
    * Shutdown executors.
    */
@@ -170,5 +168,5 @@ synchronized private void shutdownExecutors() {
       this.multiExecutorService = null;
     }
   }
-  
+
 }