Merge pull request #9 from sreenigsd/Release_version_1.2

Merging Release version 1.2 to Master
sreenigsd · Aug 27, 2020 · 78810cd · 78810cd
2 parents 029a93c + 3bbbfdb
commit 78810cd
Show file tree

Hide file tree

Showing 31 changed files with 723 additions and 282 deletions.
diff --git a/Cheetah/pom.xml b/Cheetah/pom.xml
diff --git a/Cheetah/src/main/java/base/Runner.java b/Cheetah/src/main/java/base/Runner.java
@@ -1,10 +1,12 @@
 package base;
 
 
+import java.io.IOException;
+
 import com.gsd.sreenidhi.cheetah.engine.CheetahEngine;
+import com.gsd.sreenidhi.cheetah.exception.CheetahException;
 
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
+import io.cucumber.java.*;
 
 
 
@@ -15,19 +17,22 @@ public static void main(String args[]) {
 	}
 
 	@Before
-    public void prepareScenario() throws Exception{
-		CheetahEngine.generateBase(CheetahEngine.props.getProperty("app.name"));
-    }
+    public void prepareScenario(io.cucumber.java.Scenario scenarioImpl) throws Exception{
+		CheetahEngine.generateBase(scenarioImpl, CheetahEngine.props.getProperty("app.name"));
+	}
 
     @After
     /**
      * Embed a screenshot in test report if test is marked as failed
      */
-    public void processExecution(cucumber.api.Scenario scenarioImpl) throws Exception {
+    public void processExecution(io.cucumber.java.Scenario scenarioImpl) throws Exception {
     	CheetahEngine.processPostAction(scenarioImpl, CheetahEngine.props.getProperty("app.name"));
     }
 
-
+    @AfterStep
+    public void processStep(io.cucumber.java.Scenario scenarioImpl) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException, CheetahException, IOException {
+    	CheetahEngine.afterStep(scenarioImpl);
+    }
 
 
 

diff --git a/Cheetah/src/main/java/com/gsd/sreenidhi/automation/config/Configurator.java b/Cheetah/src/main/java/com/gsd/sreenidhi/automation/config/Configurator.java
@@ -73,7 +73,7 @@ private void loadConfig(Object configurator, File configurationFile) throws Chee
 							dbConfigurator.setUsername(configRead.getString("username"));
 							dbConfigurator.setPassword(configRead.getString("password"));
 							dbConfigurator.setSchemaName(configRead.getString("schema-name"));
-							valid = false;
+							valid = true;
 						}catch(NullPointerException ex) {
 							valid = false;
 							Exception e = new NullPointerException("Missing required configurations. Please update your configurations and try again.");

diff --git a/Cheetah/src/main/java/com/gsd/sreenidhi/cheetah/actions/appium/AppiumActions.java b/Cheetah/src/main/java/com/gsd/sreenidhi/cheetah/actions/appium/AppiumActions.java
@@ -14,6 +14,8 @@
 import io.appium.java_client.TouchAction;
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.ios.IOSDriver;
+import io.appium.java_client.touch.LongPressOptions;
+import io.appium.java_client.touch.offset.PointOption;
 
 /**
  * @author Sreenidhi, Gundlupet
@@ -103,16 +105,27 @@ public static void scroll_up(By locator, int swipes, int power) throws CheetahEx
 
 		// To swipe from bottom to top
 		for (int x = 0; x < swipes; x = x + 1) {
+			PointOption startpo = new PointOption();
+			startpo.withCoordinates(startx, starty);
+
+			LongPressOptions startlpo = new LongPressOptions();
+			startlpo.withPosition(startpo);
+
+			PointOption endpo = new PointOption();
+			endpo.withCoordinates(endx, endy);
+
+
 			if ("ANDROID".equalsIgnoreCase(properties.getProperty("os.platform"))) {
 				// ((AndroidDriver)CheetahEngine.getDriverInstance()).swipe(startx,
 				// starty, endx, endy, power);
-				new TouchAction((AndroidDriver) CheetahEngine.getDriverInstance()).longPress(startx, starty)
-						.moveTo(endx, endy).release().perform();
+
+				new TouchAction((AndroidDriver) CheetahEngine.getDriverInstance()).longPress(startlpo)
+						.moveTo(endpo).release().perform();
 			} else {
 				// ((IOSDriver)CheetahEngine.getDriverInstance()).swipe(startx,
 				// starty, endx, endy, power);
-				new TouchAction((IOSDriver) CheetahEngine.getDriverInstance()).longPress(startx, starty)
-						.moveTo(endx, endy).release().perform();
+				new TouchAction((IOSDriver) CheetahEngine.getDriverInstance()).longPress(startlpo)
+						.moveTo(endpo).release().perform();
 			}
 		}
 
@@ -146,17 +159,27 @@ public static void scroll_down(By locator, int swipes, int power) throws Cheetah
 
 		// To swipe from top to bottom
 		for (int x = 0; x < swipes; x = x + 1) {
+
+			PointOption startpo = new PointOption();
+			startpo.withCoordinates(startx, starty);
+
+			LongPressOptions startlpo = new LongPressOptions();
+			startlpo.withPosition(startpo);
+
+			PointOption endpo = new PointOption();
+			endpo.withCoordinates(endx, endy);
+
 			if ("ANDROID".equalsIgnoreCase(properties.getProperty("os.platform"))) {
 				// ((AndroidDriver)
 				// CheetahEngine.getDriverInstance()).swipe(startx, starty, endx,
 				// endy, power);
-				new TouchAction((AndroidDriver) CheetahEngine.getDriverInstance()).longPress(startx, starty)
-						.moveTo(endx, endy).release().perform();
+				new TouchAction((AndroidDriver) CheetahEngine.getDriverInstance()).longPress(startlpo)
+						.moveTo(endpo).release().perform();
 			} else {
 				// ((IOSDriver) CheetahEngine.getDriverInstance()).swipe(startx,
 				// starty, endx, endy, power);
-				new TouchAction((IOSDriver) CheetahEngine.getDriverInstance()).longPress(startx, starty)
-						.moveTo(endx, endy).release().perform();
+				new TouchAction((IOSDriver) CheetahEngine.getDriverInstance()).longPress(startlpo)
+						.moveTo(endpo).release().perform();
 			}
 		}
 	}

diff --git a/Cheetah/src/main/java/com/gsd/sreenidhi/cheetah/actions/webService/WebServiceActions.java b/Cheetah/src/main/java/com/gsd/sreenidhi/cheetah/actions/webService/WebServiceActions.java
@@ -25,7 +25,7 @@
 import com.gsd.sreenidhi.cheetah.exception.CheetahException;
 import com.gsd.sreenidhi.utils.jsonUtils;
 
-import cucumber.api.DataTable;
+import io.cucumber.datatable.DataTable;
 import io.restassured.RestAssured;
 import io.restassured.response.Response;
 import io.restassured.response.ValidatableResponse;

diff --git a/Cheetah/src/main/java/com/gsd/sreenidhi/cheetah/data/CSVParser.java b/Cheetah/src/main/java/com/gsd/sreenidhi/cheetah/data/CSVParser.java
@@ -28,7 +28,7 @@
 import com.gsd.sreenidhi.cheetah.exception.CheetahException;
 import com.gsd.sreenidhi.forms.Constants;
 
-import au.com.bytecode.opencsv.CSVReader;
+import com.opencsv.CSVReader;
 
 /**
  * @author Sreenidhi, Gundlupet
@@ -94,8 +94,7 @@ public int convertFile(String csvFileName, String xmlFileName, String delimiter)
 					false);
 			// ** Now using the OpenCSV **//
 
-			reader = new CSVReader(new FileReader(fu.getFile("INPUT", csvFileName).getAbsolutePath()),
-					delimiter.charAt(0));
+			reader = new CSVReader(new FileReader(fu.getFile("INPUT", csvFileName).getAbsolutePath()));
 
 			String[] nextLine;
 			int line = 0;

diff --git a/Cheetah/src/main/java/com/gsd/sreenidhi/cheetah/database/DBExecutor.java b/Cheetah/src/main/java/com/gsd/sreenidhi/cheetah/database/DBExecutor.java
@@ -16,7 +16,7 @@
 import com.gsd.sreenidhi.cheetah.exception.CheetahException;
 import com.gsd.sreenidhi.cheetah.reporting.ReportingBean;
 
-import cucumber.api.Scenario;
+import io.cucumber.java.Scenario;
 
 /**
  * @author Sreenidhi, Gundlupet
@@ -185,7 +185,7 @@ public static void updateScenario(Scenario scenario, ReportingBean bean) throws
 				connection = getConnection();
 				pstmt = connection.prepareStatement(transaction_SQL);
 				pstmt.setString(1, scenario.getName());
-				pstmt.setString(2, scenario.getStatus());
+				pstmt.setString(2, scenario.getStatus().toString());
 				pstmt.setString(3, bean.getTest_Page_URL());
 				pstmt.setString(4, bean.getTestStartTime().toString());
 				pstmt.setString(5, bean.getTestEndTime().toString());