Skip to content

Commit ce3f0f5

Browse files
author
“rajatt95”
committed
Updations
1 parent e7afc57 commit ce3f0f5

14 files changed

+5053
-9387
lines changed

‎ServerLogs/application.log

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1 @@
1-
[ServerLogs DEBUG] 2022-01-10 00:33:15.173 BaseTest:141 - Appium Server started.................
2-
[ServerLogs DEBUG] 2022-01-10 00:36:52.471 BaseTest:150 - Appium Server stopped.............
3-
[ServerLogs DEBUG] 2022-01-10 00:38:18.724 BaseTest:141 - Appium Server started.................
4-
[ServerLogs DEBUG] 2022-01-10 00:40:01.227 BaseTest:150 - Appium Server stopped.............
5-
[ServerLogs DEBUG] 2022-01-10 10:32:18.905 BaseTest:141 - Appium Server started.................
6-
[ServerLogs DEBUG] 2022-01-10 10:36:22.043 BaseTest:150 - Appium Server stopped.............
7-
[ServerLogs DEBUG] 2022-01-10 10:36:45.730 BaseTest:141 - Appium Server started.................
8-
[ServerLogs DEBUG] 2022-01-10 10:38:12.860 BaseTest:150 - Appium Server stopped.............
9-
[ServerLogs DEBUG] 2022-01-10 11:03:38.059 BaseTest:141 - Appium Server started.................
10-
[ServerLogs DEBUG] 2022-01-10 11:04:52.091 BaseTest:141 - Appium Server started.................
11-
[ServerLogs DEBUG] 2022-01-10 11:05:47.798 BaseTest:150 - Appium Server stopped.............
12-
[ServerLogs DEBUG] 2022-01-10 11:07:15.445 BaseTest:141 - Appium Server started.................
13-
[ServerLogs DEBUG] 2022-01-10 11:08:58.295 BaseTest:150 - Appium Server stopped.............
14-
[ServerLogs DEBUG] 2022-01-17 18:32:14.126 BaseTest:141 - Appium Server started.................
15-
[ServerLogs DEBUG] 2022-01-17 18:36:17.729 BaseTest:150 - Appium Server stopped.............
16-
[ServerLogs DEBUG] 2022-01-17 18:57:16.389 BaseTest:141 - Appium Server started.................
17-
[ServerLogs DEBUG] 2022-01-17 18:59:55.698 BaseTest:150 - Appium Server stopped.............
18-
[ServerLogs DEBUG] 2022-01-17 19:00:16.394 BaseTest:141 - Appium Server started.................
19-
[ServerLogs DEBUG] 2022-01-17 19:02:40.503 BaseTest:150 - Appium Server stopped.............
1+
[ServerLogs DEBUG] 2022-04-12 16:30:22.416 BaseTest:141 - Appium Server started.................

‎ServerLogs/server.log

Lines changed: 4877 additions & 8716 deletions
Large diffs are not rendered by default.

‎logs/Android_Pixel_3/application.log

Lines changed: 100 additions & 398 deletions
Large diffs are not rendered by default.

‎logs/Android_Pixel_4/application.log

Lines changed: 64 additions & 233 deletions
Large diffs are not rendered by default.

‎pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
52
<modelVersion>4.0.0</modelVersion>
63
<groupId>com.learning</groupId>
74
<artifactId>MasterAppiumFramework_TDD</artifactId>
@@ -10,7 +7,7 @@
107
<properties>
118
<!-- DEFAULT - If you do not pass any value with mvn test, then, this value
129
will be used -->
13-
<suiteFile>testng.xml</suiteFile>
10+
<suiteFile>testng_simulator_iPhone13</suiteFile>
1411
</properties>
1512

1613
<build>
@@ -33,7 +30,8 @@
3330
<suiteXmlFiles>
3431
<!-- <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile> -->
3532
<!-- <suiteXmlFile>testng.xml</suiteXmlFile> -->
36-
<suiteXmlFile>${suiteFile}</suiteXmlFile>
33+
<!--<suiteXmlFile>${suiteFile}</suiteXmlFile>-->
34+
<suiteXmlFile>src/test/resources/runners/${suiteFile}.xml</suiteXmlFile>
3735
</suiteXmlFiles>
3836
</configuration>
3937
</plugin>

