diff --git a/.editorconfig b/.editorconfig index 0d8f9a273..9e6dd2df5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,7 +1,7 @@ [*] charset=utf-8 -end_of_line=crlf +end_of_line=lf trim_trailing_whitespace=false insert_final_newline=false indent_style=space diff --git a/.github/linters/.flake8 b/.github/linters/.flake8 new file mode 100644 index 000000000..7db669338 --- /dev/null +++ b/.github/linters/.flake8 @@ -0,0 +1,6 @@ +[flake8] +max-line-length = 120 + +per-file-ignores = + */__init__.py:F401,F403 + */keycode.py:E741 diff --git a/.github/linters/sun_checks.xml b/.github/linters/sun_checks.xml new file mode 100644 index 000000000..9d542076b --- /dev/null +++ b/.github/linters/sun_checks.xml @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 617b6de4e..7136d95eb 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,6 +7,21 @@ concurrency: cancel-in-progress: true jobs: + lint: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Lint Code Base + uses: github/super-linter@v4 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VALIDATE_JAVA: true + VALIDATE_PYTHON_FLAKE8: true + # VALIDATE_CSHARP: false + FILTER_REGEX_EXCLUDE: .*Docs/**/*.[py|cs|java] + build-docs: runs-on: ubuntu-latest diff --git a/Assets/AltTester/AltDriver/AltDevice.cs b/Assets/AltTester/AltDriver/AltDevice.cs index ff7c11d50..8b221030f 100644 --- a/Assets/AltTester/AltDriver/AltDevice.cs +++ b/Assets/AltTester/AltDriver/AltDevice.cs @@ -19,5 +19,4 @@ public AltDevice(string deviceId, string platform, int localPort = 13000, int re Pid = pid; } } -} - +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/AltDriver.cs b/Assets/AltTester/AltDriver/AltDriver.cs index c07882deb..063b38799 100644 --- a/Assets/AltTester/AltDriver/AltDriver.cs +++ b/Assets/AltTester/AltDriver/AltDriver.cs @@ -581,4 +581,4 @@ public void RemoveNotificationListener(NotificationType notificationType) new RemoveNotificationListener(communicationHandler, notificationType).Execute(); } } -} +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/AltErrors.cs b/Assets/AltTester/AltDriver/AltErrors.cs index 3655f0152..8c0304581 100644 --- a/Assets/AltTester/AltDriver/AltErrors.cs +++ b/Assets/AltTester/AltDriver/AltErrors.cs @@ -407,4 +407,4 @@ public ResponseFormatException(Type t, string data) : base("Could not deserializ } } -} +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/AltPortForwarding.cs b/Assets/AltTester/AltDriver/AltPortForwarding.cs index 84a16c147..06cc2f0c9 100644 --- a/Assets/AltTester/AltDriver/AltPortForwarding.cs +++ b/Assets/AltTester/AltDriver/AltPortForwarding.cs @@ -347,5 +347,4 @@ private static Process startProcess(string processPath, string arguments) return process; } } -} - +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Commands/AltCommands/AddNotificationListener.cs b/Assets/AltTester/AltDriver/Commands/AltCommands/AddNotificationListener.cs index 6845a8de5..fe9ea07d3 100644 --- a/Assets/AltTester/AltDriver/Commands/AltCommands/AddNotificationListener.cs +++ b/Assets/AltTester/AltDriver/Commands/AltCommands/AddNotificationListener.cs @@ -23,4 +23,4 @@ public void Execute() ValidateResponse("Ok", data); } } -} +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Commands/AltCommands/AltSetServerLogging.cs b/Assets/AltTester/AltDriver/Commands/AltCommands/AltSetServerLogging.cs index f5d93ce53..456e095b4 100644 --- a/Assets/AltTester/AltDriver/Commands/AltCommands/AltSetServerLogging.cs +++ b/Assets/AltTester/AltDriver/Commands/AltCommands/AltSetServerLogging.cs @@ -17,4 +17,4 @@ public void Execute() ValidateResponse("Ok", data); } } -} +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Commands/AltCommands/RemoveNotificationListener.cs b/Assets/AltTester/AltDriver/Commands/AltCommands/RemoveNotificationListener.cs index fd3695d82..f08ce80bb 100644 --- a/Assets/AltTester/AltDriver/Commands/AltCommands/RemoveNotificationListener.cs +++ b/Assets/AltTester/AltDriver/Commands/AltCommands/RemoveNotificationListener.cs @@ -19,4 +19,4 @@ public void Execute() ValidateResponse("Ok", data); } } -} +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Commands/DriverCommunicationWebSocket.cs b/Assets/AltTester/AltDriver/Commands/DriverCommunicationWebSocket.cs index 27bdb6f03..ff018adc5 100644 --- a/Assets/AltTester/AltDriver/Commands/DriverCommunicationWebSocket.cs +++ b/Assets/AltTester/AltDriver/Commands/DriverCommunicationWebSocket.cs @@ -350,4 +350,4 @@ public void SleepFor(float time) Thread.Sleep(System.Convert.ToInt32(time * 1000)); } } -} +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectsWhichContain.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectsWhichContain.cs index 911bcf700..a8acdf680 100644 --- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectsWhichContain.cs +++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectsWhichContain.cs @@ -15,4 +15,4 @@ public System.Collections.Generic.List Execute() return ReceiveListOfAltObjects(cmdParams); } } -} +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Commands/IDriverCommunication.cs b/Assets/AltTester/AltDriver/Commands/IDriverCommunication.cs index 69f58a6e4..8bc8335dd 100644 --- a/Assets/AltTester/AltDriver/Commands/IDriverCommunication.cs +++ b/Assets/AltTester/AltDriver/Commands/IDriverCommunication.cs @@ -16,4 +16,4 @@ public interface IDriverCommunication float GetDelayAfterCommand(); void SleepFor(float time); } -} +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltObjectAction.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltObjectAction.cs index eac90306a..c03d7875d 100644 --- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltObjectAction.cs +++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltObjectAction.cs @@ -9,7 +9,6 @@ public struct AltObjectAction public string Method; public string Parameters; public string TypeOfParameters; - public AltObjectAction(string component = "", string method = "", string parameters = "", string typeOfParameters = "", string assembly = "") { Component = component; @@ -18,8 +17,6 @@ public AltObjectAction(string component = "", string method = "", string paramet TypeOfParameters = typeOfParameters; Assembly = assembly; } - - public string Assembly; } } \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetScreenshot.cs b/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetScreenshot.cs index 8e53c8c08..de2cdb524 100644 --- a/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetScreenshot.cs +++ b/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetScreenshot.cs @@ -73,5 +73,4 @@ public AltTextureInformation Execute(out AltObject selectedObject) } } - } \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Common/AltAxis.cs b/Assets/AltTester/AltDriver/Common/AltAxis.cs index bd1390dfe..13c868ab8 100644 --- a/Assets/AltTester/AltDriver/Common/AltAxis.cs +++ b/Assets/AltTester/AltDriver/Common/AltAxis.cs @@ -18,4 +18,4 @@ public AltAxis(string name, string negativeButton, string positiveButton, string this.altNegativeButton = altNegativeButton; } } -} +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Common/AltObject.cs b/Assets/AltTester/AltDriver/Common/AltObject.cs index 1aeeb977b..41d038464 100644 --- a/Assets/AltTester/AltDriver/Common/AltObject.cs +++ b/Assets/AltTester/AltDriver/Common/AltObject.cs @@ -214,4 +214,4 @@ public System.Collections.Generic.List GetAllMethods(AltComponent altCom return altObject; } } -} +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Logging/AltLogLevel.cs b/Assets/AltTester/AltDriver/Logging/AltLogLevel.cs index ae25fd9fd..707822cff 100644 --- a/Assets/AltTester/AltDriver/Logging/AltLogLevel.cs +++ b/Assets/AltTester/AltDriver/Logging/AltLogLevel.cs @@ -11,6 +11,4 @@ public enum AltLogLevel Fatal = 5, Off = 6, } - - } \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/Logging/UnityTarget.cs b/Assets/AltTester/AltDriver/Logging/UnityTarget.cs index d7c16ca7e..9047c4c3b 100644 --- a/Assets/AltTester/AltDriver/Logging/UnityTarget.cs +++ b/Assets/AltTester/AltDriver/Logging/UnityTarget.cs @@ -34,6 +34,5 @@ protected override void Write(LogEventInfo logEvent) } } } - } #endif \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/UnityStruct/AltKeyCode.cs b/Assets/AltTester/AltDriver/UnityStruct/AltKeyCode.cs index 23c95d3ce..342c301f5 100644 --- a/Assets/AltTester/AltDriver/UnityStruct/AltKeyCode.cs +++ b/Assets/AltTester/AltDriver/UnityStruct/AltKeyCode.cs @@ -323,4 +323,4 @@ public enum AltKeyCode Joystick8Button18 = 508, Joystick8Button19 = 509 } -} +} \ No newline at end of file diff --git a/Assets/AltTester/AltDriver/UnityStruct/AltVector.cs b/Assets/AltTester/AltDriver/UnityStruct/AltVector.cs index 618bc71d8..fe6899915 100644 --- a/Assets/AltTester/AltDriver/UnityStruct/AltVector.cs +++ b/Assets/AltTester/AltDriver/UnityStruct/AltVector.cs @@ -109,4 +109,4 @@ public override string ToString() return base.ToString(); } } -} +} \ No newline at end of file diff --git a/Bindings~/java/pom.xml b/Bindings~/java/pom.xml index 99ac8de61..0bb9d5ffa 100644 --- a/Bindings~/java/pom.xml +++ b/Bindings~/java/pom.xml @@ -55,7 +55,7 @@ 3.3 2.22.1 1.10.19 - 1.18.2 + 1.18.26 @@ -112,7 +112,7 @@ tyrus-standalone-client 1.9 - + org.junit.jupiter junit-jupiter-api diff --git a/Bindings~/java/src/main/java/com/alttester/AltDriver.java b/Bindings~/java/src/main/java/com/alttester/AltDriver.java index de453fcce..1ae91d138 100644 --- a/Bindings~/java/src/main/java/com/alttester/AltDriver.java +++ b/Bindings~/java/src/main/java/com/alttester/AltDriver.java @@ -1,25 +1,87 @@ package com.alttester; +import java.io.IOException; + +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.config.ConfigurationFactory; -import org.apache.logging.log4j.LogManager; -import com.alttester.Commands.*; -import com.alttester.Commands.AltCommands.AltSetServerLoggingParams; +import com.alttester.Commands.AltCallStaticMethod; +import com.alttester.Commands.AltCallStaticMethodParams; +import com.alttester.Commands.AltGetStaticProperty; +import com.alttester.Commands.AltSetStaticProperty; +import com.alttester.Commands.GetPNGScreenshotCommand; +import com.alttester.Commands.GetServerVersionCommand; import com.alttester.Commands.AltCommands.AltAddNotificationListener; import com.alttester.Commands.AltCommands.AltAddNotificationListenerParams; import com.alttester.Commands.AltCommands.AltRemoveNotificationListener; import com.alttester.Commands.AltCommands.AltRemoveNotificationListenerParams; import com.alttester.Commands.AltCommands.AltResetInput; import com.alttester.Commands.AltCommands.AltSetServerLogging; -import com.alttester.Commands.FindObject.*; -import com.alttester.Commands.InputActions.*; -import com.alttester.Commands.UnityCommand.*; +import com.alttester.Commands.AltCommands.AltSetServerLoggingParams; +import com.alttester.Commands.FindObject.AltFindObject; +import com.alttester.Commands.FindObject.AltFindObjectAtCoordinates; +import com.alttester.Commands.FindObject.AltFindObjectAtCoordinatesParams; +import com.alttester.Commands.FindObject.AltFindObjectWhichContains; +import com.alttester.Commands.FindObject.AltFindObjects; +import com.alttester.Commands.FindObject.AltFindObjectsParams; +import com.alttester.Commands.FindObject.AltFindObjectsWhichContain; +import com.alttester.Commands.FindObject.AltGetAllElements; +import com.alttester.Commands.FindObject.AltGetAllElementsParams; +import com.alttester.Commands.FindObject.AltWaitForObject; +import com.alttester.Commands.FindObject.AltWaitForObjectToNotBePresent; +import com.alttester.Commands.FindObject.AltWaitForObjectWhichContains; +import com.alttester.Commands.FindObject.AltWaitForObjectsParams; +import com.alttester.Commands.InputActions.AltBeginTouch; +import com.alttester.Commands.InputActions.AltBeginTouchParams; +import com.alttester.Commands.InputActions.AltClickCoordinates; +import com.alttester.Commands.InputActions.AltEndTouch; +import com.alttester.Commands.InputActions.AltEndTouchParams; +import com.alttester.Commands.InputActions.AltHoldParams; +import com.alttester.Commands.InputActions.AltKeyDownParams; +import com.alttester.Commands.InputActions.AltKeyUpParams; +import com.alttester.Commands.InputActions.AltKeysDown; +import com.alttester.Commands.InputActions.AltKeysDownParams; +import com.alttester.Commands.InputActions.AltKeysUp; +import com.alttester.Commands.InputActions.AltKeysUpParams; +import com.alttester.Commands.InputActions.AltMoveMouse; +import com.alttester.Commands.InputActions.AltMoveMouseParams; +import com.alttester.Commands.InputActions.AltMoveTouch; +import com.alttester.Commands.InputActions.AltMoveTouchParams; +import com.alttester.Commands.InputActions.AltMultiPointSwipe; +import com.alttester.Commands.InputActions.AltMultiPointSwipeParams; +import com.alttester.Commands.InputActions.AltPressKeyParams; +import com.alttester.Commands.InputActions.AltPressKeys; +import com.alttester.Commands.InputActions.AltPressKeysParams; +import com.alttester.Commands.InputActions.AltScroll; +import com.alttester.Commands.InputActions.AltScrollParams; +import com.alttester.Commands.InputActions.AltSwipe; +import com.alttester.Commands.InputActions.AltSwipeParams; +import com.alttester.Commands.InputActions.AltTapClickCoordinatesParams; +import com.alttester.Commands.InputActions.AltTapCoordinates; +import com.alttester.Commands.InputActions.AltTilt; +import com.alttester.Commands.InputActions.AltTiltParams; import com.alttester.Commands.ObjectCommand.AltGetComponentPropertyParams; import com.alttester.Commands.ObjectCommand.AltSetComponentPropertyParams; +import com.alttester.Commands.UnityCommand.AltDeleteKeyPlayerPref; +import com.alttester.Commands.UnityCommand.AltDeletePlayerPref; +import com.alttester.Commands.UnityCommand.AltFloatGetKeyPlayerPref; +import com.alttester.Commands.UnityCommand.AltGetAllLoadedScenes; +import com.alttester.Commands.UnityCommand.AltGetCurrentScene; +import com.alttester.Commands.UnityCommand.AltGetTimeScale; +import com.alttester.Commands.UnityCommand.AltIntGetKeyPlayerPref; +import com.alttester.Commands.UnityCommand.AltLoadScene; +import com.alttester.Commands.UnityCommand.AltLoadSceneParams; +import com.alttester.Commands.UnityCommand.AltSetKeyPlayerPref; +import com.alttester.Commands.UnityCommand.AltSetTimeScale; +import com.alttester.Commands.UnityCommand.AltSetTimeScaleParams; +import com.alttester.Commands.UnityCommand.AltStringGetKeyPlayerPref; +import com.alttester.Commands.UnityCommand.AltUnloadScene; +import com.alttester.Commands.UnityCommand.AltUnloadSceneParams; +import com.alttester.Commands.UnityCommand.AltWaitForCurrentSceneToBe; +import com.alttester.Commands.UnityCommand.AltWaitForCurrentSceneToBeParams; +import com.alttester.Exceptions.InvalidParameterException; import com.alttester.UnityStruct.AltKeyCode; -import com.alttester.altTesterExceptions.*; -import java.io.IOException; public class AltDriver { static { @@ -27,14 +89,14 @@ public class AltDriver { ConfigurationFactory.setConfigurationFactory(custom); } - private static final Logger logger = LogManager.getLogger(AltDriver.class); + private static Logger logger = LogManager.getLogger(AltDriver.class); - public static enum PlayerPrefsKeyType { + public enum PlayerPrefsKeyType { Int(1), String(2), Float(3); private int val; - PlayerPrefsKeyType(int val) { + PlayerPrefsKeyType(final int val) { this.val = val; } @@ -52,21 +114,22 @@ public AltDriver() { this("127.0.0.1", 13000); } - public AltDriver(String host, int port) { + public AltDriver(final String host, final int port) { this(host, port, false); } - public AltDriver(String host, int port, Boolean enableLogging) { + public AltDriver(final String host, final int port, final Boolean enableLogging) { this(host, port, enableLogging, 60); } - public AltDriver(String host, int port, Boolean enableLogging, int connectTimeout) { + public AltDriver(final String host, final int port, final Boolean enableLogging, final int connectTimeout) { this(host, port, enableLogging, connectTimeout, "__default__"); } - public AltDriver(String host, int port, Boolean enableLogging, int connectTimeout, String appName) { + public AltDriver(final String host, final int port, final Boolean enableLogging, final int connectTimeout, + final String appName) { if (!enableLogging) { - AltDriverConfigFactory.DisableLogging(); + AltDriverConfigFactory.disableLogging(); } if (host == null || host.isEmpty()) { @@ -80,7 +143,7 @@ public AltDriver(String host, int port, Boolean enableLogging, int connectTimeou checkServerVersion(); } - public int[] getApplicationScreenSize() { + public final int[] getApplicationScreenSize() { AltCallStaticMethodParams altCallStaticMethodParamsWidth = new AltCallStaticMethodParams.Builder( "UnityEngine.Screen", "get_width", @@ -95,12 +158,12 @@ public int[] getApplicationScreenSize() { int screenHeight = callStaticMethod(altCallStaticMethodParamsHeight, Integer.class); - return new int[] { screenWidth, screenHeight }; + return new int[] {screenWidth, screenHeight}; } - private String[] splitVersion(String version) { + private String[] splitVersion(final String version) { String[] parts = version.split("\\."); - return new String[] { parts[0], (parts.length > 1) ? parts[1] : "" }; + return new String[] {parts[0], (parts.length > 1) ? parts[1] : ""}; } private void checkServerVersion() { @@ -124,7 +187,7 @@ private void checkServerVersion() { } /** - * Closes the connection to the running instrumented app + * Closes the connection to the running instrumented app. * * @throws IOException */ @@ -133,7 +196,7 @@ public void stop() throws IOException { } /** - * Gets the AltTester version, used to instrument the app + * Gets the AltTester version, used to instrument the app. * * @return AltTester version */ @@ -142,20 +205,20 @@ public String getServerVersion() { } /** - * Gets the delay after a command + * Gets the delay after a command. * - * @return The delay after a command + * @return The delay after a command. */ public double getDelayAfterCommand() { return this.connection.messageHandler.getDelayAfterCommand(); } /** - * Sets the delay after a command + * Sets the delay after a command. * - * @param delay - Double + * @param delay - The delay after a command. */ - public void setDelayAfterCommand(double delay) { + public void setDelayAfterCommand(final double delay) { this.connection.messageHandler.setDelayAfterCommand(delay); } @@ -164,7 +227,7 @@ public void setDelayAfterCommand(double delay) { * * @param altLoadSceneParameters - scene name */ - public void loadScene(AltLoadSceneParams altLoadSceneParameters) { + public void loadScene(final AltLoadSceneParams altLoadSceneParameters) { new AltLoadScene(this.connection.messageHandler, altLoadSceneParameters).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -174,7 +237,7 @@ public void loadScene(AltLoadSceneParams altLoadSceneParameters) { * * @param unloadSceneParams - scene name */ - public void unloadScene(AltUnloadSceneParams unloadSceneParams) { + public void unloadScene(final AltUnloadSceneParams unloadSceneParams) { new AltUnloadScene(this.connection.messageHandler, unloadSceneParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -195,7 +258,7 @@ public String[] getAllLoadedScenes() { * * @param timeout - int */ - public void setCommandResponseTimeout(int timeout) { + public void setCommandResponseTimeout(final int timeout) { this.connection.messageHandler.setCommandTimeout(timeout); } @@ -212,7 +275,7 @@ public void deletePlayerPref() { * * @param keyName - String */ - public void deleteKeyPlayerPref(String keyName) { + public void deleteKeyPlayerPref(final String keyName) { new AltDeleteKeyPlayerPref(this.connection.messageHandler, keyName).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -223,7 +286,7 @@ public void deleteKeyPlayerPref(String keyName) { * @param keyName - String * @param valueName - int */ - public void setKeyPlayerPref(String keyName, int valueName) { + public void setKeyPlayerPref(final String keyName, final int valueName) { new AltSetKeyPlayerPref(this.connection.messageHandler, keyName, valueName).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -234,7 +297,7 @@ public void setKeyPlayerPref(String keyName, int valueName) { * @param keyName - String * @param valueName - float */ - public void setKeyPlayerPref(String keyName, float valueName) { + public void setKeyPlayerPref(final String keyName, final float valueName) { new AltSetKeyPlayerPref(this.connection.messageHandler, keyName, valueName).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -245,7 +308,7 @@ public void setKeyPlayerPref(String keyName, float valueName) { * @param keyName - String * @param valueName - String */ - public void setKeyPlayerPref(String keyName, String valueName) { + public void setKeyPlayerPref(final String keyName, final String valueName) { new AltSetKeyPlayerPref(this.connection.messageHandler, keyName, valueName).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -256,7 +319,7 @@ public void setKeyPlayerPref(String keyName, String valueName) { * @param keyName -String * @return The value for a given key from PlayerPrefs */ - public int getIntKeyPlayerPref(String keyName) { + public int getIntKeyPlayerPref(final String keyName) { int response = new AltIntGetKeyPlayerPref(this.connection.messageHandler, keyName).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); return response; @@ -268,7 +331,7 @@ public int getIntKeyPlayerPref(String keyName) { * @param keyName - String * @return The value for a given key from PlayerPrefs */ - public float getFloatKeyPlayerPref(String keyName) { + public float getFloatKeyPlayerPref(final String keyName) { float response = new AltFloatGetKeyPlayerPref(this.connection.messageHandler, keyName).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); return response; @@ -280,7 +343,7 @@ public float getFloatKeyPlayerPref(String keyName) { * @param keyName - String * @return The value for a given key from PlayerPrefs */ - public String getStringKeyPlayerPref(String keyName) { + public String getStringKeyPlayerPref(final String keyName) { String response = new AltStringGetKeyPlayerPref(this.connection.messageHandler, keyName).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); return response; @@ -313,7 +376,7 @@ public float getTimeScale() { * * @param setTimescaleParams - timescale */ - public void setTimeScale(AltSetTimeScaleParams setTimescaleParams) { + public void setTimeScale(final AltSetTimeScaleParams setTimescaleParams) { new AltSetTimeScale(this.connection.messageHandler, setTimescaleParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -327,7 +390,8 @@ public void setTimeScale(AltSetTimeScaleParams setTimescaleParams) { * @param returnType * @return Static methods from your application */ - public T callStaticMethod(AltCallStaticMethodParams altCallStaticMethodParams, Class returnType) { + public T callStaticMethod(final AltCallStaticMethodParams altCallStaticMethodParams, + final Class returnType) { T response = new AltCallStaticMethod(this.connection.messageHandler, altCallStaticMethodParams) .Execute(returnType); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); @@ -340,7 +404,7 @@ public T callStaticMethod(AltCallStaticMethodParams altCallStaticMethodParam * @param swipeParams - Vector2 start* , Vector2 end* , float duration , boolean * wait = true */ - public void swipe(AltSwipeParams swipeParams) { + public void swipe(final AltSwipeParams swipeParams) { new AltSwipe(this.connection.messageHandler, swipeParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -350,7 +414,7 @@ public void swipe(AltSwipeParams swipeParams) { * * @param parameters - positions[]* , float duration , boolean wait */ - public void multipointSwipe(AltMultiPointSwipeParams parameters) { + public void multipointSwipe(final AltMultiPointSwipeParams parameters) { new AltMultiPointSwipe(this.connection.messageHandler, parameters).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -361,7 +425,7 @@ public void multipointSwipe(AltMultiPointSwipeParams parameters) { * * @param holdParams - Vector2 coordinates* , float duration , boolean wait */ - public void holdButton(AltHoldParams holdParams) { + public void holdButton(final AltHoldParams holdParams) { swipe(holdParams); } @@ -371,7 +435,7 @@ public void holdButton(AltHoldParams holdParams) { * @param altTiltParameter - Vector3 acceleration* , float duration , boolean * wait */ - public void tilt(AltTiltParams altTiltParameter) { + public void tilt(final AltTiltParams altTiltParameter) { new AltTilt(this.connection.messageHandler, altTiltParameter).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -382,8 +446,8 @@ public void tilt(AltTiltParams altTiltParameter) { * @param altPressKeyParameters - AltKeyCode keyCode* , float power , float * duration , boolean wait */ - public void pressKey(AltPressKeyParams altPressKeyParameters) { - AltKeyCode[] keyCodes = { altPressKeyParameters.getKeyCode() }; + public void pressKey(final AltPressKeyParams altPressKeyParameters) { + AltKeyCode[] keyCodes = {altPressKeyParameters.getKeyCode()}; AltPressKeysParams params = new AltPressKeysParams.Builder(keyCodes).withPower(altPressKeyParameters.getPower()) .withDuration(altPressKeyParameters.getDuration()).withWait(altPressKeyParameters.getWait()).build(); this.pressKeys(params); @@ -395,7 +459,7 @@ public void pressKey(AltPressKeyParams altPressKeyParameters) { * @param altPressKeysParameters - AltKeyCode[] keyCodes* , float power , * float duration , boolean wait */ - public void pressKeys(AltPressKeysParams altPressKeysParameters) { + public void pressKeys(final AltPressKeysParams altPressKeysParameters) { new AltPressKeys(this.connection.messageHandler, altPressKeysParameters).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -406,8 +470,8 @@ public void pressKeys(AltPressKeysParams altPressKeysParameters) { * @param keyDownParams - AltKeyCode keyCode* , float power * @throws InterruptedException */ - public void keyDown(AltKeyDownParams keyDownParams) throws InterruptedException { - AltKeyCode[] keys = { keyDownParams.getKeyCode() }; + public void keyDown(final AltKeyDownParams keyDownParams) throws InterruptedException { + AltKeyCode[] keys = {keyDownParams.getKeyCode()}; AltKeysDownParams params = new AltKeysDownParams.Builder(keys).withPower(keyDownParams.getPower()).build(); this.keysDown(params); } @@ -417,7 +481,7 @@ public void keyDown(AltKeyDownParams keyDownParams) throws InterruptedException * * @param keysDownParams - AltKeyCode keyCode* , float power */ - public void keysDown(AltKeysDownParams keysDownParams) { + public void keysDown(final AltKeysDownParams keysDownParams) { new AltKeysDown(this.connection.messageHandler, keysDownParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -427,8 +491,8 @@ public void keysDown(AltKeysDownParams keysDownParams) { * * @param keyUpParams - keyCode */ - public void keyUp(AltKeyUpParams keyUpParams) { - AltKeyCode[] keyCodes = { keyUpParams.getKeyCode() }; + public void keyUp(final AltKeyUpParams keyUpParams) { + AltKeyCode[] keyCodes = {keyUpParams.getKeyCode()}; AltKeysUpParams params = new AltKeysUpParams.Builder(keyCodes).build(); this.keysUp(params); } @@ -438,7 +502,7 @@ public void keyUp(AltKeyUpParams keyUpParams) { * * @param keysUpParams - AltKeyCode[] keyCodes */ - public void keysUp(AltKeysUpParams keysUpParams) { + public void keysUp(final AltKeysUpParams keysUpParams) { new AltKeysUp(this.connection.messageHandler, keysUpParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -449,7 +513,7 @@ public void keysUp(AltKeysUpParams keysUpParams) { * @param altMoveMouseParams - Vector2 coordinates* , float duration , boolean * wait */ - public void moveMouse(AltMoveMouseParams altMoveMouseParams) { + public void moveMouse(final AltMoveMouseParams altMoveMouseParams) { new AltMoveMouse(this.connection.messageHandler, altMoveMouseParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -460,7 +524,7 @@ public void moveMouse(AltMoveMouseParams altMoveMouseParams) { * @param altScrollParams - float speed , float speedHorizontal , float duration * , boolean wait */ - public void scroll(AltScrollParams altScrollParams) { + public void scroll(final AltScrollParams altScrollParams) { new AltScroll(this.connection.messageHandler, altScrollParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -470,7 +534,7 @@ public void scroll(AltScrollParams altScrollParams) { * cameraValue , boolean enabled * @return The first object in the scene that respects the given criteria. */ - public AltObject findObject(AltFindObjectsParams altFindObjectsParams) { + public AltObject findObject(final AltFindObjectsParams altFindObjectsParams) { AltObject response = new AltFindObject(this.connection.messageHandler, altFindObjectsParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); return response; @@ -482,7 +546,7 @@ public AltObject findObject(AltFindObjectsParams altFindObjectsParams) { * cameraValue , boolean enabled * @return The first object containing the given criteria */ - public AltObject findObjectWhichContains(AltFindObjectsParams altFindObjectsParams) { + public AltObject findObjectWhichContains(final AltFindObjectsParams altFindObjectsParams) { AltObject response = new AltFindObjectWhichContains(this.connection.messageHandler, altFindObjectsParams) .Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); @@ -495,7 +559,7 @@ public AltObject findObjectWhichContains(AltFindObjectsParams altFindObjectsPara * cameraValue , boolean enabled * @return All the objects respecting the given criteria */ - public AltObject[] findObjects(AltFindObjectsParams altFindObjectsParams) { + public AltObject[] findObjects(final AltFindObjectsParams altFindObjectsParams) { AltObject[] response = new AltFindObjects(this.connection.messageHandler, altFindObjectsParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); return response; @@ -508,7 +572,7 @@ public AltObject[] findObjects(AltFindObjectsParams altFindObjectsParams) { * cameraValue , boolean enabled * @return All objects containing the given criteria */ - public AltObject[] findObjectsWhichContain(AltFindObjectsParams altFindObjectsParams) { + public AltObject[] findObjectsWhichContain(final AltFindObjectsParams altFindObjectsParams) { AltObject[] response = new AltFindObjectsWhichContain(this.connection.messageHandler, altFindObjectsParams) .Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); @@ -523,7 +587,7 @@ public AltObject[] findObjectsWhichContain(AltFindObjectsParams altFindObjectsPa * enabled * @return Information about every object loaded in the currently loaded scenes. */ - public AltObject[] getAllElements(AltGetAllElementsParams altGetAllElementsParams) { + public AltObject[] getAllElements(final AltGetAllElementsParams altGetAllElementsParams) { AltObject[] response = new AltGetAllElements(this.connection.messageHandler, altGetAllElementsParams) .Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); @@ -537,7 +601,7 @@ public AltObject[] getAllElements(AltGetAllElementsParams altGetAllElementsParam * @param altWaitForCurrentSceneToBeParameters - String sceneName* , double * timeout , double interval */ - public void waitForCurrentSceneToBe(AltWaitForCurrentSceneToBeParams altWaitForCurrentSceneToBeParameters) { + public void waitForCurrentSceneToBe(final AltWaitForCurrentSceneToBeParams altWaitForCurrentSceneToBeParameters) { new AltWaitForCurrentSceneToBe(this.connection.messageHandler, altWaitForCurrentSceneToBeParameters).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -551,7 +615,7 @@ public void waitForCurrentSceneToBe(AltWaitForCurrentSceneToBeParams altWaitForC * double interval * @return Error if time runs out */ - public AltObject waitForObject(AltWaitForObjectsParams altWaitForObjectsParams) { + public AltObject waitForObject(final AltWaitForObjectsParams altWaitForObjectsParams) { AltObject response = new AltWaitForObject(this.connection.messageHandler, altWaitForObjectsParams) .Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); @@ -566,7 +630,7 @@ public AltObject waitForObject(AltWaitForObjectsParams altWaitForObjectsParams) * altFindObjectsParameters* , double timeout , * double interval */ - public void waitForObjectToNotBePresent(AltWaitForObjectsParams altWaitForObjectsParams) { + public void waitForObjectToNotBePresent(final AltWaitForObjectsParams altWaitForObjectsParams) { new AltWaitForObjectToNotBePresent(this.connection.messageHandler, altWaitForObjectsParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -580,7 +644,7 @@ public void waitForObjectToNotBePresent(AltWaitForObjectsParams altWaitForObject * double interval * @return The object that respects the given criteria/Error if time runs out */ - public AltObject waitForObjectWhichContains(AltWaitForObjectsParams altWaitForObjectsParams) { + public AltObject waitForObjectWhichContains(final AltWaitForObjectsParams altWaitForObjectsParams) { AltObject response = new AltWaitForObjectWhichContains(this.connection.messageHandler, altWaitForObjectsParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); @@ -592,17 +656,17 @@ public AltObject waitForObjectWhichContains(AltWaitForObjectsParams altWaitForOb * * @param path - String */ - public void getPNGScreenshot(String path) { + public void getPNGScreenshot(final String path) { new GetPNGScreenshotCommand(this.connection.messageHandler, path).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } /** - * Sets the level of logging on AltTester + * Sets the level of logging on AltTester. * * @param parameters - AltLogger logger* , AltLogLevel logLevel* */ - public void setServerLogging(AltSetServerLoggingParams parameters) { + public void setServerLogging(final AltSetServerLoggingParams parameters) { new AltSetServerLogging(this.connection.messageHandler, parameters).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -613,7 +677,7 @@ public void setServerLogging(AltSetServerLoggingParams parameters) { * @param beginTouchParams - Vector2 coordinates* * @return The starting of a touch on the screen */ - public int beginTouch(AltBeginTouchParams beginTouchParams) { + public int beginTouch(final AltBeginTouchParams beginTouchParams) { int response = new AltBeginTouch(this.connection.messageHandler, beginTouchParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); return response; @@ -624,7 +688,7 @@ public int beginTouch(AltBeginTouchParams beginTouchParams) { * * @param moveTouchParams - int fingerId* , Vector2 coordinates* */ - public void moveTouch(AltMoveTouchParams moveTouchParams) { + public void moveTouch(final AltMoveTouchParams moveTouchParams) { new AltMoveTouch(this.connection.messageHandler, moveTouchParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); @@ -635,7 +699,7 @@ public void moveTouch(AltMoveTouchParams moveTouchParams) { * * @param endTouchParams - int fingerId* */ - public void endTouch(AltEndTouchParams endTouchParams) { + public void endTouch(final AltEndTouchParams endTouchParams) { new AltEndTouch(this.connection.messageHandler, endTouchParams).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } @@ -646,49 +710,49 @@ public void endTouch(AltEndTouchParams endTouchParams) { * @param parameters - Vector2 coordinates* , int count , float interval , * boolean wait */ - public void tap(AltTapClickCoordinatesParams parameters) { + public void tap(final AltTapClickCoordinatesParams parameters) { new AltTapCoordinates(this.connection.messageHandler, parameters).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } /** - * Click at screen coordinates + * Click at screen coordinates. * * @param parameters - Vector2 coordinates* , int count , float interval , * boolean wait */ - public void click(AltTapClickCoordinatesParams parameters) { + public void click(final AltTapClickCoordinatesParams parameters) { new AltClickCoordinates(this.connection.messageHandler, parameters).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } /** - * Gets the value of the static field or property + * Gets the value of the static field or property. * * @param parameters - String componentName* , String propertyName* , String * assembly , int maxDept * @param returnType * @return value of the static field or property */ - public T getStaticProperty(AltGetComponentPropertyParams parameters, Class returnType) { + public T getStaticProperty(final AltGetComponentPropertyParams parameters, final Class returnType) { T response = new AltGetStaticProperty(this.connection.messageHandler, parameters).Execute(returnType); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); return response; } /** - * Sets the value of the static field or property + * Sets the value of the static field or property. * * @param parameters - String componentName* , String propertyName* , String * assembly */ - public void setStaticProperty(AltSetComponentPropertyParams parameters) { + public void setStaticProperty(final AltSetComponentPropertyParams parameters) { new AltSetStaticProperty(this.connection.messageHandler, parameters).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); } /** - * Retrieves the Unity object at given coordinates + * Retrieves the Unity object at given coordinates. * Uses EventSystem.RaycastAll to find object. If no object is found then it * uses UnityEngine.Physics.Raycast and UnityEngine.Physics2D.Raycast and * returns the one closer to the camera. @@ -697,22 +761,22 @@ public void setStaticProperty(AltSetComponentPropertyParams parameters) { * @return The UI object hit by event system Raycast, null otherwise */ - public AltObject findObjectAtCoordinates(AltFindObjectAtCoordinatesParams parameters) { + public AltObject findObjectAtCoordinates(final AltFindObjectAtCoordinatesParams parameters) { AltObject response = new AltFindObjectAtCoordinates(this.connection.messageHandler, parameters).Execute(); Utils.sleepFor(this.connection.messageHandler.getDelayAfterCommand()); return response; } - public void addNotification(AltAddNotificationListenerParams parameters) { + public final void addNotification(final AltAddNotificationListenerParams parameters) { new AltAddNotificationListener(this.connection.messageHandler, parameters).Execute(); } - public void removeNotificationListener(AltRemoveNotificationListenerParams notificationType) { + public final void removeNotificationListener(final AltRemoveNotificationListenerParams notificationType) { new AltRemoveNotificationListener(this.connection.messageHandler, notificationType).Execute(); } /** - * Clears all active input simulated by AltTester + * Clears all active input simulated by AltTester. */ public void resetInput() { new AltResetInput(this.connection.messageHandler).Execute(); diff --git a/Bindings~/java/src/main/java/com/alttester/AltDriverConfigFactory.java b/Bindings~/java/src/main/java/com/alttester/AltDriverConfigFactory.java index 9bb3a6e72..241de7551 100644 --- a/Bindings~/java/src/main/java/com/alttester/AltDriverConfigFactory.java +++ b/Bindings~/java/src/main/java/com/alttester/AltDriverConfigFactory.java @@ -19,27 +19,26 @@ @Plugin(name = "AltDriverConfigFactory", category = ConfigurationFactory.CATEGORY) @Order(50) - public class AltDriverConfigFactory extends ConfigurationFactory { @Override - public Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) { + public final Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) { return getConfiguration(loggerContext, source.toString(), null); } @Override - public Configuration getConfiguration(final LoggerContext loggerContext, final String name, + public final Configuration getConfiguration(final LoggerContext loggerContext, final String name, final URI configLocation) { ConfigurationBuilder builder = newConfigurationBuilder(); return createConfiguration(name, builder); } @Override - protected String[] getSupportedTypes() { - return new String[] { "*" }; + protected final String[] getSupportedTypes() { + return new String[] {"*"}; } - public static void DisableLogging() { + public static void disableLogging() { final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); final Configuration config = ctx.getConfiguration(); config.getLoggerConfig("com.alttester").setLevel(Level.OFF); @@ -47,7 +46,8 @@ public static void DisableLogging() { ctx.updateLoggers(); } - static Configuration createConfiguration(final String name, ConfigurationBuilder builder) { + static Configuration createConfiguration(final String name, + final ConfigurationBuilder builder) { builder.setStatusLevel(Level.ERROR); builder.setConfigurationName(name); @@ -78,4 +78,4 @@ static Configuration createConfiguration(final String name, ConfigurationBuilder return builder.build(); } -} \ No newline at end of file +} diff --git a/Bindings~/java/src/main/java/com/alttester/AltMessage.java b/Bindings~/java/src/main/java/com/alttester/AltMessage.java index 34a6d477f..2c731a6f9 100644 --- a/Bindings~/java/src/main/java/com/alttester/AltMessage.java +++ b/Bindings~/java/src/main/java/com/alttester/AltMessage.java @@ -1,10 +1,10 @@ package com.alttester; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; import javax.websocket.DecodeException; import javax.websocket.Decoder; import javax.websocket.EncodeException; +import javax.websocket.Encoder; +import javax.websocket.EndpointConfig; import com.google.gson.Gson; diff --git a/Bindings~/java/src/main/java/com/alttester/AltMessageResponse.java b/Bindings~/java/src/main/java/com/alttester/AltMessageResponse.java index adf3e29d1..e4eda8b3e 100644 --- a/Bindings~/java/src/main/java/com/alttester/AltMessageResponse.java +++ b/Bindings~/java/src/main/java/com/alttester/AltMessageResponse.java @@ -1,7 +1,6 @@ package com.alttester; public class AltMessageResponse { - public String logs; public String messageId; public String commandName; diff --git a/Bindings~/java/src/main/java/com/alttester/AltObject.java b/Bindings~/java/src/main/java/com/alttester/AltObject.java index d38aa4c5f..df5e63fb0 100644 --- a/Bindings~/java/src/main/java/com/alttester/AltObject.java +++ b/Bindings~/java/src/main/java/com/alttester/AltObject.java @@ -1,16 +1,29 @@ package com.alttester; -import lombok.Getter; -import com.alttester.Commands.ObjectCommand.*; -import com.alttester.position.Vector2; -import com.alttester.position.Vector3; import com.alttester.AltDriver.By; -import com.alttester.Commands.FindObject.AltFindObjectsParams; import com.alttester.Commands.FindObject.AltFindObject; +import com.alttester.Commands.FindObject.AltFindObjectsParams; +import com.alttester.Commands.ObjectCommand.AltCallComponentMethod; +import com.alttester.Commands.ObjectCommand.AltCallComponentMethodParams; +import com.alttester.Commands.ObjectCommand.AltClickElement; +import com.alttester.Commands.ObjectCommand.AltGetComponentProperty; +import com.alttester.Commands.ObjectCommand.AltGetComponentPropertyParams; +import com.alttester.Commands.ObjectCommand.AltGetText; +import com.alttester.Commands.ObjectCommand.AltGetTextParams; +import com.alttester.Commands.ObjectCommand.AltSendActionAndEvaluateResult; +import com.alttester.Commands.ObjectCommand.AltSetComponentProperty; +import com.alttester.Commands.ObjectCommand.AltSetComponentPropertyParams; +import com.alttester.Commands.ObjectCommand.AltSetText; +import com.alttester.Commands.ObjectCommand.AltSetTextParams; +import com.alttester.Commands.ObjectCommand.AltTapClickElementParams; +import com.alttester.Commands.ObjectCommand.AltTapElement; +import com.alttester.Position.Vector2; +import com.alttester.Position.Vector3; + +import lombok.Getter; @Getter public class AltObject { - public String name; public int id; public int x; @@ -28,11 +41,11 @@ public class AltObject { private transient IMessageHandler messageHandler; - public IMessageHandler getMessageHandler() { + public final IMessageHandler getMessageHandler() { return messageHandler; } - public void setMesssageHandler(IMessageHandler messageHandler) { + public final void setMesssageHandler(final IMessageHandler messageHandler) { this.messageHandler = messageHandler; } @@ -40,8 +53,10 @@ public AltObject() { } - public AltObject(String name, int id, int x, int y, int z, int mobileY, String type, boolean enabled, - float worldX, float worldY, float worldZ, int idCamera, int transformParentId, int transformId) { + public AltObject(final String name, final int id, final int x, final int y, final int z, final int mobileY, + final String type, final boolean enabled, + final float worldX, final float worldY, final float worldZ, final int idCamera, final int transformParentId, + final int transformId) { this.name = name; this.id = id; this.x = x; @@ -58,7 +73,7 @@ public AltObject(String name, int id, int x, int y, int z, int mobileY, String t this.transformParentId = transformParentId; } - public AltObject UpdateObject() { + public final AltObject updateObject() { AltFindObjectsParams altFindObjectsParameters = new AltFindObjectsParams.Builder(By.ID, String.valueOf(this.id)) .build(); AltObject altObject = new AltFindObject(messageHandler, altFindObjectsParameters).Execute(); @@ -82,7 +97,7 @@ public AltObject UpdateObject() { } /** - * Returns the parent of the AltTester object on which it is called + * Returns the parent of the AltTester object on which it is called. * * @return - The parent object */ @@ -95,7 +110,7 @@ public AltObject getParent() { } /** - * Returns the screen position of the AltTester object + * Returns the screen position of the AltTester object. * * @return - The screen position */ @@ -104,7 +119,7 @@ public Vector2 getScreenPosition() { } /** - * Returns the world position of the AltTester object + * Returns the world position of the AltTester object. * * @return - The world position */ @@ -114,14 +129,14 @@ public Vector3 getWorldPosition() { /** * Returns the value of the given component property. - * + * * @param altGetComponentPropertyParameters - String componentName* , String * propertyName* , String assembly , * int maxDepth * @return - The value of the given component property */ - public T getComponentProperty(AltGetComponentPropertyParams altGetComponentPropertyParameters, - Class returnType) { + public T getComponentProperty(final AltGetComponentPropertyParams altGetComponentPropertyParameters, + final Class returnType) { altGetComponentPropertyParameters.setAltObject(this); T response = new AltGetComponentProperty(messageHandler, altGetComponentPropertyParameters).Execute(returnType); Utils.sleepFor(messageHandler.getDelayAfterCommand()); @@ -130,12 +145,12 @@ public T getComponentProperty(AltGetComponentPropertyParams altGetComponentP /** * Sets value of the given component property. - * + * * @param altSetComponentPropertyParameters - String componentName* , String * propertyName* , String assembly , * String value* */ - public void setComponentProperty(AltSetComponentPropertyParams altSetComponentPropertyParameters) { + public void setComponentProperty(final AltSetComponentPropertyParams altSetComponentPropertyParameters) { altSetComponentPropertyParameters.setAltObject(this); new AltSetComponentProperty(messageHandler, altSetComponentPropertyParameters).Execute(); Utils.sleepFor(messageHandler.getDelayAfterCommand()); @@ -143,7 +158,7 @@ public void setComponentProperty(AltSetComponentPropertyParams altSetComponentPr /** * Invokes a method from an existing component of the object. - * + * * @param altCallComponentMethodParameters - String componentName* , String * methodName* , Object[] parameters*, * String[] typeOfParameters , String @@ -151,8 +166,8 @@ public void setComponentProperty(AltSetComponentPropertyParams altSetComponentPr * @param returnType * @return Actions of the method invoked */ - public T callComponentMethod(AltCallComponentMethodParams altCallComponentMethodParameters, - Class returnType) { + public T callComponentMethod(final AltCallComponentMethodParams altCallComponentMethodParameters, + final Class returnType) { altCallComponentMethodParameters.setAltObject(this); T response = new AltCallComponentMethod(messageHandler, altCallComponentMethodParameters).Execute(returnType); Utils.sleepFor(messageHandler.getDelayAfterCommand()); @@ -162,7 +177,7 @@ public T callComponentMethod(AltCallComponentMethodParams altCallComponentMe /** * Returns text value from a Button, Text, InputField. This also works with * TextMeshPro elements. - * + * * @return Text value */ public String getText() { @@ -175,11 +190,11 @@ public String getText() { /** * Sets text value for a Button, Text, InputField. This also works with * TextMeshPro elements. - * + * * @param text * @return Element that have text value changed */ - public AltObject setText(String text) { + public AltObject setText(final String text) { AltSetTextParams parameters = new AltSetTextParams.Builder(text).build(); parameters.setAltObject(this); @@ -191,11 +206,11 @@ public AltObject setText(String text) { /** * Sets text value for a Button, Text, InputField. This also works with * TextMeshPro elements. - * + * * @param parameters * @return Element that have text value changed */ - public AltObject setText(AltSetTextParams parameters) { + public AltObject setText(final AltSetTextParams parameters) { parameters.setAltObject(this); AltObject response = new AltSetText(messageHandler, parameters).Execute(); Utils.sleepFor(messageHandler.getDelayAfterCommand()); @@ -204,7 +219,7 @@ public AltObject setText(AltSetTextParams parameters) { /** * Simulates pointer up action on the object. - * + * * @return Element that simulates pointer up action */ public AltObject pointerUp() { @@ -213,7 +228,7 @@ public AltObject pointerUp() { /** * Simulates pointer down action on the object. - * + * * @return Element that simulates pointer down action */ public AltObject pointerDown() { @@ -222,7 +237,7 @@ public AltObject pointerDown() { /** * Simulates pointer enter action on the object. - * + * * @return Element that simulates pointer enter action */ public AltObject pointerEnter() { @@ -231,7 +246,7 @@ public AltObject pointerEnter() { /** * Simulates pointer exit action on the object. - * + * * @return Element that simulates pointer exit action */ public AltObject pointerExit() { @@ -248,12 +263,12 @@ public AltObject tap() { } /** - * Tap current object + * Tap current object. * * @param parameters Tap parameters * @return The tapped object */ - public AltObject tap(AltTapClickElementParams parameters) { + public AltObject tap(final AltTapClickElementParams parameters) { parameters.setAltObject(this); return new AltTapElement(messageHandler, parameters).Execute(); } @@ -274,14 +289,14 @@ public AltObject click() { * @param parameters Click parameters * @return The clicked object */ - public AltObject click(AltTapClickElementParams parameters) { + public AltObject click(final AltTapClickElementParams parameters) { parameters.setAltObject(this); AltObject response = new AltClickElement(messageHandler, parameters).Execute(); Utils.sleepFor(messageHandler.getDelayAfterCommand()); return response; } - private AltObject sendActionAndEvaluateResult(String command) { + private AltObject sendActionAndEvaluateResult(final String command) { AltObject response = new AltSendActionAndEvaluateResult(messageHandler, this, command).Execute(); Utils.sleepFor(messageHandler.getDelayAfterCommand()); return response; diff --git a/Bindings~/java/src/main/java/com/alttester/AltObjectAction.java b/Bindings~/java/src/main/java/com/alttester/AltObjectAction.java index e27f5a695..9bae63a2a 100644 --- a/Bindings~/java/src/main/java/com/alttester/AltObjectAction.java +++ b/Bindings~/java/src/main/java/com/alttester/AltObjectAction.java @@ -7,12 +7,13 @@ public class AltObjectAction { public String typeOfParameters; public String assembly; - public AltObjectAction(String componentName, String methodName, String parametersNames, String typeOfParameters, - String assemblyName) { - component = componentName; - method = methodName; - parameters = parametersNames; + public AltObjectAction(final String componentName, final String methodName, final String parametersNames, + final String typeOfParameters, + final String assemblyName) { + this.component = componentName; + this.method = methodName; + this.parameters = parametersNames; this.typeOfParameters = typeOfParameters; - assembly = assemblyName; + this.assembly = assemblyName; } } diff --git a/Bindings~/java/src/main/java/com/alttester/AltPortForwarding.java b/Bindings~/java/src/main/java/com/alttester/AltPortForwarding.java deleted file mode 100644 index b214f123e..000000000 --- a/Bindings~/java/src/main/java/com/alttester/AltPortForwarding.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.alttester; - -import java.io.IOException; -import java.nio.file.Paths; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.alttester.altTesterExceptions.PortForwardingException; - -public class AltPortForwarding { - private static final Logger log = LogManager.getLogger(AltPortForwarding.class); - - public static String getAdbPath(String adbPath) { - if (adbPath != null && !adbPath.isEmpty()) - return adbPath; - - String androidSdkRoot = System.getenv("ANDROID_SDK_ROOT"); - - if (androidSdkRoot != null && !androidSdkRoot.isEmpty()) { - return Paths.get(androidSdkRoot, "platform-tools", "adb").toString(); - } - return "adb"; - } - - public static String getIproxyPath(String iproxyPath) { - if (iproxyPath != null && !iproxyPath.isEmpty()) - return iproxyPath; - - return "iproxy"; - } - - public static void forwardAndroid() { - forwardAndroid(13000, 13000, "", ""); - } - - public static void forwardAndroid(int localPort) { - forwardAndroid(localPort, 13000, "", ""); - } - - public static void forwardAndroid(int localPort, int remotePort) { - forwardAndroid(localPort, remotePort, "", ""); - } - - public static void forwardAndroid(int localPort, int remotePort, String deviceId) { - forwardAndroid(localPort, remotePort, deviceId, ""); - } - - public static void forwardAndroid(int localPort, int remotePort, String deviceId, String adbPath) { - adbPath = getAdbPath(adbPath); - log.debug("Setting up port forward for android local port " + localPort + " remote port: " + remotePort); - - String command; - if (deviceId.equals("")) - command = adbPath + " forward tcp:" + localPort + " tcp:" + remotePort; - else - command = adbPath + " -s " + deviceId + " forward tcp:" + localPort + " tcp:" + remotePort; - - try { - Runtime.getRuntime().exec(command); - Thread.sleep(1000); - } catch (Exception ex) { - throw new PortForwardingException("An exception occurred while running command: " + command, ex); - } - - log.debug("adb forward enabled."); - } - - public static void removeForwardAndroid() { - removeForwardAndroid(13000, "", ""); - } - - public static void removeForwardAndroid(int localPort) { - removeForwardAndroid(localPort, "", ""); - } - - public static void removeForwardAndroid(int localPort, String deviceId) { - removeForwardAndroid(localPort, deviceId, ""); - } - - public static void removeForwardAndroid(int localPort, String deviceId, String adbPath) { - adbPath = getAdbPath(adbPath); - log.debug("Removing android forward localPort: " + localPort + " deviceId: " + deviceId); - - String arguments = "forward --remove tcp:" + localPort; - if (deviceId != null && !deviceId.isEmpty()) { - arguments = "-s " + deviceId + " " + arguments; - } - String command = adbPath + " " + arguments; - - try { - Runtime.getRuntime().exec(command); - Thread.sleep(1000); - } catch (Exception ex) { - throw new PortForwardingException("An exception occurred while running command: " + command, ex); - } - log.debug("Android forward removed..."); - } - - public static void removeAllForwardAndroid() { - removeAllForwardAndroid(""); - } - - public static void removeAllForwardAndroid(String adbPath) { - adbPath = getAdbPath(adbPath); - - String command = adbPath + " forward --remove-all"; - try { - Runtime.getRuntime().exec(command); - Thread.sleep(1000); - } catch (Exception ex) { - throw new PortForwardingException("An exception occurred while running command: " + command, ex); - } - log.debug("Removed all existing adb forwarding..."); - } - - public static void forwardIos() throws IOException { - forwardIos(13000, 13000, "", ""); - } - - public static void forwardIos(int localPort) throws IOException { - forwardIos(localPort, 13000, "", ""); - } - - public static void forwardIos(int localPort, int devicePort) throws IOException { - forwardIos(localPort, devicePort, "", ""); - } - - public static void forwardIos(int localPort, int devicePort, String deviceId) throws IOException { - forwardIos(localPort, devicePort, deviceId, ""); - } - - public static void forwardIos(int localPort, int devicePort, String deviceId, String iproxyPath) - throws IOException { - iproxyPath = getIproxyPath(iproxyPath); - String arguments; - if (deviceId == null || deviceId.isEmpty()) - arguments = localPort + " " + devicePort; - else - arguments = localPort + " " + devicePort + " -u " + deviceId; - String command = iproxyPath + " " + arguments; - - Runtime.getRuntime().exec(command); - log.debug("iproxy forward enabled."); - } - - public static void killAllIproxyProcess() { - String command = "killall iproxy"; - try { - Runtime.getRuntime().exec(command); - Thread.sleep(1000); - } catch (Exception ex) { - throw new PortForwardingException("An exception occurred while running command: " + command, ex); - } - log.debug("Killed any iproxy process that may have been running..."); - } -} diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/AltBaseCommand.java b/Bindings~/java/src/main/java/com/alttester/Commands/AltBaseCommand.java index ec8638c70..7f1ec4865 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/AltBaseCommand.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/AltBaseCommand.java @@ -3,9 +3,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.alttester.IMessageHandler; import com.alttester.AltMessage; -import com.alttester.altTesterExceptions.*; +import com.alttester.IMessageHandler; +import com.alttester.Exceptions.AltInvalidServerResponse; public class AltBaseCommand { protected static final Logger logger = LogManager.getLogger(AltBaseCommand.class); diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/AltCommandReturningAltObjects.java b/Bindings~/java/src/main/java/com/alttester/Commands/AltCommandReturningAltObjects.java index e2b06a46d..afd2fc0d8 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/AltCommandReturningAltObjects.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/AltCommandReturningAltObjects.java @@ -1,8 +1,8 @@ package com.alttester.Commands; -import com.alttester.IMessageHandler; import com.alttester.AltMessage; import com.alttester.AltObject; +import com.alttester.IMessageHandler; public class AltCommandReturningAltObjects extends AltBaseCommand { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltBaseFindObject.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltBaseFindObject.java index 8d7846ebb..13e639479 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltBaseFindObject.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltBaseFindObject.java @@ -1,7 +1,7 @@ package com.alttester.Commands.FindObject; -import com.alttester.IMessageHandler; import com.alttester.AltDriver; +import com.alttester.IMessageHandler; import com.alttester.Commands.AltCommandReturningAltObjects; public class AltBaseFindObject extends AltCommandReturningAltObjects { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObject.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObject.java index 6030944f9..517e7c0d6 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObject.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObject.java @@ -1,7 +1,7 @@ package com.alttester.Commands.FindObject; -import com.alttester.IMessageHandler; import com.alttester.AltObject; +import com.alttester.IMessageHandler; /** * Builder for finding the first object in the scene that respects the given diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectAtCoordinatesParams.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectAtCoordinatesParams.java index b71639b68..7465fed20 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectAtCoordinatesParams.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectAtCoordinatesParams.java @@ -1,7 +1,7 @@ package com.alttester.Commands.FindObject; import com.alttester.AltMessage; -import com.alttester.position.Vector2; +import com.alttester.Position.Vector2; public class AltFindObjectAtCoordinatesParams extends AltMessage { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectWhichContains.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectWhichContains.java index 5974b7aac..34120759e 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectWhichContains.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectWhichContains.java @@ -1,7 +1,7 @@ package com.alttester.Commands.FindObject; -import com.alttester.IMessageHandler; import com.alttester.AltObject; +import com.alttester.IMessageHandler; /** * Find the first object in the scene which respects the given criteria. diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjects.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjects.java index 525d7b5ff..ce661c112 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjects.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjects.java @@ -1,7 +1,7 @@ package com.alttester.Commands.FindObject; -import com.alttester.IMessageHandler; import com.alttester.AltObject; +import com.alttester.IMessageHandler; /** * Builder for finding all objects in the scene that respect the given criteria. diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectsParams.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectsParams.java index 0dc94f379..ade4effa3 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectsParams.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectsParams.java @@ -1,8 +1,8 @@ package com.alttester.Commands.FindObject; -import com.alttester.AltMessage; import com.alttester.AltDriver; import com.alttester.AltDriver.By; +import com.alttester.AltMessage; public class AltFindObjectsParams extends AltMessage { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectsWhichContain.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectsWhichContain.java index d13962f15..b2dce4081 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectsWhichContain.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltFindObjectsWhichContain.java @@ -1,7 +1,7 @@ package com.alttester.Commands.FindObject; -import com.alttester.IMessageHandler; import com.alttester.AltObject; +import com.alttester.IMessageHandler; /** * Find all the objects in the scene which respect the given criteria. diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltGetAllElements.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltGetAllElements.java index 8dcc49b9a..b6cfd47c1 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltGetAllElements.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltGetAllElements.java @@ -1,8 +1,8 @@ package com.alttester.Commands.FindObject; -import com.alttester.IMessageHandler; -import com.alttester.AltObject; import com.alttester.AltDriver.By; +import com.alttester.AltObject; +import com.alttester.IMessageHandler; /** * Returns information about every object loaded in the currently loaded scenes. diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltGetAllElementsParams.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltGetAllElementsParams.java index 0cb4db355..893954e0c 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltGetAllElementsParams.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltGetAllElementsParams.java @@ -1,7 +1,7 @@ package com.alttester.Commands.FindObject; -import com.alttester.AltMessage; import com.alttester.AltDriver.By; +import com.alttester.AltMessage; public class AltGetAllElementsParams extends AltMessage { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObject.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObject.java index 7c1e6ac01..6a2a29d0d 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObject.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObject.java @@ -1,9 +1,9 @@ package com.alttester.Commands.FindObject; -import com.alttester.Utils; -import com.alttester.IMessageHandler; import com.alttester.AltObject; -import com.alttester.altTesterExceptions.WaitTimeOutException; +import com.alttester.IMessageHandler; +import com.alttester.Utils; +import com.alttester.Exceptions.WaitTimeOutException; /** * Wait until there are no longer any objects that respect the given criteria or diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObjectToNotBePresent.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObjectToNotBePresent.java index 6b8507b86..ae38b8ceb 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObjectToNotBePresent.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObjectToNotBePresent.java @@ -1,9 +1,9 @@ package com.alttester.Commands.FindObject; -import com.alttester.Utils; -import com.alttester.IMessageHandler; import com.alttester.AltObject; -import com.alttester.altTesterExceptions.AltException; +import com.alttester.IMessageHandler; +import com.alttester.Utils; +import com.alttester.Exceptions.AltException; /** * Wait until the object in the scene that respect the given criteria is no diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObjectWhichContains.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObjectWhichContains.java index 9f8d9fbfd..d6a2bfb18 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObjectWhichContains.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObjectWhichContains.java @@ -1,9 +1,9 @@ package com.alttester.Commands.FindObject; -import com.alttester.Utils; -import com.alttester.IMessageHandler; import com.alttester.AltObject; -import com.alttester.altTesterExceptions.WaitTimeOutException; +import com.alttester.IMessageHandler; +import com.alttester.Utils; +import com.alttester.Exceptions.WaitTimeOutException; /** * Wait until it finds an object that respect the given criteria or times run diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/GetPNGScreenshotCommand.java b/Bindings~/java/src/main/java/com/alttester/Commands/GetPNGScreenshotCommand.java index 8670d1a7d..22d4dbe4f 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/GetPNGScreenshotCommand.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/GetPNGScreenshotCommand.java @@ -1,13 +1,13 @@ package com.alttester.Commands; -import com.alttester.AltMessage; -import com.alttester.IMessageHandler; - import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.Base64; +import com.alttester.AltMessage; +import com.alttester.IMessageHandler; + /** * Create a screenshot of the current scene in png format. */ diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltBeginTouchParams.java b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltBeginTouchParams.java index b37cc30f2..dd7db300a 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltBeginTouchParams.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltBeginTouchParams.java @@ -1,7 +1,7 @@ package com.alttester.Commands.InputActions; import com.alttester.AltMessage; -import com.alttester.position.Vector2; +import com.alttester.Position.Vector2; public class AltBeginTouchParams extends AltMessage { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltHoldParams.java b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltHoldParams.java index 70d70de52..7d5875108 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltHoldParams.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltHoldParams.java @@ -1,6 +1,6 @@ package com.alttester.Commands.InputActions; -import com.alttester.position.Vector2; +import com.alttester.Position.Vector2; public class AltHoldParams extends AltSwipeParams { public static class Builder { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMoveMouseParams.java b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMoveMouseParams.java index c428f11a7..480bb01f5 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMoveMouseParams.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMoveMouseParams.java @@ -1,7 +1,7 @@ package com.alttester.Commands.InputActions; import com.alttester.AltMessage; -import com.alttester.position.Vector2; +import com.alttester.Position.Vector2; public class AltMoveMouseParams extends AltMessage { public static class Builder { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMoveTouchParams.java b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMoveTouchParams.java index 286b76486..3b6c70853 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMoveTouchParams.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMoveTouchParams.java @@ -1,7 +1,7 @@ package com.alttester.Commands.InputActions; import com.alttester.AltMessage; -import com.alttester.position.Vector2; +import com.alttester.Position.Vector2; public class AltMoveTouchParams extends AltMessage { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMultiPointSwipeParams.java b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMultiPointSwipeParams.java index c013b55ad..7c7428fb4 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMultiPointSwipeParams.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltMultiPointSwipeParams.java @@ -3,7 +3,7 @@ import java.util.List; import com.alttester.AltMessage; -import com.alttester.position.Vector2; +import com.alttester.Position.Vector2; public class AltMultiPointSwipeParams extends AltMessage { public static class Builder { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltSwipeParams.java b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltSwipeParams.java index 8273cd259..95aef9f12 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltSwipeParams.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltSwipeParams.java @@ -1,7 +1,7 @@ package com.alttester.Commands.InputActions; import com.alttester.AltMessage; -import com.alttester.position.Vector2; +import com.alttester.Position.Vector2; public class AltSwipeParams extends AltMessage { public static class Builder { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltTapClickCoordinatesParams.java b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltTapClickCoordinatesParams.java index 5c5dbfe87..b1fc900ad 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltTapClickCoordinatesParams.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltTapClickCoordinatesParams.java @@ -1,7 +1,7 @@ package com.alttester.Commands.InputActions; import com.alttester.AltMessage; -import com.alttester.position.Vector2; +import com.alttester.Position.Vector2; public class AltTapClickCoordinatesParams extends AltMessage { private Vector2 coordinates; diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltTiltParams.java b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltTiltParams.java index 8e5529381..6e075a961 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltTiltParams.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/InputActions/AltTiltParams.java @@ -1,7 +1,7 @@ package com.alttester.Commands.InputActions; import com.alttester.AltMessage; -import com.alttester.position.Vector3; +import com.alttester.Position.Vector3; public class AltTiltParams extends AltMessage { public static class Builder { diff --git a/Bindings~/java/src/main/java/com/alttester/Commands/UnityCommand/AltWaitForCurrentSceneToBe.java b/Bindings~/java/src/main/java/com/alttester/Commands/UnityCommand/AltWaitForCurrentSceneToBe.java index f9d52dad8..031346cb8 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/UnityCommand/AltWaitForCurrentSceneToBe.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/UnityCommand/AltWaitForCurrentSceneToBe.java @@ -3,7 +3,7 @@ import com.alttester.Utils; import com.alttester.IMessageHandler; import com.alttester.Commands.AltBaseCommand; -import com.alttester.altTesterExceptions.WaitTimeOutException; +import com.alttester.Exceptions.WaitTimeOutException; public class AltWaitForCurrentSceneToBe extends AltBaseCommand { private AltWaitForCurrentSceneToBeParams params; diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltErrors.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltErrors.java similarity index 97% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltErrors.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/AltErrors.java index 7f75e2790..6abd58fad 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltErrors.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltErrors.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class AltErrors { public static final String errorNotFound = "notFound"; diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltException.java similarity index 89% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/AltException.java index a85baee74..32df40555 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class AltException extends RuntimeException { public AltException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltInputModuleException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltInputModuleException.java similarity index 81% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltInputModuleException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/AltInputModuleException.java index 02f31be92..51ba5a0be 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltInputModuleException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltInputModuleException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class AltInputModuleException extends AltException { public AltInputModuleException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltInvalidServerResponse.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltInvalidServerResponse.java similarity index 84% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltInvalidServerResponse.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/AltInvalidServerResponse.java index d17f4dcfe..5b5a3b5b5 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltInvalidServerResponse.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltInvalidServerResponse.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class AltInvalidServerResponse extends AltException { public AltInvalidServerResponse(String expected, String received) { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltRecvallException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltRecvallException.java similarity index 89% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltRecvallException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/AltRecvallException.java index 0f375862b..abd2d41a5 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltRecvallException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltRecvallException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class AltRecvallException extends AltException { public AltRecvallException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltRecvallMessageFormatException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltRecvallMessageFormatException.java similarity index 84% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltRecvallMessageFormatException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/AltRecvallMessageFormatException.java index 7385afc04..4b021cbe7 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltRecvallMessageFormatException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltRecvallMessageFormatException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class AltRecvallMessageFormatException extends AltRecvallException { public AltRecvallMessageFormatException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltRecvallMessageIdException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltRecvallMessageIdException.java similarity index 83% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltRecvallMessageIdException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/AltRecvallMessageIdException.java index 42f67ad5f..16f0b6984 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AltRecvallMessageIdException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/AltRecvallMessageIdException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class AltRecvallMessageIdException extends AltRecvallException { public AltRecvallMessageIdException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AssemblyNotFoundException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/AssemblyNotFoundException.java similarity index 82% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AssemblyNotFoundException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/AssemblyNotFoundException.java index daa4b9419..09ff6fbca 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/AssemblyNotFoundException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/AssemblyNotFoundException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class AssemblyNotFoundException extends AltException { public AssemblyNotFoundException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CameraNotFoundException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/CameraNotFoundException.java similarity index 81% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CameraNotFoundException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/CameraNotFoundException.java index c83272bc4..029dcc2fa 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CameraNotFoundException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/CameraNotFoundException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class CameraNotFoundException extends AltException { public CameraNotFoundException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CommandResponseTimeoutException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/CommandResponseTimeoutException.java similarity index 83% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CommandResponseTimeoutException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/CommandResponseTimeoutException.java index 01f115d3f..3f80eb108 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CommandResponseTimeoutException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/CommandResponseTimeoutException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class CommandResponseTimeoutException extends AltException { public CommandResponseTimeoutException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ComponentNotFoundException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/ComponentNotFoundException.java similarity index 82% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ComponentNotFoundException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/ComponentNotFoundException.java index f581e9a78..271dc31e4 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ComponentNotFoundException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/ComponentNotFoundException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class ComponentNotFoundException extends AltException { public ComponentNotFoundException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ConnectionException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/ConnectionException.java similarity index 87% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ConnectionException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/ConnectionException.java index 1454acaa5..a008494a5 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ConnectionException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/ConnectionException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; /** * Raised when the client can not connect to the server. diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ConnectionTimeoutException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/ConnectionTimeoutException.java similarity index 87% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ConnectionTimeoutException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/ConnectionTimeoutException.java index 9cc12e3b5..aedf0c6fd 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ConnectionTimeoutException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/ConnectionTimeoutException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; /** * Raised when the client connection timesout. diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CouldNotParseJsonStringException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/CouldNotParseJsonStringException.java similarity index 83% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CouldNotParseJsonStringException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/CouldNotParseJsonStringException.java index 3f27ff8f2..9b5c1ce27 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CouldNotParseJsonStringException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/CouldNotParseJsonStringException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class CouldNotParseJsonStringException extends AltException { public CouldNotParseJsonStringException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CouldNotPerformOperationException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/CouldNotPerformOperationException.java similarity index 83% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CouldNotPerformOperationException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/CouldNotPerformOperationException.java index c334e8c02..90b5a77e3 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/CouldNotPerformOperationException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/CouldNotPerformOperationException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class CouldNotPerformOperationException extends AltException { public CouldNotPerformOperationException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/FailedToParseArgumentsException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/FailedToParseArgumentsException.java similarity index 83% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/FailedToParseArgumentsException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/FailedToParseArgumentsException.java index 0911b99b6..892362679 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/FailedToParseArgumentsException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/FailedToParseArgumentsException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class FailedToParseArgumentsException extends AltException { public FailedToParseArgumentsException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/FormatException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/FormatException.java similarity index 79% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/FormatException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/FormatException.java index b4f50c937..74bfdaf49 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/FormatException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/FormatException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class FormatException extends AltException { public FormatException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidCommandException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidCommandException.java similarity index 77% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidCommandException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidCommandException.java index b7d730955..af5ff8e66 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidCommandException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidCommandException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class InvalidCommandException extends AltException { public InvalidCommandException(String message) { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidParameterException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidParameterException.java similarity index 77% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidParameterException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidParameterException.java index eb0588d6f..c11c41c26 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidParameterException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidParameterException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class InvalidParameterException extends AltException { public InvalidParameterException(String message) { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidParameterTypeException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidParameterTypeException.java similarity index 83% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidParameterTypeException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidParameterTypeException.java index 9024e7056..591a56d80 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidParameterTypeException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidParameterTypeException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class InvalidParameterTypeException extends AltException { public InvalidParameterTypeException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidPathException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidPathException.java similarity index 89% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidPathException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidPathException.java index dbd20e017..8a3206a6d 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/InvalidPathException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/InvalidPathException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class InvalidPathException extends AltException { public InvalidPathException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/MethodNotFoundException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/MethodNotFoundException.java similarity index 81% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/MethodNotFoundException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/MethodNotFoundException.java index beea66b2b..0f07cd8db 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/MethodNotFoundException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/MethodNotFoundException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class MethodNotFoundException extends AltException { public MethodNotFoundException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/MethodWithGivenParametersNotFoundException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/MethodWithGivenParametersNotFoundException.java similarity index 85% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/MethodWithGivenParametersNotFoundException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/MethodWithGivenParametersNotFoundException.java index 22a6de6d5..11071e3fb 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/MethodWithGivenParametersNotFoundException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/MethodWithGivenParametersNotFoundException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class MethodWithGivenParametersNotFoundException extends AltException { public MethodWithGivenParametersNotFoundException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/NotFoundException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/NotFoundException.java similarity index 80% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/NotFoundException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/NotFoundException.java index 506303522..e043383d2 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/NotFoundException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/NotFoundException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class NotFoundException extends AltException { public NotFoundException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/NullReferenceException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/NullReferenceException.java similarity index 81% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/NullReferenceException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/NullReferenceException.java index 07e9d9606..d62f71de3 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/NullReferenceException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/NullReferenceException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class NullReferenceException extends AltException { public NullReferenceException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ObjectWasNotFoundException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/ObjectWasNotFoundException.java similarity index 82% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ObjectWasNotFoundException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/ObjectWasNotFoundException.java index b9e1187b2..5dbec08b9 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ObjectWasNotFoundException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/ObjectWasNotFoundException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class ObjectWasNotFoundException extends AltException { public ObjectWasNotFoundException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/PortForwardingException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/PortForwardingException.java similarity index 92% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/PortForwardingException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/PortForwardingException.java index c77887331..7b79d9a8f 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/PortForwardingException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/PortForwardingException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class PortForwardingException extends AltException { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/PropertyCannotBeSetException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/PropertyCannotBeSetException.java similarity index 82% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/PropertyCannotBeSetException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/PropertyCannotBeSetException.java index 81db13c1a..122a7bee2 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/PropertyCannotBeSetException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/PropertyCannotBeSetException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class PropertyCannotBeSetException extends AltException { public PropertyCannotBeSetException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/PropertyNotFoundException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/PropertyNotFoundException.java similarity index 82% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/PropertyNotFoundException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/PropertyNotFoundException.java index 7b74987bb..b8689193c 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/PropertyNotFoundException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/PropertyNotFoundException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class PropertyNotFoundException extends AltException { public PropertyNotFoundException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ResponseFormatException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/ResponseFormatException.java similarity index 84% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ResponseFormatException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/ResponseFormatException.java index 6ce0ea2db..7c8444e05 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/ResponseFormatException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/ResponseFormatException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class ResponseFormatException extends AltException { public ResponseFormatException(Class type, String data) { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/SceneNotFoundException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/SceneNotFoundException.java similarity index 81% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/SceneNotFoundException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/SceneNotFoundException.java index dd73f8b65..86fee1cc9 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/SceneNotFoundException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/SceneNotFoundException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class SceneNotFoundException extends AltException { public SceneNotFoundException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/UnknownErrorException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/UnknownErrorException.java similarity index 81% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/UnknownErrorException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/UnknownErrorException.java index a005ae2b8..6e73d19fa 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/UnknownErrorException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/UnknownErrorException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class UnknownErrorException extends AltException { public UnknownErrorException() { diff --git a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/WaitTimeOutException.java b/Bindings~/java/src/main/java/com/alttester/Exceptions/WaitTimeOutException.java similarity index 80% rename from Bindings~/java/src/main/java/com/alttester/altTesterExceptions/WaitTimeOutException.java rename to Bindings~/java/src/main/java/com/alttester/Exceptions/WaitTimeOutException.java index fb6b9d96a..18cc7806e 100644 --- a/Bindings~/java/src/main/java/com/alttester/altTesterExceptions/WaitTimeOutException.java +++ b/Bindings~/java/src/main/java/com/alttester/Exceptions/WaitTimeOutException.java @@ -1,4 +1,4 @@ -package com.alttester.altTesterExceptions; +package com.alttester.Exceptions; public class WaitTimeOutException extends AltException { public WaitTimeOutException() { diff --git a/Bindings~/java/src/main/java/com/alttester/IMessageHandler.java b/Bindings~/java/src/main/java/com/alttester/IMessageHandler.java index 7dbd648a5..1f066e5ad 100644 --- a/Bindings~/java/src/main/java/com/alttester/IMessageHandler.java +++ b/Bindings~/java/src/main/java/com/alttester/IMessageHandler.java @@ -4,21 +4,20 @@ import com.alttester.Notifications.INotificationCallbacks; public interface IMessageHandler { + T receive(AltMessage altMessage, Class type); - public T receive(AltMessage altMessage, Class type); + void send(AltMessage altMessage); - public void send(AltMessage altMessage); + void onMessage(String message); - public void onMessage(String message); + void setCommandTimeout(int timeout); - public void setCommandTimeout(int timeout); - - public void addNotificationListener(NotificationType notificationType, INotificationCallbacks callbacks, + void addNotificationListener(NotificationType notificationType, INotificationCallbacks callbacks, boolean overwrite); - public void removeNotificationListener(NotificationType notificationType); + void removeNotificationListener(NotificationType notificationType); - public double getDelayAfterCommand(); + double getDelayAfterCommand(); - public void setDelayAfterCommand(double delay); -} \ No newline at end of file + void setDelayAfterCommand(double delay); +} diff --git a/Bindings~/java/src/main/java/com/alttester/MessageHandler.java b/Bindings~/java/src/main/java/com/alttester/MessageHandler.java index ac658d913..e0500739d 100644 --- a/Bindings~/java/src/main/java/com/alttester/MessageHandler.java +++ b/Bindings~/java/src/main/java/com/alttester/MessageHandler.java @@ -4,47 +4,48 @@ import java.util.LinkedList; import java.util.List; import java.util.Queue; -import java.lang.Thread; import javax.websocket.Session; -import com.google.gson.Gson; -import com.google.gson.JsonParseException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import com.google.gson.Gson; +import com.google.gson.JsonParseException; + import com.alttester.Commands.AltCommands.NotificationType; +import com.alttester.Exceptions.AltErrors; +import com.alttester.Exceptions.AltException; +import com.alttester.Exceptions.AltInputModuleException; +import com.alttester.Exceptions.AltRecvallException; +import com.alttester.Exceptions.AssemblyNotFoundException; +import com.alttester.Exceptions.CameraNotFoundException; +import com.alttester.Exceptions.CommandResponseTimeoutException; +import com.alttester.Exceptions.ComponentNotFoundException; +import com.alttester.Exceptions.CouldNotPerformOperationException; +import com.alttester.Exceptions.FailedToParseArgumentsException; +import com.alttester.Exceptions.FormatException; +import com.alttester.Exceptions.InvalidCommandException; +import com.alttester.Exceptions.InvalidParameterTypeException; +import com.alttester.Exceptions.InvalidPathException; +import com.alttester.Exceptions.MethodNotFoundException; +import com.alttester.Exceptions.MethodWithGivenParametersNotFoundException; +import com.alttester.Exceptions.NotFoundException; +import com.alttester.Exceptions.NullReferenceException; +import com.alttester.Exceptions.ObjectWasNotFoundException; +import com.alttester.Exceptions.PropertyNotFoundException; +import com.alttester.Exceptions.ResponseFormatException; +import com.alttester.Exceptions.SceneNotFoundException; +import com.alttester.Exceptions.UnknownErrorException; import com.alttester.Notifications.AltLoadSceneNotificationResultParams; import com.alttester.Notifications.AltLogNotificationResultParams; import com.alttester.Notifications.INotificationCallbacks; -import com.alttester.altTesterExceptions.AltErrors; -import com.alttester.altTesterExceptions.AltException; -import com.alttester.altTesterExceptions.AltInputModuleException; -import com.alttester.altTesterExceptions.AltRecvallException; -import com.alttester.altTesterExceptions.AssemblyNotFoundException; -import com.alttester.altTesterExceptions.CameraNotFoundException; -import com.alttester.altTesterExceptions.ComponentNotFoundException; -import com.alttester.altTesterExceptions.CouldNotPerformOperationException; -import com.alttester.altTesterExceptions.FailedToParseArgumentsException; -import com.alttester.altTesterExceptions.FormatException; -import com.alttester.altTesterExceptions.InvalidCommandException; -import com.alttester.altTesterExceptions.InvalidParameterTypeException; -import com.alttester.altTesterExceptions.InvalidPathException; -import com.alttester.altTesterExceptions.MethodNotFoundException; -import com.alttester.altTesterExceptions.MethodWithGivenParametersNotFoundException; -import com.alttester.altTesterExceptions.NotFoundException; -import com.alttester.altTesterExceptions.NullReferenceException; -import com.alttester.altTesterExceptions.ObjectWasNotFoundException; -import com.alttester.altTesterExceptions.PropertyNotFoundException; -import com.alttester.altTesterExceptions.ResponseFormatException; -import com.alttester.altTesterExceptions.SceneNotFoundException; -import com.alttester.altTesterExceptions.UnknownErrorException; -import com.alttester.altTesterExceptions.CommandResponseTimeoutException; public class MessageHandler implements IMessageHandler { + private static Logger logger = LogManager.getLogger(MessageHandler.class); + private Session session; private Queue responses = new LinkedList(); - private static final Logger logger = LogManager.getLogger(MessageHandler.class); private List loadSceneNotificationList = new ArrayList(); private List unloadSceneNotificationList = new ArrayList(); private List logNotificationList = new ArrayList(); @@ -53,19 +54,19 @@ public class MessageHandler implements IMessageHandler { private double commandTimeout = 60; private double delayAfterCommand = 0; - public MessageHandler(Session session) { + public MessageHandler(final Session session) { this.session = session; } - public double getDelayAfterCommand() { + public final double getDelayAfterCommand() { return this.delayAfterCommand; } - public void setDelayAfterCommand(double delay) { + public final void setDelayAfterCommand(final double delay) { this.delayAfterCommand = delay; } - public T receive(AltMessage data, Class type) { + public final T receive(final AltMessage data, final Class type) { double time = 0; double delay = 0.1; long sleepDelay = (long) (delay * 1000); @@ -108,13 +109,13 @@ public T receive(AltMessage data, Class type) { } } - public void send(AltMessage altMessage) { + public final void send(final AltMessage altMessage) { String message = new Gson().toJson(altMessage); session.getAsyncRemote().sendText(message); logger.debug("command sent: {}", trimLogData(message)); } - public void onMessage(String message) { + public final void onMessage(final String message) { logger.debug("response received: {}", trimLogData(message)); AltMessageResponse response = new Gson().fromJson(message, AltMessageResponse.class); @@ -126,7 +127,7 @@ public void onMessage(String message) { } } - private void handleNotification(AltMessageResponse message) { + private void handleNotification(final AltMessageResponse message) { switch (message.commandName) { case "loadSceneNotification": @@ -155,10 +156,12 @@ private void handleNotification(AltMessageResponse message) { callback.ApplicationPausedCallBack(data2); } break; + default: + break; } } - private void handleErrors(CommandError error) { + private void handleErrors(final CommandError error) { if (error == null) { return; } @@ -204,29 +207,32 @@ private void handleErrors(CommandError error) { throw new AltInputModuleException(error.message); case AltErrors.errorCameraNotFound: throw new CameraNotFoundException(error.message); + default: + break; } logger.error(error.type + " is not handled by driver."); throw new UnknownErrorException(error.message); } - public void setCommandTimeout(int timeout) { + public final void setCommandTimeout(final int timeout) { commandTimeout = timeout; } - private String trimLogData(String data) { + private String trimLogData(final String data) { return trimLogData(data, 1024 * 10); } - private String trimLogData(String data, int maxSize) { + private String trimLogData(final String data, final int maxSize) { if (data.length() > maxSize) { return data.substring(0, 10 * 1024) + "[...]"; } return data; } - public void addNotificationListener(NotificationType notificationType, INotificationCallbacks callbacks, - boolean overwrite) { + public final void addNotificationListener(final NotificationType notificationType, + final INotificationCallbacks callbacks, + final boolean overwrite) { switch (notificationType) { case LOADSCENE: if (overwrite) { @@ -258,7 +264,7 @@ public void addNotificationListener(NotificationType notificationType, INotifica } } - public void removeNotificationListener(NotificationType notificationType) { + public final void removeNotificationListener(final NotificationType notificationType) { switch (notificationType) { case LOADSCENE: loadSceneNotificationList.clear(); diff --git a/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java b/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java index 0435d6221..d846de5c5 100644 --- a/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java +++ b/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java @@ -18,7 +18,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.alttester.altTesterExceptions.*; +import com.alttester.Exceptions.*; @ClientEndpoint public class WebsocketConnection { @@ -32,14 +32,14 @@ public class WebsocketConnection { public Session session = null; public IMessageHandler messageHandler = null; - public WebsocketConnection(String host, int port, int connectTimeout, String appName) { + public WebsocketConnection(final String host, final int port, final int connectTimeout, final String appName) { _host = host; _port = port; _appName = appName; _connectTimeout = connectTimeout; } - public URI getURI() throws ConnectionException { + public final URI getURI() throws ConnectionException { try { return new URI("ws", null, _host, _port, "/altws", "appName=" + _appName, null); } catch (URISyntaxException e) { @@ -48,7 +48,7 @@ public URI getURI() throws ConnectionException { } } - public void connect() { + public final void connect() { URI uri = getURI(); logger.info("Connecting to: '{}'.", uri.toString()); @@ -103,7 +103,7 @@ public void connect() { } } - public void close() throws IOException { + public final void close() throws IOException { logger.info(String.format("Closing connection to AltTester on host: %s port: %s.", _host, _port)); if (this.session != null) { @@ -112,27 +112,27 @@ public void close() throws IOException { } @OnOpen - public void onOpen(Session session) { + public final void onOpen(final Session session) { logger.debug("Connected to: " + session.getRequestURI().toString()); this.session = session; this.messageHandler = new MessageHandler(session); } @OnMessage - public void onMessage(String message) { + public final void onMessage(final String message) { messageHandler.onMessage(message); } // Processing when receiving a message @OnError - public void onError(Throwable th) { + public final void onError(final Throwable th) { logger.error(th.getMessage()); logger.error(th); } // Processing at session release @OnClose - public void onClose(Session session, CloseReason reason) { + public final void onClose(final Session session, final CloseReason reason) { logger.debug("Connection to AltTester closed: {}.", reason.toString()); } } diff --git a/Bindings~/java/src/main/java/com/alttester/position/Vector2.java b/Bindings~/java/src/main/java/com/alttester/position/Vector2.java index 9a524f7c3..6d510c924 100644 --- a/Bindings~/java/src/main/java/com/alttester/position/Vector2.java +++ b/Bindings~/java/src/main/java/com/alttester/position/Vector2.java @@ -1,4 +1,4 @@ -package com.alttester.position; +package com.alttester.Position; import lombok.Data; import lombok.Getter; diff --git a/Bindings~/java/src/main/java/com/alttester/position/Vector3.java b/Bindings~/java/src/main/java/com/alttester/position/Vector3.java index 6d8c1367b..372f9cc8f 100644 --- a/Bindings~/java/src/main/java/com/alttester/position/Vector3.java +++ b/Bindings~/java/src/main/java/com/alttester/position/Vector3.java @@ -1,4 +1,4 @@ -package com.alttester.position; +package com.alttester.Position; import lombok.Data; import lombok.Getter; diff --git a/Bindings~/java/src/test/java/com/alttester/TestsForNIS.java b/Bindings~/java/src/test/java/com/alttester/TestsForNIS.java index 6a804e50c..2feefaca9 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsForNIS.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsForNIS.java @@ -1,35 +1,34 @@ package com.alttester; +import java.util.ArrayList; +import java.util.List; + import com.alttester.AltDriver.By; import com.alttester.Commands.FindObject.AltFindObjectsParams; +import com.alttester.Commands.FindObject.AltWaitForObjectsParams; +import com.alttester.Commands.InputActions.AltKeyDownParams; +import com.alttester.Commands.InputActions.AltKeyUpParams; +import com.alttester.Commands.InputActions.AltMoveMouseParams; import com.alttester.Commands.InputActions.AltMultiPointSwipeParams; import com.alttester.Commands.InputActions.AltPressKeyParams; import com.alttester.Commands.InputActions.AltPressKeysParams; import com.alttester.Commands.InputActions.AltScrollParams; import com.alttester.Commands.InputActions.AltSwipeParams; -import com.alttester.Commands.InputActions.AltKeyDownParams; -import com.alttester.Commands.InputActions.AltKeyUpParams; -import com.alttester.Commands.InputActions.AltMoveMouseParams; import com.alttester.Commands.InputActions.AltTapClickCoordinatesParams; import com.alttester.Commands.InputActions.AltTiltParams; -import com.alttester.Commands.ObjectCommand.AltTapClickElementParams; import com.alttester.Commands.ObjectCommand.AltGetComponentPropertyParams; -import com.alttester.Commands.FindObject.AltWaitForObjectsParams; +import com.alttester.Commands.ObjectCommand.AltTapClickElementParams; import com.alttester.Commands.UnityCommand.AltLoadSceneParams; +import com.alttester.Position.Vector2; +import com.alttester.Position.Vector3; import com.alttester.UnityStruct.AltKeyCode; -import com.alttester.position.Vector2; -import com.alttester.position.Vector3; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - public class TestsForNIS extends BaseTest { String scene7 = "Assets/AltTester/Examples/Scenes/Scene 7 Drag And Drop NIS.unity"; String scene8 = "Assets/AltTester/Examples/Scenes/Scene 8 Draggable Panel NIP.unity"; @@ -42,8 +41,8 @@ public static class ImagesDrop { public static String imageSourceDropZone; public ImagesDrop(String imageSource, String imageSourceDropZone) { - this.imageSource = imageSource; - this.imageSourceDropZone = imageSourceDropZone; + ImagesDrop.imageSource = imageSource; + ImagesDrop.imageSourceDropZone = imageSourceDropZone; } } diff --git a/Bindings~/java/src/test/java/com/alttester/TestsHelper.java b/Bindings~/java/src/test/java/com/alttester/TestsHelper.java index 5d6a9b510..3716e28c3 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsHelper.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsHelper.java @@ -1,9 +1,5 @@ package com.alttester; -import java.util.Collection; -import com.alttester.Commands.AltCommands.AltAddNotificationListenerParams; -import com.alttester.Commands.AltCommands.NotificationType; - public class TestsHelper { public static int GetAltDriverPort() { String port = System.getenv("ALTSERVER_PORT"); diff --git a/Bindings~/java/src/test/java/com/alttester/TestsNotifications.java b/Bindings~/java/src/test/java/com/alttester/TestsNotifications.java index efa86edea..650c7f14d 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsNotifications.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsNotifications.java @@ -15,8 +15,8 @@ import com.alttester.Commands.ObjectCommand.AltCallComponentMethodParams; import com.alttester.Commands.UnityCommand.AltLoadSceneParams; import com.alttester.Commands.UnityCommand.AltUnloadSceneParams; +import com.alttester.Exceptions.WaitTimeOutException; import com.alttester.Logging.AltLogLevel; -import com.alttester.altTesterExceptions.WaitTimeOutException; public class TestsNotifications { private static AltDriver altDriver; diff --git a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java index b7d7f2bf4..55c09c0d7 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java @@ -1,8 +1,6 @@ package com.alttester; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; +import java.io.File; import com.alttester.AltDriver.By; import com.alttester.Commands.AltCallStaticMethodParams; @@ -28,26 +26,27 @@ import com.alttester.Commands.UnityCommand.AltSetTimeScaleParams; import com.alttester.Commands.UnityCommand.AltUnloadSceneParams; import com.alttester.Commands.UnityCommand.AltWaitForCurrentSceneToBeParams; +import com.alttester.Exceptions.AssemblyNotFoundException; +import com.alttester.Exceptions.CameraNotFoundException; +import com.alttester.Exceptions.CommandResponseTimeoutException; +import com.alttester.Exceptions.ComponentNotFoundException; +import com.alttester.Exceptions.CouldNotPerformOperationException; +import com.alttester.Exceptions.InvalidParameterTypeException; +import com.alttester.Exceptions.InvalidPathException; +import com.alttester.Exceptions.MethodWithGivenParametersNotFoundException; +import com.alttester.Exceptions.NotFoundException; +import com.alttester.Exceptions.PropertyNotFoundException; +import com.alttester.Exceptions.ResponseFormatException; +import com.alttester.Exceptions.SceneNotFoundException; +import com.alttester.Exceptions.WaitTimeOutException; +import com.alttester.Position.Vector2; +import com.alttester.Position.Vector3; import com.alttester.UnityStruct.AltKeyCode; -import com.alttester.altTesterExceptions.AssemblyNotFoundException; -import com.alttester.altTesterExceptions.CameraNotFoundException; -import com.alttester.altTesterExceptions.CommandResponseTimeoutException; -import com.alttester.altTesterExceptions.ComponentNotFoundException; -import com.alttester.altTesterExceptions.CouldNotPerformOperationException; -import com.alttester.altTesterExceptions.InvalidParameterTypeException; -import com.alttester.altTesterExceptions.InvalidPathException; -import com.alttester.altTesterExceptions.MethodWithGivenParametersNotFoundException; -import com.alttester.altTesterExceptions.NotFoundException; -import com.alttester.altTesterExceptions.PropertyNotFoundException; -import com.alttester.altTesterExceptions.ResponseFormatException; -import com.alttester.altTesterExceptions.SceneNotFoundException; -import com.alttester.altTesterExceptions.WaitTimeOutException; -import com.alttester.position.Vector2; -import com.alttester.position.Vector3; -import com.google.gson.Gson; - -import java.lang.Void; +import com.google.gson.Gson; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -58,8 +57,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import java.io.File; - public class TestsSampleScene1 extends BaseTest { @BeforeEach @@ -738,25 +735,6 @@ public void TestCallStaticMethod() throws Exception { assertEquals(1, a); } - @Test - public void TestCallMethodWithMultipleDefinitions() throws Exception { - - AltFindObjectsParams altFindObjectsParameters1 = new AltFindObjectsParams.Builder( - AltDriver.By.NAME, "Capsule").build(); - AltFindObjectsParams altFindObjectsParameters2 = new AltFindObjectsParams.Builder( - AltDriver.By.NAME, "CapsuleInfo").build(); - AltObject capsule = altDriver.findObject(altFindObjectsParameters1); - capsule.callComponentMethod( - new AltCallComponentMethodParams.Builder("AltExampleScriptCapsule", "Test", - "Assembly-CSharp", - new Object[] { 2 }) - .withTypeOfParameters(new String[] { "System.Int32" }) - .build(), - Void.class); - AltObject capsuleInfo = altDriver.findObject(altFindObjectsParameters2); - assertEquals("6", capsuleInfo.getText()); - } - @Test public void TestGetSetTimeScale() { float timescale = 0.1f; diff --git a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene2.java b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene2.java index dbc4e722e..8a2ed572d 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene2.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene2.java @@ -1,7 +1,13 @@ package com.alttester; +import java.util.Arrays; +import java.util.List; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.alttester.AltDriver.By; import com.alttester.Commands.FindObject.AltFindObjectsParams; @@ -14,14 +20,7 @@ import com.alttester.Commands.ObjectCommand.AltGetComponentPropertyParams; import com.alttester.Commands.ObjectCommand.AltTapClickElementParams; import com.alttester.Commands.UnityCommand.AltLoadSceneParams; -import com.alttester.position.Vector2; - -import java.util.Arrays; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.alttester.Position.Vector2; public class TestsSampleScene2 extends BaseTest { diff --git a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene3.java b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene3.java index 95f2273c9..d97897175 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene3.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene3.java @@ -1,5 +1,8 @@ package com.alttester; +import java.util.ArrayList; +import java.util.List; + import com.alttester.AltDriver.By; import com.alttester.Commands.FindObject.AltFindObjectsParams; import com.alttester.Commands.FindObject.AltWaitForObjectsParams; @@ -7,14 +10,10 @@ import com.alttester.Commands.InputActions.AltSwipeParams; import com.alttester.Commands.ObjectCommand.AltGetComponentPropertyParams; import com.alttester.Commands.UnityCommand.AltLoadSceneParams; -import com.alttester.position.Vector2; - -import java.util.ArrayList; -import java.util.List; +import com.alttester.Position.Vector2; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -30,8 +29,8 @@ public static class ImagesDrop { public static String imageSourceDropZone; public ImagesDrop(String imageSource, String imageSourceDropZone) { - this.imageSource = imageSource; - this.imageSourceDropZone = imageSourceDropZone; + ImagesDrop.imageSource = imageSource; + ImagesDrop.imageSourceDropZone = imageSourceDropZone; } } diff --git a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene5.java b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene5.java index cb78220fb..de28f0344 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene5.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene5.java @@ -1,6 +1,12 @@ package com.alttester; -import com.alttester.position.Vector3; +import java.util.ArrayList; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + import com.alttester.AltDriver.By; import com.alttester.Commands.FindObject.AltFindObjectsParams; import com.alttester.Commands.InputActions.AltKeyDownParams; @@ -9,16 +15,9 @@ import com.alttester.Commands.InputActions.AltPressKeyParams; import com.alttester.Commands.InputActions.AltScrollParams; import com.alttester.Commands.UnityCommand.AltLoadSceneParams; +import com.alttester.Position.Vector3; import com.alttester.UnityStruct.AltKeyCode; -import java.util.ArrayList; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; - public class TestsSampleScene5 extends BaseTest { @BeforeEach @@ -86,7 +85,7 @@ public void TestUpdateAltObject() throws InterruptedException { altDriver.pressKey(new AltPressKeyParams.Builder(AltKeyCode.W).withDuration(1).withPower(2) .withWait(false).build()); Thread.sleep(2000); - assertNotEquals(cubeInitWorldZ, cube.UpdateObject().worldZ); + assertNotEquals(cubeInitWorldZ, cube.updateObject().worldZ); } @Test