Changes to the install; Added prefix to commands c a r

Author: A-nguyenv

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

@@ -69,9 +69,10 @@ public CallbackThread(String callbackURL, int callbackPort, String username, Str
   /**
    * Posts result to the callback URL.
    */
-  public void postResult() throws IOException {
+  public void postResult() {
     FTPClient ftp = new FTPClient();
     boolean error = false;
+    FileInputStream inputStream = null;
     try {
       int reply;
       ftp.connect(callbackURL, callbackPort);
@@ -84,16 +85,23 @@ public void postResult() throws IOException {
         ftp.disconnect();
         logger.error("FTP server refused connection.");
       }
-      FileInputStream inputStream = new FileInputStream(file);
+      inputStream = new FileInputStream(file);
       this.uploadComplete = ftp.storeFile(file.getName(), inputStream);
       if(this.uploadComplete) {
-        inputStream.close();
         this.file.delete();
       }
       ftp.logout();
     } catch(IOException e) {
-      e.printStackTrace();
+      // e.printStackTrace();
+      logger.error( "Could not upload result zip file: " + e.getMessage());
     } finally {
+      if (inputStream != null) {
+        try {
+        inputStream.close();
+        } catch (Exception e) {
+          //
+        }
+      }
       if(ftp.isConnected()) {
         try {
           ftp.disconnect();
@@ -106,11 +114,7 @@ public void postResult() throws IOException {
 
   @Override
   public void run() {
-    try {
-      this.postResult();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
+    this.postResult();
   }
 
   public boolean isUploadComplete() {

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

@@ -223,13 +223,18 @@ private static List<String> getJsonFiles (File file) {
   }
 
   public static boolean upload(String desFile, String sourcePath, String callbackUrl, int callbackPort, String username, String password) {
-    String fileName = ReportUtils.zipFile(sourcePath, desFile, true);
-    File zipToSend = new File(fileName);
-    if (zipToSend.exists()) {
-      CallbackThread callbackThread = new CallbackThread(callbackUrl, callbackPort, username, password, zipToSend);
-      callbackThread.run();
-      return callbackThread.isUploadComplete();
+    try{
+      String fileName = ReportUtils.zipFile(sourcePath, desFile, true);
+      File zipToSend = new File(fileName);
+      if (zipToSend.exists()) {
+        CallbackThread callbackThread = new CallbackThread(callbackUrl, callbackPort, username, password, zipToSend);
+        callbackThread.run();
+        return callbackThread.isUploadComplete();
+      }
+    } catch (Exception e) {
+      logger.error("Could not upload the file (" + desFile +") to -> " + callbackUrl);
     }
+
     return false;
   }
 

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

@@ -226,7 +226,9 @@ private void terminate() {
     }
     testSuite.setStopTimestamp();
     if (currentPhase == null || !currentPhase.equals(StepPhase.RAMPUP)) {
-      testConfig.getReporter().generateReportFiles();
+      if (testConfig.generateReport()) {
+        testConfig.getReporter().generateReportFiles();
+      }
     }
   }
 

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

@@ -145,7 +145,7 @@ private KiteBaseTest buildTest()
     test.setTuple(tuple);
     test.setCurrentIteration(this.id);
     test.setDelayForClosing(testConfig.getDelayForClosing());
-
+    test.setGenerateReport(testConfig.generateReport());
     test.setPhases(this.phases);
 
     test.setParentSuite(testSuite.getParentSuite());

KITE-Example-Test/configs/search.local.config.json

@@ -9,7 +9,7 @@
   "tests": [
     {
       "name": "KiteExampleSearchTest %ts",
-      "tupleSize": 3,
+      "tupleSize": 1,
       "description": "This example test opens google and searches for Cosmo Software Consulting and verify the first result",
       "testImpl": "org.webrtc.kite.example.KiteExampleSearchTest",
       "payload": {
@@ -22,10 +22,6 @@
     {
       "browserName": "chrome",
       "platform": "localhost"
-    },
-    {
-      "browserName": "firefox",
-      "platform": "localhost"
     }
   ]
 }

KITE-Example-Test/src/main/java/org/webrtc/kite/example/checks/GoogleFirstResultCheck.java

@@ -6,11 +6,12 @@
 import io.cosmosoftware.kite.steps.TestCheck;
 import org.webrtc.kite.example.pages.GoogleResultPage;
 
+import static io.cosmosoftware.kite.entities.Timeouts.ONE_SECOND_INTERVAL;
 import static io.cosmosoftware.kite.util.ReportUtils.saveScreenshotPNG;
 import static io.cosmosoftware.kite.util.TestUtils.waitAround;
 
 public class GoogleFirstResultCheck extends TestCheck {
-  private final String EXPECTED_RESULT = "CoSMo Software | WebRTC Technology & Implementation";
+  private final String EXPECTED_RESULT = "CoSMo Software - Cosmo Software";
   private final GoogleResultPage resultPage;
 
   public GoogleFirstResultCheck(Runner runner) {
@@ -20,15 +21,15 @@ public GoogleFirstResultCheck(Runner runner) {
 
   @Override
   protected void step() throws KiteTestException {
-//    resultPage.openFirstResult();
-//    String found = resultPage.getTitle().trim();
-//    if (!found.equalsIgnoreCase(EXPECTED_RESULT)) {
-//      throw new KiteTestException("The title of the first Google result was not correct: \n" +
-//        "Expected: " + EXPECTED_RESULT + " but found " + found, Status.FAILED);
-//    }
-//    reporter.screenshotAttachment(report, saveScreenshotPNG(webDriver));
+    resultPage.openFirstResult();
+    String found = resultPage.getTitle().trim();
+    if (!found.equalsIgnoreCase(EXPECTED_RESULT)) {
+      throw new KiteTestException("The title of the first Google result was not correct: \n" +
+        "Expected: " + EXPECTED_RESULT + " but found " + found, Status.FAILED);
+    }
+    reporter.screenshotAttachment(report, saveScreenshotPNG(webDriver));
     for (int i = 0; i < 10; i++) {
-      waitAround(1000);
+      waitAround(ONE_SECOND_INTERVAL);
       logger.info("Staying in page: " + i + "s");
       webDriver.getTitle();
     }

KITE-Example-Test/src/main/java/org/webrtc/kite/example/pages/GoogleSearchPage.java

@@ -8,7 +8,7 @@
 
 public class GoogleSearchPage extends BasePage {
 
-  private final static String GOOGLE_PAGE = "https://www.youtube.com/watch?v=DCgfVBoBy9s";
+  private final static String GOOGLE_PAGE = "https://google.com";
 
   @FindBy(className = "gLFyf")
   WebElement searchBar;

KITE-Example-Test/src/main/java/org/webrtc/kite/example/steps/GoogleSearchStep.java

@@ -18,7 +18,7 @@ public GoogleSearchStep(Runner runner) {
   protected void step() {
 
     searchPage.open();
-//    searchPage.searchFor(TARGET);
+    searchPage.searchFor(TARGET);
   }
 
   @Override

KITE-Framework/src/main/java/org/webrtc/kite/config/test/TestConfig.java

@@ -88,15 +88,18 @@ public class TestConfig extends KiteEntity implements JsonBuilder, SampleData {
   private NetworkInstrumentation networkInstrumentation = null;
   private Boolean done = false;
   private EmailSender emailSender = null;
-  private Boolean csvReport;
-  
+  private Boolean csvReport = false;
+  private boolean generateReport = true;
+
+
   /**
    * Instantiates a new test config.
    */
   public TestConfig() {
     super();
   }
-  
+
+
   /**
    * Constructs a new TestConfig with the given callback url and JsonObject.
    * <p>
@@ -131,7 +134,8 @@ public TestConfig(JsonObject jsonObject) throws KiteInsufficientValueException,
     this.description = jsonObject.getString("description", DEFAULT_DESC);
 
     this.reporter = new Reporter(this.name);
-    this.csvReport = jsonObject.getBoolean("csvReport", false);
+    this.csvReport = jsonObject.getBoolean("csvReport", csvReport);
+    this.generateReport = jsonObject.getBoolean("generateReport", generateReport);
     this.payload = jsonObject.getJsonObject("payload").toString();
 
     // Override the global value with the local value
@@ -759,4 +763,13 @@ public Boolean getCsvReport() {
   public void setCsvReport(Boolean csvReport) {
     this.csvReport = csvReport;
   }
+
+
+  public boolean generateReport() {
+    return generateReport;
+  }
+
+  public void setGenerateReport(boolean generateReport) {
+    this.generateReport = generateReport;
+  }
 }

KITE-Framework/src/main/java/org/webrtc/kite/stats/GetStatsStep.java

@@ -33,12 +33,14 @@ public class GetStatsStep extends TestStep {
   private final Runner runner;
   private String customName = "";
   private boolean getRaw = true;
-
+  private boolean keepStats = false;
+  private RTCStatMap statMap;
 
   public GetStatsStep(Runner runner, JsonObject getStatsConfig) {
     super(runner);
     this.runner = runner;
     this.getStatsConfig = getStatsConfig;
+    this.keepStats = getStatsConfig.getBoolean("keepStats", this.keepStats);
   }
 
   @Override
@@ -49,33 +51,43 @@ public String stepDescription() {
   @Override
   protected void step() throws KiteTestException {
     try {
-      RTCStatMap statsOverTime =  getPCStatOvertime(webDriver, getStatsConfig);
-      statsOverTime.setRegionId(this.runner.getClientRegion());
-      statsOverTime.setNetworkProfile(this.runner.getNetworkProfile());
-      RTCStatList localPcStats = statsOverTime.getLocalPcStats();
-      JsonObject temp = transformToJson(localPcStats);
-      if (!temp.isEmpty()) {
-        for (String pc : statsOverTime.keySet()) {
+      RTCStatMap results = getPCStatOvertime(webDriver, getStatsConfig);
+      results.setRegionId(this.runner.getClientRegion());
+      results.setNetworkProfile(this.runner.getNetworkProfile());
+      if (keepStats) {
+        this.statMap = results;
+      }
+      if (!results.isEmpty()) {
+        for (String pc : results.keySet()) {
           if (getRaw) {
             reporter.jsonAttachment(
                 this.report,
                 customName + "Stats(Raw)_" + pc.replaceAll("\"", ""),
-                transformToJson(statsOverTime.get(pc)));
+                transformToJson(results.get(pc)));
           }
-          reporter.jsonAttachment(this.report, customName + "Stats(Summary)_" + pc.replaceAll("\"", ""), buildStatSummary(statsOverTime.get(pc)));
+          reporter.jsonAttachment(this.report, customName + "Stats(Summary)_" + pc.replaceAll("\"", ""), buildStatSummary(
+              results.get(pc)));
         }
       }
     } catch (Exception e) {
-      logger.error(getStackTrace(e));
-      throw new KiteTestException("Failed to getStats", Status.BROKEN, e);
+      throw new KiteTestException("Failed to getStats: " + e.getLocalizedMessage(), Status.BROKEN, e);
     }
   }
 
+
+  public RTCStatMap getResults() {
+    return statMap;
+  }
+
   public void setCustomName(String customName) {
     this.customName = customName;
   }
 
   public void setGetRaw(boolean getRaw) {
     this.getRaw = getRaw;
   }
+
+  public void setKeepStats(boolean keepStats) {
+    this.keepStats = keepStats;
+  }
 }