‎src/main/java/com/appium/constants/FrameworkConstants.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,23 +104,17 @@ private FrameworkConstants() {
104104
/* Platform specific - START */
105105
/* WINDOWS */
106106
public static final String PLATFORM_OS_WIN = "win";
107-
public static final String PLATFORM_OS_WIN_NODE_INSTALLATION_PATH = "C:\\Program Files\\nodejs\\node.exe";
107+
public static final String PLATFORM_OS_WIN_NODE_INSTALLATION_PATH = "C:\\Program Files\\nodejs\\node.exe";// Cmd -> where node
108108
// public static final String PLATFORM_OS_WIN_APPIUM_INSTALLATION_PATH =
109109
// "C:\\Users\\rajatverma01\\AppData\\Roaming\\npm\\node_modules\\appium\\build\\lib\\main.js";
110110
public static final String PLATFORM_OS_WIN_APPIUM_INSTALLATION_PATH = "C:\\Users\\" + UsernameUtils.getUserName()
111111
+ "\\AppData\\Roaming\\npm\\node_modules\\appium\\build\\lib\\main.js";
112112

113113
/* MAC */
114114
public static final String PLATFORM_OS_MAC = "mac";
115-
116-
// public static final String PLATFORM_OS_MAC_NODE_INSTALLATION_PATH = "/usr/local/bin/node";
117-
// public static final String PLATFORM_OS_MAC_APPIUM_INSTALLATION_PATH = "/usr/local/lib/node_modules/appium/build/lib/main.js";
118-
// public static final String PLATFORM_OS_MAC_VAR_PATH_VALUE = "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin:/Users/omprakashchavan/Library/Android/sdk/tools:/Users/omprakashchavan/Library/Android/sdk/platform-tools:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin";
119-
// public static final String PLATFORM_OS_MAC_VAR_ANDROID_HOME_VALUE = "/Users/omprakashchavan/Library/Android/sdk";
120-
121-
public static final String PLATFORM_OS_MAC_NODE_INSTALLATION_PATH = "/opt/homebrew/bin/node";//where node
122-
public static final String PLATFORM_OS_MAC_APPIUM_INSTALLATION_PATH = "/opt/homebrew/lib/node_modules/appium/build/lib/main.js";//where appium
123-
public static final String PLATFORM_OS_MAC_VAR_PATH_VALUE = "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin:/Users/"+UsernameUtils.getUserName()+"/Library/Android/sdk/tools:/Users/"+UsernameUtils.getUserName()+"/Library/Android/sdk/platform-tools:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin";
115+
public static final String PLATFORM_OS_MAC_NODE_INSTALLATION_PATH = "/opt/homebrew/bin/node";// Terminal -> where node
116+
public static final String PLATFORM_OS_MAC_APPIUM_INSTALLATION_PATH = "/opt/homebrew/lib/node_modules/appium/build/lib/main.js";// Terminal -> where appium
117+
public static final String PLATFORM_OS_MAC_VAR_PATH_VALUE = "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin:/Users/"+UsernameUtils.getUserName()+"/Library/Android/sdk/tools:/Users/"+UsernameUtils.getUserName()+"/Library/Android/sdk/platform-tools:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin"; // Terminal -> echo $PATH
124118
public static final String PLATFORM_OS_MAC_VAR_ANDROID_HOME_VALUE = "/Users/"+UsernameUtils.getUserName()+"/Library/Android/sdk";
125119

126120
public static final String PATH = "PATH";

‎src/main/java/com/appium/utils/AppiumServerUtils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public static AppiumDriverLocalService getAppiumService() {
4747

4848
} else if (os.contains(PLATFORM_OS_MAC)) {
4949

50-
System.out.println("os.contains(PLATFORM_OS_MAC");
5150
HashMap<String, String> environment = new HashMap<String, String>();
5251
environment.put(PATH,
5352
PLATFORM_OS_MAC_VAR_PATH_VALUE + System.getenv(PATH));

‎testng_emulator_pixel_3.xml renamed to ‎src/test/resources/runners/testng_emulator_pixel_3.xml

File renamed without changes.

‎testng_emulator_pixel_4.xml renamed to ‎src/test/resources/runners/testng_emulator_pixel_4.xml

File renamed without changes.

‎testng_emulators_pixel_3_4.xml renamed to ‎src/test/resources/runners/testng_emulators_pixel_3_4.xml

File renamed without changes.

0 commit comments

Comments
 (0)