Commit b676ff6f authored by Poienar Robert's avatar Poienar Robert

Solved merge conflicts

parents 041cdd64 4a2fb1ab
......@@ -57,9 +57,9 @@ run-python-android-tests:
- source altunitytests/bin/activate
- python3 -m pip install Appium-Python-Client
- python3 -m pip uninstall --yes altunityrunner || true
- python3 -m pip install -e "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings/python"
- python3 -m pip install -e "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings~/python"
- sleep 30
- python3 "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings/python_bindings_tests.py"
- python3 "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings~/python_bindings_tests.py"
run-java-android-tests:
......@@ -72,7 +72,7 @@ run-java-android-tests:
- adb shell am start -n fi.altom.altunitytester/com.unity3d.player.UnityPlayerActivity
- adb forward --remove-all
- adb forward tcp:13000 tcp:13000
- cd "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings/java"
- cd "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings~/java"
- mvn test
create-unity-package:
......@@ -139,9 +139,9 @@ run-python-appium-android-tests:
# - appium >> appium.log &
- pip install Appium-Python-Client
- pip uninstall --yes altunityrunner || true
- pip install -e "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings/python"
- pip install -e "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings~/python"
- sleep 30
- python "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings/python_appium_tests.py"
- python "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings~/python_appium_tests.py"
# - killall node || true
artifacts:
when: always
......@@ -157,7 +157,7 @@ run-java-appium-android-tests:
tags:
- unity
script:
- cd "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings/java"
- cd "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings~/java"
- mvn clean compile assembly:single
- mvn install:install-file -Dfile=./target/altunitytester-java-client-1.3.0-SNAPSHOT-jar-with-dependencies.jar -DgroupId=ro.altom -DartifactId=altunitytester -Dversion=1.3.0 -Dpackaging=jar
- cd ../java-appium-tests
......@@ -166,7 +166,7 @@ run-java-appium-android-tests:
when: always
expire_in: 10 days
paths:
- "./Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings/java/target/altunitytester-java-client-1.3.0-SNAPSHOT-jar-with-dependencies.jar"
- "./Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings~/java/target/altunitytester-java-client-1.3.0-SNAPSHOT-jar-with-dependencies.jar"
deploy-altunitytester-python:
stage: deploy
......@@ -174,7 +174,7 @@ deploy-altunitytester-python:
tags:
- unity
script:
- cd "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings/python"
- cd "Assets/AltUnityTester-BindingsAndExamples(can_be_deleted)/Bindings~/python"
- python setup.py sdist upload -r pypi
pages:
......
fileFormatVersion: 2
guid: 2ae3c599547c04666910baf2fe9a7bcf
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 8cebebd75ceca4022a77dfdaf5dc9927
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 8c6870262d5c74c2fad8a0ad1442587e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 4c2c54de7616f40ebab35d980b2d9817
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 16885cf1ac30040bf97116dc41497646
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f04ff669ddb984ec8b8ece2bf58fbf74
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 875f18258bda64f788e2a3e64f4d84bb
DefaultImporter:
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 058f594f4b5f74ce9a3b96202fc03351
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: bec1d057034494faf895751748c3b26f
DefaultImporter:
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e7c11aaf6654547fb8399023272451e2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 219f3730c9359437d9409c91141778e7
DefaultImporter:
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5db96f910a14c47c9956cd979ba6a37d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: d73d7313e8a2e4b0e8e29701095743f9
DefaultImporter:
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 285c6d3971f33475db625a1fdf431e2d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7442fc311a46848b7b99ce0fe6e4ecbf
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f65b3e661bc764aa7ad67dcc467cf7d8
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c2faebb11302d4018982ae1f25720b11
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: a3066ccfcbd3c4828a7f6082826b56bb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ed0d93ddfe5cb7547a5a9407bbd7e5fd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: fb4f7e201841743bd96dd1417e653f1b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: fa6a0d8dafc7f40b39f44faaf5400d79
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9438ae3fddace46fe8edb92b557f9d63
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: cb93c5e13e6eef34381c7f0935418244
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 49711c710abec4e05bc54c6d5b63cf47
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: fa9a285af13ec47dfaf29610edbf716d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 2f15da6ca77774d15ae1120c813bbed2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: fda322947b7424633a476460bf26b62f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9ec6ad6fe4990496894931945f9a79c9
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ea53d460829ea4a93b525a78912122fc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 1c46d5c3841c944c8a3de1368411f4dc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5af3831fcaf6f2340915678940328701
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 239331e50d6868d44b7773d4b005d4e5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 2ae3c599547c04666910baf2fe9a7bcf
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
......@@ -300,16 +300,16 @@ public class AltUnityDriver {
}
handleErrors(data);
}
public void pressKey(String keyName, float duration){
send(CreateCommand("pressKeyboardKey", keyName,String.valueOf(duration)));
public void pressKey(String keyName,float power, float duration){
send(CreateCommand("pressKeyboardKey", keyName,String.valueOf(power),String.valueOf(duration)));
String data = recvall();
if (!data.contains("error:")) {
return;
}
handleErrors(data);
}
public void pressKeyAndWait(String keyName, float duration) {
pressKey(keyName, duration);
public void pressKeyAndWait(String keyName,float power, float duration) {
pressKey(keyName,power, duration);
sleepFor(duration );
String data;
do {
......
fileFormatVersion: 2
guid: 8cebebd75ceca4022a77dfdaf5dc9927
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first: