From 385cc9fcc322cac16e7c335b35f8aea8be3c50c0 Mon Sep 17 00:00:00 2001 From: Sandy Date: Fri, 20 Jan 2023 15:42:43 +0200 Subject: [PATCH 01/55] add linting job for csharp --- .github/workflows/push.yml | 47 +++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index fd7085ba1..d477a5eeb 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -2,15 +2,39 @@ name: Push on: push: workflow_dispatch: - concurrency: group: build-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true - + jobs: + paths-filter: + runs-on: ubuntu-latest + outputs: + java: ${{ steps.filter.outputs.java }} + python: ${{ steps.filter.outputs.python }} + csharp: ${{ steps.filter.outputs.csharp }} + editor: ${{ steps.filter.outputs.editor }} + docs: ${{ steps.filter.outputs.docs }} + steps: + - uses: actions/checkout@v2 + - uses: dorny/paths-filter@v2 + id: filter + with: + filters: | + java: + - '**.java' + python: + - '**.py' + csharp: + - '**.cs' + editor: + - '**.cs' + docs: + -'Docs/**' build-docs: runs-on: [self-hosted, macOS] - + needs: paths-filter + if: needs.paths-filter.outputs.docs == 'true' steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -38,9 +62,9 @@ jobs: build-macOS: runs-on: [self-hosted, macOS] + needs: paths-filter steps: - uses: actions/checkout@v3 - - run: | $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterTools.BuildAltTester.MacBuildFromCommandLine -logFile buildMac.log -quit @@ -52,10 +76,11 @@ jobs: path: | sampleGame.app buildMac.log - + test-CSharp-Editor: runs-on: [self-hosted, macOS] needs: build-macOS + if: needs.paths-filter.outputs.csharp == 'true' steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3.0.0 @@ -67,6 +92,14 @@ jobs: open sampleGame.app $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error + - name: Set up .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: "6.0.x" + - name: Run linters + uses: wearerequired/lint-action@v2 + with: + dotnet_format: true - uses: actions/upload-artifact@v3.1.0 if: always() # run this step even if one of the previous step failed with: @@ -78,6 +111,7 @@ jobs: test-DotNet: runs-on: [self-hosted, macOS] needs: build-macOS + if: needs.paths-filter.outputs.csharp == 'true' steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3.0.0 @@ -101,6 +135,7 @@ jobs: test-Python: runs-on: [self-hosted, macOS] needs: build-macOS + if: needs.paths-filter.outputs.python == 'true' steps: - uses: actions/checkout@v3 @@ -146,10 +181,10 @@ jobs: name: TestPythonArtifact path: | *.log - test-Java: runs-on: [self-hosted, macOS] needs: build-macOS + if: steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3.0.0 From 8a95ff86dd41d8794d1b091089f6f0beeebf80d5 Mon Sep 17 00:00:00 2001 From: Sandy Date: Fri, 20 Jan 2023 15:45:21 +0200 Subject: [PATCH 02/55] add linting job for csharp --- .github/workflows/push.yml | 55 ++++++++++---------------------------- 1 file changed, 14 insertions(+), 41 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d477a5eeb..c0eb58a55 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -2,39 +2,15 @@ name: Push on: push: workflow_dispatch: + concurrency: group: build-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true - + jobs: - paths-filter: - runs-on: ubuntu-latest - outputs: - java: ${{ steps.filter.outputs.java }} - python: ${{ steps.filter.outputs.python }} - csharp: ${{ steps.filter.outputs.csharp }} - editor: ${{ steps.filter.outputs.editor }} - docs: ${{ steps.filter.outputs.docs }} - steps: - - uses: actions/checkout@v2 - - uses: dorny/paths-filter@v2 - id: filter - with: - filters: | - java: - - '**.java' - python: - - '**.py' - csharp: - - '**.cs' - editor: - - '**.cs' - docs: - -'Docs/**' build-docs: runs-on: [self-hosted, macOS] - needs: paths-filter - if: needs.paths-filter.outputs.docs == 'true' + steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -62,9 +38,9 @@ jobs: build-macOS: runs-on: [self-hosted, macOS] - needs: paths-filter steps: - uses: actions/checkout@v3 + - run: | $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterTools.BuildAltTester.MacBuildFromCommandLine -logFile buildMac.log -quit @@ -76,13 +52,20 @@ jobs: path: | sampleGame.app buildMac.log - + test-CSharp-Editor: runs-on: [self-hosted, macOS] needs: build-macOS - if: needs.paths-filter.outputs.csharp == 'true' steps: - uses: actions/checkout@v3 + - name: Set up .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: "6.0.x" + - name: Run linters + uses: wearerequired/lint-action@v2 + with: + dotnet_format: true - uses: actions/download-artifact@v3.0.0 with: name: @@ -92,14 +75,6 @@ jobs: open sampleGame.app $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error - - name: Set up .NET - uses: actions/setup-dotnet@v1 - with: - dotnet-version: "6.0.x" - - name: Run linters - uses: wearerequired/lint-action@v2 - with: - dotnet_format: true - uses: actions/upload-artifact@v3.1.0 if: always() # run this step even if one of the previous step failed with: @@ -111,7 +86,6 @@ jobs: test-DotNet: runs-on: [self-hosted, macOS] needs: build-macOS - if: needs.paths-filter.outputs.csharp == 'true' steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3.0.0 @@ -135,7 +109,6 @@ jobs: test-Python: runs-on: [self-hosted, macOS] needs: build-macOS - if: needs.paths-filter.outputs.python == 'true' steps: - uses: actions/checkout@v3 @@ -181,10 +154,10 @@ jobs: name: TestPythonArtifact path: | *.log + test-Java: runs-on: [self-hosted, macOS] needs: build-macOS - if: steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3.0.0 From eab4f909cd1fb8578ab67741ae319a545449a8c8 Mon Sep 17 00:00:00 2001 From: Sandy Date: Fri, 20 Jan 2023 15:53:40 +0200 Subject: [PATCH 03/55] try lint --- Assets/AltTester/AltDriver/AltDevice.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/AltTester/AltDriver/AltDevice.cs b/Assets/AltTester/AltDriver/AltDevice.cs index 517810983..2c80f2784 100644 --- a/Assets/AltTester/AltDriver/AltDevice.cs +++ b/Assets/AltTester/AltDriver/AltDevice.cs @@ -8,7 +8,7 @@ public class AltDevice public bool Active { get; set; } public string Platform { get; set; } public int Pid { get; set; } - + public AltDevice(string deviceId, string platform, int localPort = 13000, int remotePort = 13000, bool active = false, int pid = 0) { DeviceId = deviceId; @@ -16,7 +16,7 @@ public AltDevice(string deviceId, string platform, int localPort = 13000, int re RemotePort = remotePort; Active = active; Platform = platform; - Pid = pid; + Pid = pid } } } From bc4c1c03e680fb6c08cbd9729437385f8431a9ff Mon Sep 17 00:00:00 2001 From: Sandy Date: Fri, 20 Jan 2023 16:00:08 +0200 Subject: [PATCH 04/55] try lint --- .github/workflows/push.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c0eb58a55..66a76b081 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -58,14 +58,6 @@ jobs: needs: build-macOS steps: - uses: actions/checkout@v3 - - name: Set up .NET - uses: actions/setup-dotnet@v1 - with: - dotnet-version: "6.0.x" - - name: Run linters - uses: wearerequired/lint-action@v2 - with: - dotnet_format: true - uses: actions/download-artifact@v3.0.0 with: name: @@ -75,6 +67,14 @@ jobs: open sampleGame.app $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error + - name: Set up .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: "6.0.x" + - name: Run linters + uses: wearerequired/lint-action@v2 + with: + dotnet_format: true - uses: actions/upload-artifact@v3.1.0 if: always() # run this step even if one of the previous step failed with: From 1c6af1e51e419b40a3d0e608313d5771bbe077db Mon Sep 17 00:00:00 2001 From: Sandy Date: Mon, 23 Jan 2023 17:14:47 +0200 Subject: [PATCH 05/55] try dotnet-format --- .github/workflows/push.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 66a76b081..7b22e334a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -58,6 +58,12 @@ jobs: needs: build-macOS steps: - uses: actions/checkout@v3 + - name: Add dotnet-format problem matcher + uses: xt0rted/dotnet-format-problem-matcher@v1 + - name: Restore dotnet tools + uses: xt0rted/dotnet-tool-restore@v1 + - name: Run dotnet format + uses: xt0rted/dotnet-format@v1 - uses: actions/download-artifact@v3.0.0 with: name: @@ -67,14 +73,6 @@ jobs: open sampleGame.app $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error - - name: Set up .NET - uses: actions/setup-dotnet@v1 - with: - dotnet-version: "6.0.x" - - name: Run linters - uses: wearerequired/lint-action@v2 - with: - dotnet_format: true - uses: actions/upload-artifact@v3.1.0 if: always() # run this step even if one of the previous step failed with: From b658cc4450c449df2ca4b0d2b7b9cde83dad4821 Mon Sep 17 00:00:00 2001 From: Sandy Date: Mon, 23 Jan 2023 17:29:52 +0200 Subject: [PATCH 06/55] try dotnet-format --- .github/workflows/push.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 7b22e334a..ed204e3a4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -86,6 +86,12 @@ jobs: needs: build-macOS steps: - uses: actions/checkout@v3 + - name: Add dotnet-format problem matcher + uses: xt0rted/dotnet-format-problem-matcher@v1 + - name: Restore dotnet tools + uses: xt0rted/dotnet-tool-restore@v1 + - name: Run dotnet format + uses: xt0rted/dotnet-format@v1 - uses: actions/download-artifact@v3.0.0 with: name: From 03798d87b656cdb4386634573feba98faa52e0e1 Mon Sep 17 00:00:00 2001 From: Sandy Date: Tue, 24 Jan 2023 10:49:43 +0200 Subject: [PATCH 07/55] try clang-format --- .github/workflows/push.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ed204e3a4..45837f6e4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -57,13 +57,11 @@ jobs: runs-on: [self-hosted, macOS] needs: build-macOS steps: - - uses: actions/checkout@v3 - - name: Add dotnet-format problem matcher - uses: xt0rted/dotnet-format-problem-matcher@v1 - - name: Restore dotnet tools - uses: xt0rted/dotnet-tool-restore@v1 - - name: Run dotnet format - uses: xt0rted/dotnet-format@v1 + - name: Run clang-format style check for C/C++/Protobuf programs. + uses: jidicula/clang-format-action@v4.10.1 + with: + clang-format-version: '13' + check-path: 'src' - uses: actions/download-artifact@v3.0.0 with: name: @@ -85,13 +83,11 @@ jobs: runs-on: [self-hosted, macOS] needs: build-macOS steps: - - uses: actions/checkout@v3 - - name: Add dotnet-format problem matcher - uses: xt0rted/dotnet-format-problem-matcher@v1 - - name: Restore dotnet tools - uses: xt0rted/dotnet-tool-restore@v1 - - name: Run dotnet format - uses: xt0rted/dotnet-format@v1 + - name: Run clang-format style check for C/C++/Protobuf programs. + uses: jidicula/clang-format-action@v4.10.1 + with: + clang-format-version: '13' + check-path: 'src' - uses: actions/download-artifact@v3.0.0 with: name: From 4b7797213894bb9aa6b63787009071e26fe55077 Mon Sep 17 00:00:00 2001 From: Sandy Date: Tue, 24 Jan 2023 11:44:35 +0200 Subject: [PATCH 08/55] try clang-format --- .github/workflows/push.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 45837f6e4..2e73fe3e2 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -57,6 +57,7 @@ jobs: runs-on: [self-hosted, macOS] needs: build-macOS steps: + - uses: actions/checkout@v3 - name: Run clang-format style check for C/C++/Protobuf programs. uses: jidicula/clang-format-action@v4.10.1 with: @@ -83,6 +84,7 @@ jobs: runs-on: [self-hosted, macOS] needs: build-macOS steps: + - uses: actions/checkout@v3 - name: Run clang-format style check for C/C++/Protobuf programs. uses: jidicula/clang-format-action@v4.10.1 with: From 86e059734ab501259e3678bfd8eae8ebaefc7f43 Mon Sep 17 00:00:00 2001 From: Sandy Date: Tue, 24 Jan 2023 11:55:37 +0200 Subject: [PATCH 09/55] try dotnet-format --- .github/workflows/push.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2e73fe3e2..aa033ca49 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -58,11 +58,10 @@ jobs: needs: build-macOS steps: - uses: actions/checkout@v3 - - name: Run clang-format style check for C/C++/Protobuf programs. - uses: jidicula/clang-format-action@v4.10.1 + - name: Run dotnet format + uses: xt0rted/dotnet-format@v1 with: - clang-format-version: '13' - check-path: 'src' + only-changed-files: "true" - uses: actions/download-artifact@v3.0.0 with: name: @@ -85,11 +84,10 @@ jobs: needs: build-macOS steps: - uses: actions/checkout@v3 - - name: Run clang-format style check for C/C++/Protobuf programs. - uses: jidicula/clang-format-action@v4.10.1 + - name: Run dotnet format + uses: xt0rted/dotnet-format@v1 with: - clang-format-version: '13' - check-path: 'src' + only-changed-files: "true" - uses: actions/download-artifact@v3.0.0 with: name: From e93e10dd76f3cfce96bb38d3352a65390550742a Mon Sep 17 00:00:00 2001 From: Sandy Date: Tue, 24 Jan 2023 12:14:09 +0200 Subject: [PATCH 10/55] try dotnet-format --- Assets/AltTester/AltDriver/AltDevice.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/AltTester/AltDriver/AltDevice.cs b/Assets/AltTester/AltDriver/AltDevice.cs index 2c80f2784..c7152e9bb 100644 --- a/Assets/AltTester/AltDriver/AltDevice.cs +++ b/Assets/AltTester/AltDriver/AltDevice.cs @@ -16,7 +16,7 @@ public AltDevice(string deviceId, string platform, int localPort = 13000, int re RemotePort = remotePort; Active = active; Platform = platform; - Pid = pid + Pid = pid; } } } From 2eb3c92410eb4ec57742cb46321ff2b380bc32cc Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 13:13:44 +0200 Subject: [PATCH 11/55] try clang-format --- .github/workflows/push.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index aa033ca49..06a5944aa 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -58,10 +58,6 @@ jobs: needs: build-macOS steps: - uses: actions/checkout@v3 - - name: Run dotnet format - uses: xt0rted/dotnet-format@v1 - with: - only-changed-files: "true" - uses: actions/download-artifact@v3.0.0 with: name: @@ -71,6 +67,11 @@ jobs: open sampleGame.app $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error + - name: Run clang-format style check for C/C++/Protobuf programs. + uses: jidicula/clang-format-action@v4.10.1 + with: + clang-format-version: '13' + check-path: 'src' - uses: actions/upload-artifact@v3.1.0 if: always() # run this step even if one of the previous step failed with: @@ -84,10 +85,6 @@ jobs: needs: build-macOS steps: - uses: actions/checkout@v3 - - name: Run dotnet format - uses: xt0rted/dotnet-format@v1 - with: - only-changed-files: "true" - uses: actions/download-artifact@v3.0.0 with: name: From f13d4b2fac0d222def4a8d42e3ab865d7dd29604 Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 13:51:58 +0200 Subject: [PATCH 12/55] change order in steps --- .github/workflows/push.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 06a5944aa..9339c32e1 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -62,16 +62,16 @@ jobs: with: name: BuildMacArtifact - - run: | - chmod -R 755 sampleGame.app - open sampleGame.app - $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit - #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error - name: Run clang-format style check for C/C++/Protobuf programs. uses: jidicula/clang-format-action@v4.10.1 with: clang-format-version: '13' check-path: 'src' + - run: | + chmod -R 755 sampleGame.app + open sampleGame.app + $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit + #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error - uses: actions/upload-artifact@v3.1.0 if: always() # run this step even if one of the previous step failed with: From af3d1b6f2b685c6e782a63d0ef91b108c1fbd54b Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 14:00:26 +0200 Subject: [PATCH 13/55] try clang-format --- Assets/AltTester/AltDriver/AltDriver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/AltTester/AltDriver/AltDriver.cs b/Assets/AltTester/AltDriver/AltDriver.cs index 29899fff8..8139dbd3f 100644 --- a/Assets/AltTester/AltDriver/AltDriver.cs +++ b/Assets/AltTester/AltDriver/AltDriver.cs @@ -16,7 +16,7 @@ public class AltDriver { private static readonly NLog.Logger logger = DriverLogManager.Instance.GetCurrentClassLogger(); private readonly IDriverCommunication communicationHandler; - public static readonly string VERSION = "1.8.2"; + public static readonly string VERSION = "1.8.2" public IDriverCommunication CommunicationHandler { get { return communicationHandler; } } From 7de6b05645d90a2a6fc30a4f4769bf9980377507 Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 14:08:41 +0200 Subject: [PATCH 14/55] change order in steps --- .github/workflows/push.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 9339c32e1..57eb4cfae 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -62,15 +62,15 @@ jobs: with: name: BuildMacArtifact + - run: | + chmod -R 755 sampleGame.app + open sampleGame.app + $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit - name: Run clang-format style check for C/C++/Protobuf programs. uses: jidicula/clang-format-action@v4.10.1 with: clang-format-version: '13' check-path: 'src' - - run: | - chmod -R 755 sampleGame.app - open sampleGame.app - $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error - uses: actions/upload-artifact@v3.1.0 if: always() # run this step even if one of the previous step failed From d3419eb2c2f392744d1a460e1d127b296d232e24 Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 14:14:11 +0200 Subject: [PATCH 15/55] try dotnet-format --- .github/workflows/push.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 57eb4cfae..edcfb4ebc 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -62,15 +62,14 @@ jobs: with: name: BuildMacArtifact + - name: Run dotnet format + uses: xt0rted/dotnet-format@v1 + with: + only-changed-files: "true" - run: | chmod -R 755 sampleGame.app open sampleGame.app $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit - - name: Run clang-format style check for C/C++/Protobuf programs. - uses: jidicula/clang-format-action@v4.10.1 - with: - clang-format-version: '13' - check-path: 'src' #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error - uses: actions/upload-artifact@v3.1.0 if: always() # run this step even if one of the previous step failed From 402c415f50f915b3aac9e4eb239a99421f52318b Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 14:18:10 +0200 Subject: [PATCH 16/55] change order in steps --- .github/workflows/push.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index edcfb4ebc..2a3eda0fb 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -62,14 +62,14 @@ jobs: with: name: BuildMacArtifact - - name: Run dotnet format - uses: xt0rted/dotnet-format@v1 - with: - only-changed-files: "true" - run: | chmod -R 755 sampleGame.app open sampleGame.app $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit + - name: Run dotnet format + uses: xt0rted/dotnet-format@v1 + with: + only-changed-files: "true" #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error - uses: actions/upload-artifact@v3.1.0 if: always() # run this step even if one of the previous step failed From 5d4f81da5b110fca45e86e03fdb1e5d0404e5b08 Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 14:41:58 +0200 Subject: [PATCH 17/55] resolve error --- Assets/AltTester/AltDriver/AltDriver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/AltTester/AltDriver/AltDriver.cs b/Assets/AltTester/AltDriver/AltDriver.cs index 8139dbd3f..29899fff8 100644 --- a/Assets/AltTester/AltDriver/AltDriver.cs +++ b/Assets/AltTester/AltDriver/AltDriver.cs @@ -16,7 +16,7 @@ public class AltDriver { private static readonly NLog.Logger logger = DriverLogManager.Instance.GetCurrentClassLogger(); private readonly IDriverCommunication communicationHandler; - public static readonly string VERSION = "1.8.2" + public static readonly string VERSION = "1.8.2"; public IDriverCommunication CommunicationHandler { get { return communicationHandler; } } From ebed43e047b23c0996e93f96500e31e4ef415074 Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 15:35:45 +0200 Subject: [PATCH 18/55] try just lintC# --- .github/workflows/push.yml | 319 +++++++++++++++++++------------------ 1 file changed, 161 insertions(+), 158 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2a3eda0fb..ac28fff0f 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -35,168 +35,171 @@ jobs: with: name: DocumentationHTML path: Docs/build/html/ - - build-macOS: + lint-CSharp: runs-on: [self-hosted, macOS] steps: - - uses: actions/checkout@v3 - - - run: | - $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterTools.BuildAltTester.MacBuildFromCommandLine -logFile buildMac.log -quit - - - run: ls - - uses: actions/upload-artifact@v3.1.0 - if: always() # run this step even if one of the previous step failed + - name: Run dotnet format + uses: xt0rted/dotnet-format@v1 with: - name: BuildMacArtifact - path: | - sampleGame.app - buildMac.log - - test-CSharp-Editor: - runs-on: [self-hosted, macOS] - needs: build-macOS - steps: - - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3.0.0 - with: - name: - BuildMacArtifact - - run: | - chmod -R 755 sampleGame.app - open sampleGame.app - $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit - - name: Run dotnet format - uses: xt0rted/dotnet-format@v1 - with: - only-changed-files: "true" - #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error - - uses: actions/upload-artifact@v3.1.0 - if: always() # run this step even if one of the previous step failed - with: - name: TestCSharpArtifact - path: | - *.log - reportTest.xml + only-changed-files: "true" + # build-macOS: + # runs-on: [self-hosted, macOS] + # steps: + # - uses: actions/checkout@v3 + + # - run: | + # $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterTools.BuildAltTester.MacBuildFromCommandLine -logFile buildMac.log -quit + + # - run: ls + # - uses: actions/upload-artifact@v3.1.0 + # if: always() # run this step even if one of the previous step failed + # with: + # name: BuildMacArtifact + # path: | + # sampleGame.app + # buildMac.log + + # test-CSharp-Editor: + # runs-on: [self-hosted, macOS] + # needs: build-macOS + # steps: + # - uses: actions/checkout@v3 + # - uses: actions/download-artifact@v3.0.0 + # with: + # name: + # BuildMacArtifact + # - run: | + # chmod -R 755 sampleGame.app + # open sampleGame.app + # $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpAndroidTests.log -quit + + # #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error + # - uses: actions/upload-artifact@v3.1.0 + # if: always() # run this step even if one of the previous step failed + # with: + # name: TestCSharpArtifact + # path: | + # *.log + # reportTest.xml - test-DotNet: - runs-on: [self-hosted, macOS] - needs: build-macOS - steps: - - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3.0.0 - with: - name: - BuildMacArtifact - - name: Setup .NET Core SDK - uses: actions/setup-dotnet@v2.1.1 - - run: | - chmod -R 755 sampleGame.app - open sampleGame.app - dotnet test Bindings~/dotnet/AltDriver.Tests/AltDriver.Tests.csproj --logger:"console;verbosity=detailed" - - - uses: actions/upload-artifact@v3.1.0 - if: always() # run this step even if one of the previous step failed - with: - name: TestCSharpArtifact - path: | - *.log + # test-DotNet: + # runs-on: [self-hosted, macOS] + # needs: build-macOS + # steps: + # - uses: actions/checkout@v3 + # - uses: actions/download-artifact@v3.0.0 + # with: + # name: + # BuildMacArtifact + # - name: Setup .NET Core SDK + # uses: actions/setup-dotnet@v2.1.1 + # - run: | + # chmod -R 755 sampleGame.app + # open sampleGame.app + # dotnet test Bindings~/dotnet/AltDriver.Tests/AltDriver.Tests.csproj --logger:"console;verbosity=detailed" + + # - uses: actions/upload-artifact@v3.1.0 + # if: always() # run this step even if one of the previous step failed + # with: + # name: TestCSharpArtifact + # path: | + # *.log - test-Python: - runs-on: [self-hosted, macOS] - needs: build-macOS - steps: - - uses: actions/checkout@v3 - - - uses: actions/download-artifact@v3.0.0 - with: - name: - BuildMacArtifact - - - uses: actions/setup-python@v4 - with: - python-version: '3.10' - cached: 'pip' - - - uses: syphar/restore-virtualenv@v1 - id: cache-virtualenv - - - uses: syphar/restore-pip-download-cache@v1 - if: steps.cache-virtualenv.outputs.cache-hit != 'true' - - - name: Install dependencies - run: | - pip install -r "Bindings~/python/requirements.txt" - pip install -r "Bindings~/python/requirements-dev.txt" - pip install --ignore-installed -e "Bindings~/python" --root "Bindings~/python" - - - name: Lint with flake8 - run: | - flake8 Bindings~/python/tests --config Bindings~/python/.flake8 - - - name: Run unit tests - run: | - pytest Bindings~/python/tests/unit - - - name: Run integration tests - run: | - chmod -R 755 sampleGame.app - open sampleGame.app - pytest Bindings~/python/tests/integration - - - uses: actions/upload-artifact@v3.1.0 - if: always() # run this step even if one of the previous step failed - with: - name: TestPythonArtifact - path: | - *.log - - test-Java: - runs-on: [self-hosted, macOS] - needs: build-macOS - steps: - - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3.0.0 - with: - name: - BuildMacArtifact + # test-Python: + # runs-on: [self-hosted, macOS] + # needs: build-macOS + # steps: + # - uses: actions/checkout@v3 + + # - uses: actions/download-artifact@v3.0.0 + # with: + # name: + # BuildMacArtifact + + # - uses: actions/setup-python@v4 + # with: + # python-version: '3.10' + # cached: 'pip' + + # - uses: syphar/restore-virtualenv@v1 + # id: cache-virtualenv + + # - uses: syphar/restore-pip-download-cache@v1 + # if: steps.cache-virtualenv.outputs.cache-hit != 'true' + + # - name: Install dependencies + # run: | + # pip install -r "Bindings~/python/requirements.txt" + # pip install -r "Bindings~/python/requirements-dev.txt" + # pip install --ignore-installed -e "Bindings~/python" --root "Bindings~/python" + + # - name: Lint with flake8 + # run: | + # flake8 Bindings~/python/tests --config Bindings~/python/.flake8 + + # - name: Run unit tests + # run: | + # pytest Bindings~/python/tests/unit + + # - name: Run integration tests + # run: | + # chmod -R 755 sampleGame.app + # open sampleGame.app + # pytest Bindings~/python/tests/integration + + # - uses: actions/upload-artifact@v3.1.0 + # if: always() # run this step even if one of the previous step failed + # with: + # name: TestPythonArtifact + # path: | + # *.log + + # test-Java: + # runs-on: [self-hosted, macOS] + # needs: build-macOS + # steps: + # - uses: actions/checkout@v3 + # - uses: actions/download-artifact@v3.0.0 + # with: + # name: + # BuildMacArtifact - - name: Setup Java JDK - uses: actions/setup-java@v3.5.1 - with: - distribution: temurin - java-version: 11 - - uses: stCarolas/setup-maven@v4.4 - - run: | - chmod -R 755 sampleGame.app - open sampleGame.app - cd "Bindings~/java" - mvn -Dtest=com.alttester.Tests* test - - - uses: actions/upload-artifact@v3.1.0 - if: always() # run this step even if one of the previous step failed - with: - name: TestJavaArtifact - path: | - *.log + # - name: Setup Java JDK + # uses: actions/setup-java@v3.5.1 + # with: + # distribution: temurin + # java-version: 11 + # - uses: stCarolas/setup-maven@v4.4 + # - run: | + # chmod -R 755 sampleGame.app + # open sampleGame.app + # cd "Bindings~/java" + # mvn -Dtest=com.alttester.Tests* test + + # - uses: actions/upload-artifact@v3.1.0 + # if: always() # run this step even if one of the previous step failed + # with: + # name: TestJavaArtifact + # path: | + # *.log - dev-docs: - runs-on: [self-hosted, macOS] - needs: build-docs - steps: - - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3.0.0 - with: - name: DocumentationHTML - path: DocumentationHTML/ - - - name: Upload new documentation - uses: garygrossgarten/github-action-scp@release - with: - local: DocumentationHTML - remote: ${{ secrets.DOCUMENTATION_PATH }} - host: ${{ secrets.HOST_IP_ALTOM }} - port: ${{ secrets.PORT_DEV_ALTOM }} - username: ${{ secrets.USERNAME_ALTOM }} - password: ${{ secrets.PASSWORD_DEV_ALTOM }} - rmRemote: true \ No newline at end of file + # dev-docs: + # runs-on: [self-hosted, macOS] + # needs: build-docs + # steps: + # - uses: actions/checkout@v3 + # - uses: actions/download-artifact@v3.0.0 + # with: + # name: DocumentationHTML + # path: DocumentationHTML/ + + # - name: Upload new documentation + # uses: garygrossgarten/github-action-scp@release + # with: + # local: DocumentationHTML + # remote: ${{ secrets.DOCUMENTATION_PATH }} + # host: ${{ secrets.HOST_IP_ALTOM }} + # port: ${{ secrets.PORT_DEV_ALTOM }} + # username: ${{ secrets.USERNAME_ALTOM }} + # password: ${{ secrets.PASSWORD_DEV_ALTOM }} + # rmRemote: true \ No newline at end of file From 6f00496be37eb70248d9228147992ca9a947616f Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 15:44:34 +0200 Subject: [PATCH 19/55] try just lintC# --- .github/workflows/push.yml | 60 ++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ac28fff0f..fe9b08539 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,40 +8,38 @@ concurrency: cancel-in-progress: true jobs: - build-docs: - runs-on: [self-hosted, macOS] - - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: '3.10' - cached: 'pip' - - uses: syphar/restore-virtualenv@v1 - id: cache-virtualenv - - - uses: syphar/restore-pip-download-cache@v1 - if: steps.cache-virtualenv.outputs.cache-hit != 'true' - - - run: pip install -r Docs/requirements.txt - if: steps.cache-virtualenv.outputs.cache-hit != 'true' - - run: pwd - - uses: rickstaa/sphinx-action@master - with: - docs-folder: Docs - build-command: make html - - - uses: actions/upload-artifact@v1 - with: - name: DocumentationHTML - path: Docs/build/html/ + # build-docs: + # runs-on: [self-hosted, macOS] + + # steps: + # - uses: actions/checkout@v3 + # - uses: actions/setup-python@v4 + # with: + # python-version: '3.10' + # cached: 'pip' + # - uses: syphar/restore-virtualenv@v1 + # id: cache-virtualenv + + # - uses: syphar/restore-pip-download-cache@v1 + # if: steps.cache-virtualenv.outputs.cache-hit != 'true' + + # - run: pip install -r Docs/requirements.txt + # if: steps.cache-virtualenv.outputs.cache-hit != 'true' + # - run: pwd + # - uses: rickstaa/sphinx-action@master + # with: + # docs-folder: Docs + # build-command: make html + + # - uses: actions/upload-artifact@v1 + # with: + # name: DocumentationHTML + # path: Docs/build/html/ lint-CSharp: - runs-on: [self-hosted, macOS] + runs-on: ubuntu-latest steps: - name: Run dotnet format - uses: xt0rted/dotnet-format@v1 - with: - only-changed-files: "true" + uses: xt0rted/dotnet-format@v1.2.0 # build-macOS: # runs-on: [self-hosted, macOS] # steps: From 99f8842da404691b5fb7c348b6f20d223ca660c9 Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 15:49:26 +0200 Subject: [PATCH 20/55] try just lintC# --- .github/workflows/push.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index fe9b08539..4e27c33e4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -38,8 +38,11 @@ jobs: lint-CSharp: runs-on: ubuntu-latest steps: - - name: Run dotnet format - uses: xt0rted/dotnet-format@v1.2.0 + - uses: actions/checkout@v3 + - name: Run clang-format style check for C/C++/Protobuf programs. + uses: jidicula/clang-format-action@v4.10.1 + with: + clang-format-version: '13' # build-macOS: # runs-on: [self-hosted, macOS] # steps: From 12cd357a6970caede226d3ce2e3aad87a74dd96d Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 15:50:19 +0200 Subject: [PATCH 21/55] try clang-format --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4e27c33e4..1f4cc2ba2 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -41,8 +41,8 @@ jobs: - uses: actions/checkout@v3 - name: Run clang-format style check for C/C++/Protobuf programs. uses: jidicula/clang-format-action@v4.10.1 - with: - clang-format-version: '13' + with: + clang-format-version: '13' # build-macOS: # runs-on: [self-hosted, macOS] # steps: From 0a65e6ac0c1da0e1be2aaddcd59effba2682517f Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 15:51:52 +0200 Subject: [PATCH 22/55] try clang-format with error --- Assets/AltTester/AltDriver/AltDevice.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/AltTester/AltDriver/AltDevice.cs b/Assets/AltTester/AltDriver/AltDevice.cs index c7152e9bb..2c80f2784 100644 --- a/Assets/AltTester/AltDriver/AltDevice.cs +++ b/Assets/AltTester/AltDriver/AltDevice.cs @@ -16,7 +16,7 @@ public AltDevice(string deviceId, string platform, int localPort = 13000, int re RemotePort = remotePort; Active = active; Platform = platform; - Pid = pid; + Pid = pid } } } From 584667308580b529608698333a0c1de262c512de Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 15:54:19 +0200 Subject: [PATCH 23/55] try clang-format with error --- .github/workflows/push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 1f4cc2ba2..fa2721c06 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -43,6 +43,7 @@ jobs: uses: jidicula/clang-format-action@v4.10.1 with: clang-format-version: '13' + check-path: 'Assets' # build-macOS: # runs-on: [self-hosted, macOS] # steps: From 6d422c6260e45f9e400d8236b1c7d951e475defc Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 15:56:33 +0200 Subject: [PATCH 24/55] try lint code base with error --- .github/workflows/push.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index fa2721c06..8508307ee 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -39,11 +39,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Run clang-format style check for C/C++/Protobuf programs. - uses: jidicula/clang-format-action@v4.10.1 - with: - clang-format-version: '13' - check-path: 'Assets' + - name: Lint Code Base + uses: github/super-linter@v4 + env: + VALIDATE_ALL_CODEBASE: true + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # build-macOS: # runs-on: [self-hosted, macOS] # steps: From e74c1738d2648cffc0a9f7976affe52a3bdd41a3 Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 16:16:40 +0200 Subject: [PATCH 25/55] try lint code base without error --- .github/workflows/push.yml | 6 +++++- Assets/AltTester/AltDriver/AltDevice.cs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 8508307ee..a7cb55cfb 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -42,8 +42,12 @@ jobs: - name: Lint Code Base uses: github/super-linter@v4 env: - VALIDATE_ALL_CODEBASE: true + VALIDATE_ALL_CODEBASE: false GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VALIDATE_JAVA: true + VALIDATE_PYTHON_FLAKE8: true + VALIDATE_CSHARP: true + # build-macOS: # runs-on: [self-hosted, macOS] # steps: diff --git a/Assets/AltTester/AltDriver/AltDevice.cs b/Assets/AltTester/AltDriver/AltDevice.cs index 2c80f2784..c7152e9bb 100644 --- a/Assets/AltTester/AltDriver/AltDevice.cs +++ b/Assets/AltTester/AltDriver/AltDevice.cs @@ -16,7 +16,7 @@ public AltDevice(string deviceId, string platform, int localPort = 13000, int re RemotePort = remotePort; Active = active; Platform = platform; - Pid = pid + Pid = pid; } } } From 81a17b967e99e7e715e17e64b7f5755cea22afa0 Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 16:20:52 +0200 Subject: [PATCH 26/55] try lint code base with error --- Assets/AltTester/AltDriver/TestGit.cs | 1 + 1 file changed, 1 insertion(+) create mode 100644 Assets/AltTester/AltDriver/TestGit.cs diff --git a/Assets/AltTester/AltDriver/TestGit.cs b/Assets/AltTester/AltDriver/TestGit.cs new file mode 100644 index 000000000..b98caec89 --- /dev/null +++ b/Assets/AltTester/AltDriver/TestGit.cs @@ -0,0 +1 @@ +class TestGit { \ No newline at end of file From 328e62feb42cca1e1d0bb64868beec61ba31c393 Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 25 Jan 2023 16:40:36 +0200 Subject: [PATCH 27/55] ignore master --- .github/workflows/push.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a7cb55cfb..01919f65d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,8 +1,9 @@ name: Push on: push: + branches-ignore: + - 'master' workflow_dispatch: - concurrency: group: build-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true From 1aeb3132d8920506b00a8c1eeadd4ee83411186e Mon Sep 17 00:00:00 2001 From: Sandy Date: Thu, 26 Jan 2023 17:01:33 +0200 Subject: [PATCH 28/55] try lint code base without error --- .github/workflows/push.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 01919f65d..35ccee173 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -43,7 +43,6 @@ jobs: - name: Lint Code Base uses: github/super-linter@v4 env: - VALIDATE_ALL_CODEBASE: false GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_JAVA: true VALIDATE_PYTHON_FLAKE8: true From 3c53d09fa58b07abf0b4c2b46639b8614fd8ccea Mon Sep 17 00:00:00 2001 From: Sandy Date: Thu, 26 Jan 2023 17:18:57 +0200 Subject: [PATCH 29/55] try lint code base without error and EOF=LF --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c89d4508f18c378adad3923eea90f505d44debc5 Mon Sep 17 00:00:00 2001 From: Sandy Date: Thu, 26 Jan 2023 17:35:59 +0200 Subject: [PATCH 30/55] resolve cs errors --- Assets/AltTester/AltDriver/AltDevice.cs | 3 +-- Assets/AltTester/AltDriver/AltDriver.cs | 2 +- Assets/AltTester/AltDriver/AltErrors.cs | 2 +- Assets/AltTester/AltDriver/AltPortForwarding.cs | 3 +-- .../AltDriver/Commands/AltCommands/AddNotificationListener.cs | 2 +- .../AltDriver/Commands/AltCommands/AltSetServerLogging.cs | 2 +- .../Commands/AltCommands/RemoveNotificationListener.cs | 2 +- .../AltDriver/Commands/DriverCommunicationWebSocket.cs | 2 +- .../Commands/FindObjects/AltFindObjectsWhichContain.cs | 2 +- Assets/AltTester/AltDriver/Commands/IDriverCommunication.cs | 2 +- .../AltDriver/Commands/ObjectCommands/AltObjectAction.cs | 3 --- .../AltDriver/Commands/Screenshot/AltGetScreenshot.cs | 1 - Assets/AltTester/AltDriver/Common/AltAxis.cs | 2 +- Assets/AltTester/AltDriver/Common/AltObject.cs | 2 +- Assets/AltTester/AltDriver/Logging/AltLogLevel.cs | 2 -- Assets/AltTester/AltDriver/Logging/UnityTarget.cs | 1 - Assets/AltTester/AltDriver/UnityStruct/AltKeyCode.cs | 2 +- Assets/AltTester/AltDriver/UnityStruct/AltVector.cs | 2 +- 18 files changed, 14 insertions(+), 23 deletions(-) diff --git a/Assets/AltTester/AltDriver/AltDevice.cs b/Assets/AltTester/AltDriver/AltDevice.cs index c7152e9bb..9602cfc50 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 29899fff8..6c255bdbb 100644 --- a/Assets/AltTester/AltDriver/AltDriver.cs +++ b/Assets/AltTester/AltDriver/AltDriver.cs @@ -571,4 +571,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 546d59409..a25a88d56 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 5080d8765..8075a2513 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 0c96f2c4e..775464c40 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 8eb63b79b..21a99e86a 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 e22cd77ac..0c40f79d8 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 c7fdb783c..6257f9365 100644 --- a/Assets/AltTester/AltDriver/Commands/DriverCommunicationWebSocket.cs +++ b/Assets/AltTester/AltDriver/Commands/DriverCommunicationWebSocket.cs @@ -344,4 +344,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 72976a792..169e40aa9 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 d82959265..7415b4f0f 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 2712c9fdf..5e6d900c0 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 90cdccc03..9a81f95c4 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 bb71ca585..d37ed5def 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 b7af88192..a8f46a38e 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 8fc1f4f6f..d6afe77f0 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 279bcae0c..fc2ac3673 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 bf2f57857..9cf7bf405 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 14b21963d..81d5ec138 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 From dc818dc48424d228b6cd3dc6b86741cdac280a8d Mon Sep 17 00:00:00 2001 From: Sandy Date: Fri, 27 Jan 2023 11:14:05 +0200 Subject: [PATCH 31/55] try lint code base without error and EOF=LF --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 35ccee173..257211f98 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -43,11 +43,11 @@ jobs: - name: Lint Code Base uses: github/super-linter@v4 env: + DEFAULT_BRANCH: ${{ github.base_ref }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_JAVA: true VALIDATE_PYTHON_FLAKE8: true VALIDATE_CSHARP: true - # build-macOS: # runs-on: [self-hosted, macOS] # steps: From 657c94906991b1a9685bc7e7dcacc1388406e42a Mon Sep 17 00:00:00 2001 From: Sandy Date: Fri, 27 Jan 2023 11:20:40 +0200 Subject: [PATCH 32/55] change validate all code to false --- .github/workflows/push.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 257211f98..04ffc030b 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -43,7 +43,8 @@ jobs: - name: Lint Code Base uses: github/super-linter@v4 env: - DEFAULT_BRANCH: ${{ github.base_ref }} + VALIDATE_ALL_CODEBASE: false + DEFAULT_BRANCH: ${{ github.ref }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_JAVA: true VALIDATE_PYTHON_FLAKE8: true From 1df6b1ec45b791d5c6f2fc461decaf8f59f43873 Mon Sep 17 00:00:00 2001 From: Sandy Date: Fri, 27 Jan 2023 11:23:55 +0200 Subject: [PATCH 33/55] try with c# error --- Assets/AltTester/AltDriver/TestGit.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/AltTester/AltDriver/TestGit.cs b/Assets/AltTester/AltDriver/TestGit.cs index b98caec89..c6c6f98e0 100644 --- a/Assets/AltTester/AltDriver/TestGit.cs +++ b/Assets/AltTester/AltDriver/TestGit.cs @@ -1 +1 @@ -class TestGit { \ No newline at end of file +class TestGit { \ No newline at end of file From ef918c61b971cf5697b2cf4a9e616a77b731e40c Mon Sep 17 00:00:00 2001 From: Sandy Date: Fri, 27 Jan 2023 11:27:51 +0200 Subject: [PATCH 34/55] try with c# error --- .github/workflows/push.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 04ffc030b..faba52a4c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -43,7 +43,6 @@ jobs: - name: Lint Code Base uses: github/super-linter@v4 env: - VALIDATE_ALL_CODEBASE: false DEFAULT_BRANCH: ${{ github.ref }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_JAVA: true From eda4ee606e0bee1b55b8019af62f6bbfb7739fef Mon Sep 17 00:00:00 2001 From: SandyEma9 Date: Thu, 2 Feb 2023 13:50:25 +0200 Subject: [PATCH 35/55] try v3.14.0 for lint --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index faba52a4c..a3a932551 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Lint Code Base - uses: github/super-linter@v4 + uses: github/super-linter@v3.14.0 env: DEFAULT_BRANCH: ${{ github.ref }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From b923302e65429e70b615092f9c9c3a2f29f9c50b Mon Sep 17 00:00:00 2001 From: SandyEma9 Date: Thu, 2 Feb 2023 13:53:03 +0200 Subject: [PATCH 36/55] back to v4 version --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a3a932551..faba52a4c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Lint Code Base - uses: github/super-linter@v3.14.0 + uses: github/super-linter@v4 env: DEFAULT_BRANCH: ${{ github.ref }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6ae158aa5cea59533c83babea99eabd09ff80b19 Mon Sep 17 00:00:00 2001 From: SandyEma9 Date: Thu, 2 Feb 2023 14:26:45 +0200 Subject: [PATCH 37/55] try to reduce java errors --- .../main/java/com/alttester/AltDriver.java | 78 +++++++++++++++++-- .../main/java/com/alttester/AltMessage.java | 4 +- .../main/java/com/alttester/AltObject.java | 24 ++++-- .../alttester/Commands/AltBaseCommand.java | 4 +- .../AltCommandReturningAltObjects.java | 2 +- .../FindObject/AltBaseFindObject.java | 2 +- .../Commands/FindObject/AltFindObject.java | 2 +- .../AltFindObjectWhichContains.java | 2 +- .../Commands/FindObject/AltFindObjects.java | 2 +- .../FindObject/AltFindObjectsParams.java | 2 +- .../AltFindObjectsWhichContain.java | 2 +- .../FindObject/AltGetAllElements.java | 4 +- .../FindObject/AltGetAllElementsParams.java | 2 +- .../Commands/FindObject/AltWaitForObject.java | 4 +- .../AltWaitForObjectToNotBePresent.java | 4 +- .../AltWaitForObjectWhichContains.java | 4 +- .../Commands/GetPNGScreenshotCommand.java | 6 +- .../java/com/alttester/MessageHandler.java | 7 +- .../com/alttester/WebsocketConnection.java | 14 ++-- .../test/java/com/alttester/TestsForNIS.java | 31 ++++---- .../test/java/com/alttester/TestsHelper.java | 4 - .../java/com/alttester/TestsSampleScene1.java | 56 ++++++------- .../java/com/alttester/TestsSampleScene2.java | 15 ++-- .../java/com/alttester/TestsSampleScene3.java | 18 ++--- .../java/com/alttester/TestsSampleScene5.java | 14 ++-- 25 files changed, 185 insertions(+), 122 deletions(-) diff --git a/Bindings~/java/src/main/java/com/alttester/AltDriver.java b/Bindings~/java/src/main/java/com/alttester/AltDriver.java index 4d2552f28..177990b24 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.UnityStruct.AltKeyCode; -import com.alttester.altTesterExceptions.*; -import java.io.IOException; +import com.alttester.altTesterExceptions.InvalidParameterException; public class AltDriver { static { 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/AltObject.java b/Bindings~/java/src/main/java/com/alttester/AltObject.java index d38aa4c5f..d0bcfb2d4 100644 --- a/Bindings~/java/src/main/java/com/alttester/AltObject.java +++ b/Bindings~/java/src/main/java/com/alttester/AltObject.java @@ -1,12 +1,26 @@ 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 { 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..8cf1274df 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.altTesterExceptions.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/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..b64a114ac 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,8 +1,8 @@ package com.alttester.Commands.FindObject; -import com.alttester.Utils; -import com.alttester.IMessageHandler; import com.alttester.AltObject; +import com.alttester.IMessageHandler; +import com.alttester.Utils; import com.alttester.altTesterExceptions.WaitTimeOutException; /** 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..2f15c147b 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,8 +1,8 @@ package com.alttester.Commands.FindObject; -import com.alttester.Utils; -import com.alttester.IMessageHandler; import com.alttester.AltObject; +import com.alttester.IMessageHandler; +import com.alttester.Utils; import com.alttester.altTesterExceptions.AltException; /** 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..8d938e4bd 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,8 +1,8 @@ package com.alttester.Commands.FindObject; -import com.alttester.Utils; -import com.alttester.IMessageHandler; import com.alttester.AltObject; +import com.alttester.IMessageHandler; +import com.alttester.Utils; import com.alttester.altTesterExceptions.WaitTimeOutException; /** 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/MessageHandler.java b/Bindings~/java/src/main/java/com/alttester/MessageHandler.java index ac658d913..ae672fcf2 100644 --- a/Bindings~/java/src/main/java/com/alttester/MessageHandler.java +++ b/Bindings~/java/src/main/java/com/alttester/MessageHandler.java @@ -4,11 +4,8 @@ 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; @@ -23,6 +20,7 @@ import com.alttester.altTesterExceptions.AltRecvallException; 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.FailedToParseArgumentsException; @@ -39,7 +37,8 @@ import com.alttester.altTesterExceptions.ResponseFormatException; import com.alttester.altTesterExceptions.SceneNotFoundException; import com.alttester.altTesterExceptions.UnknownErrorException; -import com.alttester.altTesterExceptions.CommandResponseTimeoutException; +import com.google.gson.Gson; +import com.google.gson.JsonParseException; public class MessageHandler implements IMessageHandler { private Session session; diff --git a/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java b/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java index 9c25b0431..bd3c78f63 100644 --- a/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java +++ b/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java @@ -1,24 +1,24 @@ package com.alttester; import java.io.IOException; +import java.net.URI; import javax.websocket.ClientEndpoint; import javax.websocket.CloseReason; import javax.websocket.ContainerProvider; import javax.websocket.DeploymentException; +import javax.websocket.OnClose; +import javax.websocket.OnError; +import javax.websocket.OnMessage; +import javax.websocket.OnOpen; import javax.websocket.Session; import javax.websocket.WebSocketContainer; -import java.net.URI; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; - -import com.alttester.altTesterExceptions.*; +import com.alttester.altTesterExceptions.ConnectionException; +import com.alttester.altTesterExceptions.ConnectionTimeoutException; @ClientEndpoint public class WebsocketConnection { diff --git a/Bindings~/java/src/test/java/com/alttester/TestsForNIS.java b/Bindings~/java/src/test/java/com/alttester/TestsForNIS.java index f244b4650..8a4128859 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsForNIS.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsForNIS.java @@ -1,37 +1,36 @@ package com.alttester; -import org.junit.AfterClass; +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertFalse; +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assert.assertNotEquals; + +import java.util.ArrayList; +import java.util.List; + import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; + 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.ObjectCommand.AltTapClickElementParams; -import com.alttester.Commands.InputActions.AltTapClickCoordinatesParams; -import com.alttester.Commands.FindObject.AltWaitForObjectsParams; import com.alttester.Commands.UnityCommand.AltLoadSceneParams; import com.alttester.UnityStruct.AltKeyCode; import com.alttester.position.Vector2; import com.alttester.position.Vector3; -import java.util.ArrayList; -import java.util.List; -import static org.junit.Assert.assertNotEquals; -import static junit.framework.TestCase.*; - 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"; @@ -44,8 +43,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 872ab64e0..0ff7cdaf9 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("ALTDRIVER_PORT"); diff --git a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java index 334e5abd3..0e97dbac8 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java @@ -1,10 +1,17 @@ package com.alttester; -import com.google.gson.Gson; +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertFalse; +import static junit.framework.TestCase.assertNotNull; +import static junit.framework.TestCase.assertNotSame; +import static junit.framework.TestCase.assertNull; +import static junit.framework.TestCase.assertTrue; +import static junit.framework.TestCase.fail; +import static org.junit.Assert.assertNotEquals; + +import java.io.File; -import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.alttester.AltDriver.By; @@ -25,23 +32,29 @@ import com.alttester.Commands.ObjectCommand.AltCallComponentMethodParams; import com.alttester.Commands.ObjectCommand.AltGetComponentPropertyParams; import com.alttester.Commands.ObjectCommand.AltSetComponentPropertyParams; -import com.alttester.Commands.ObjectCommand.AltTapClickElementParams; import com.alttester.Commands.ObjectCommand.AltSetTextParams; +import com.alttester.Commands.ObjectCommand.AltTapClickElementParams; import com.alttester.Commands.UnityCommand.AltLoadSceneParams; import com.alttester.Commands.UnityCommand.AltSetTimeScaleParams; import com.alttester.Commands.UnityCommand.AltUnloadSceneParams; import com.alttester.Commands.UnityCommand.AltWaitForCurrentSceneToBeParams; import com.alttester.UnityStruct.AltKeyCode; -import com.alttester.altTesterExceptions.*; +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 static junit.framework.TestCase.*; -import static org.junit.Assert.assertNotEquals; - -import java.lang.Void; - -import java.io.File; +import com.google.gson.Gson; public class TestsSampleScene1 extends BaseTest { @@ -699,25 +712,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 e70e39f5b..9767e340b 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene2.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene2.java @@ -1,6 +1,14 @@ package com.alttester; -import org.junit.*; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; + +import java.util.Arrays; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; import com.alttester.AltDriver.By; import com.alttester.Commands.FindObject.AltFindObjectsParams; @@ -15,11 +23,6 @@ import com.alttester.Commands.UnityCommand.AltLoadSceneParams; import com.alttester.position.Vector2; -import java.util.Arrays; -import java.util.List; - -import static org.junit.Assert.*; - public class TestsSampleScene2 extends BaseTest { @Before diff --git a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene3.java b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene3.java index 78b1e392a..74cf1d94c 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene3.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene3.java @@ -1,8 +1,12 @@ package com.alttester; -import org.junit.AfterClass; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + +import java.util.ArrayList; +import java.util.List; + import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.alttester.AltDriver.By; @@ -14,12 +18,6 @@ import com.alttester.Commands.UnityCommand.AltLoadSceneParams; import com.alttester.position.Vector2; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import static org.junit.Assert.*; - public class TestsSampleScene3 extends BaseTest { @Before @@ -32,8 +30,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 d08928574..9d22000a9 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene5.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene5.java @@ -1,11 +1,13 @@ package com.alttester; -import org.junit.AfterClass; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + +import java.util.ArrayList; + import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; -import com.alttester.position.Vector3; import com.alttester.AltDriver.By; import com.alttester.Commands.FindObject.AltFindObjectsParams; import com.alttester.Commands.InputActions.AltKeyDownParams; @@ -15,11 +17,7 @@ import com.alttester.Commands.InputActions.AltScrollParams; import com.alttester.Commands.UnityCommand.AltLoadSceneParams; import com.alttester.UnityStruct.AltKeyCode; - -import java.util.ArrayList; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import com.alttester.position.Vector3; public class TestsSampleScene5 extends BaseTest { From 5d0c72d2a1905bdc8ddd77fe1bb4d76c19f1decc Mon Sep 17 00:00:00 2001 From: SandyEma9 Date: Thu, 2 Feb 2023 14:50:29 +0200 Subject: [PATCH 38/55] try VALIDATE_ALL_CODEBASE: false --- .github/workflows/push.yml | 3 ++- Assets/AltTester/AltDriver/TestGit.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index faba52a4c..b2271e3b6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -44,7 +44,8 @@ jobs: uses: github/super-linter@v4 env: DEFAULT_BRANCH: ${{ github.ref }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VALIDATE_ALL_CODEBASE : false VALIDATE_JAVA: true VALIDATE_PYTHON_FLAKE8: true VALIDATE_CSHARP: true diff --git a/Assets/AltTester/AltDriver/TestGit.cs b/Assets/AltTester/AltDriver/TestGit.cs index c6c6f98e0..73fd7bf64 100644 --- a/Assets/AltTester/AltDriver/TestGit.cs +++ b/Assets/AltTester/AltDriver/TestGit.cs @@ -1 +1 @@ -class TestGit { \ No newline at end of file +class TestGit {; } \ No newline at end of file From 5cfe6c77bdf6c594ba1c2c216ce6ae2673d0c929 Mon Sep 17 00:00:00 2001 From: SandyEma9 Date: Thu, 2 Feb 2023 14:54:08 +0200 Subject: [PATCH 39/55] try VALIDATE_ALL_CODEBASE: false with java error --- Assets/AltTester/Editor/AltTestRunListener.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/AltTester/Editor/AltTestRunListener.cs b/Assets/AltTester/Editor/AltTestRunListener.cs index d91b298ce..ef614f6ab 100644 --- a/Assets/AltTester/Editor/AltTestRunListener.cs +++ b/Assets/AltTester/Editor/AltTestRunListener.cs @@ -10,7 +10,7 @@ public class AltTestRunListener : NUnit.Framework.Interfaces.ITestListener public AltTestRunListener(TestRunDelegate callRunDelegate) { - this.callRunDelegate = callRunDelegate; + this.callRunDelegate = callRunDelegate } public void TestStarted(NUnit.Framework.Interfaces.ITest test) From 34b30e4c861321bc0af968e6efd4b14caa2d9ba4 Mon Sep 17 00:00:00 2001 From: SandyEma9 Date: Fri, 3 Feb 2023 12:35:03 +0200 Subject: [PATCH 40/55] try with java error --- .github/workflows/push.yml | 1 - Assets/AltTester/AltDriver/TestGit.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b2271e3b6..db5b3ac03 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -45,7 +45,6 @@ jobs: env: DEFAULT_BRANCH: ${{ github.ref }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - VALIDATE_ALL_CODEBASE : false VALIDATE_JAVA: true VALIDATE_PYTHON_FLAKE8: true VALIDATE_CSHARP: true diff --git a/Assets/AltTester/AltDriver/TestGit.cs b/Assets/AltTester/AltDriver/TestGit.cs index 73fd7bf64..063da6da7 100644 --- a/Assets/AltTester/AltDriver/TestGit.cs +++ b/Assets/AltTester/AltDriver/TestGit.cs @@ -1 +1 @@ -class TestGit {; } \ No newline at end of file +class TestGit {.} \ No newline at end of file From 47332ae05efe79ded11fb1fab84ff76c1c0ea383 Mon Sep 17 00:00:00 2001 From: SandyEma9 Date: Fri, 3 Feb 2023 13:18:57 +0200 Subject: [PATCH 41/55] try dotnet format --- .github/workflows/push.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index db5b3ac03..ad3373473 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -40,14 +40,22 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Lint Code Base - uses: github/super-linter@v4 - env: - DEFAULT_BRANCH: ${{ github.ref }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - VALIDATE_JAVA: true - VALIDATE_PYTHON_FLAKE8: true - VALIDATE_CSHARP: true + - name: Add dotnet-format problem matcher + uses: xt0rted/dotnet-format-problem-matcher@v1 + + - name: Restore dotnet tools + uses: xt0rted/dotnet-tool-restore@v1 + + - name: Run dotnet format + uses: xt0rted/dotnet-format@v1 + # - name: Lint Code Base + # uses: github/super-linter@v4 + # env: + # DEFAULT_BRANCH: ${{ github.ref }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # VALIDATE_JAVA: true + # VALIDATE_PYTHON_FLAKE8: true + # VALIDATE_CSHARP: true # build-macOS: # runs-on: [self-hosted, macOS] # steps: From cf38e349613e2d6a1a49c1a17a04201d40b1cd3e Mon Sep 17 00:00:00 2001 From: SandyEma9 Date: Fri, 3 Feb 2023 13:22:16 +0200 Subject: [PATCH 42/55] try dotnet format with error --- .github/workflows/push.yml | 2 ++ Assets/AltTester/AltDriver/TestGit.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ad3373473..f3b12a638 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -48,6 +48,8 @@ jobs: - name: Run dotnet format uses: xt0rted/dotnet-format@v1 + with: + only-changed-files: "true" # - name: Lint Code Base # uses: github/super-linter@v4 # env: diff --git a/Assets/AltTester/AltDriver/TestGit.cs b/Assets/AltTester/AltDriver/TestGit.cs index 063da6da7..3edf7c5b5 100644 --- a/Assets/AltTester/AltDriver/TestGit.cs +++ b/Assets/AltTester/AltDriver/TestGit.cs @@ -1 +1 @@ -class TestGit {.} \ No newline at end of file +class TestGit {,} \ No newline at end of file From 569f23d887f3e248be0dc1eeecba05979db122e6 Mon Sep 17 00:00:00 2001 From: SandyEma9 Date: Fri, 3 Feb 2023 13:23:31 +0200 Subject: [PATCH 43/55] try dotnet format with error --- .github/workflows/push.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f3b12a638..fced6ebea 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -40,12 +40,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Add dotnet-format problem matcher - uses: xt0rted/dotnet-format-problem-matcher@v1 - - - name: Restore dotnet tools - uses: xt0rted/dotnet-tool-restore@v1 - - name: Run dotnet format uses: xt0rted/dotnet-format@v1 with: From fd4a6d711f59049f6002b85a7ef66b4282082042 Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Thu, 2 Mar 2023 17:47:21 +0200 Subject: [PATCH 44/55] Add lint job --- .github/workflows/push.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 617b6de4e..b23a2ae41 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,6 +7,15 @@ 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 + build-docs: runs-on: ubuntu-latest From ce64744e7a257ca830faaa2f47ceffa280e43990 Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Fri, 3 Mar 2023 18:40:15 +0200 Subject: [PATCH 45/55] Fix issues --- Assets/AltTester/AltDriver/TestGit.cs | 1 - Assets/AltTester/Editor/AltTestRunListener.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 Assets/AltTester/AltDriver/TestGit.cs diff --git a/Assets/AltTester/AltDriver/TestGit.cs b/Assets/AltTester/AltDriver/TestGit.cs deleted file mode 100644 index 3edf7c5b5..000000000 --- a/Assets/AltTester/AltDriver/TestGit.cs +++ /dev/null @@ -1 +0,0 @@ -class TestGit {,} \ No newline at end of file diff --git a/Assets/AltTester/Editor/AltTestRunListener.cs b/Assets/AltTester/Editor/AltTestRunListener.cs index 4de2ef6fe..c04165d76 100644 --- a/Assets/AltTester/Editor/AltTestRunListener.cs +++ b/Assets/AltTester/Editor/AltTestRunListener.cs @@ -10,7 +10,7 @@ public class AltTestRunListener : NUnit.Framework.Interfaces.ITestListener public AltTestRunListener(TestRunDelegate callRunDelegate) { - this.callRunDelegate = callRunDelegate + this.callRunDelegate = callRunDelegate; } public void TestStarted(NUnit.Framework.Interfaces.ITest test) From 658e6f9428c3ff37d543acfa7d07450e2957600c Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Fri, 3 Mar 2023 18:42:26 +0200 Subject: [PATCH 46/55] Update push.yml --- .github/workflows/push.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b23a2ae41..c2622508a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -15,6 +15,11 @@ jobs: - 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 build-docs: runs-on: ubuntu-latest From 9df08597f6b39b861799ff44f18ffef2f02d73f1 Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Fri, 3 Mar 2023 18:51:46 +0200 Subject: [PATCH 47/55] Update push.yml --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c2622508a..7419bd9e5 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -19,7 +19,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_JAVA: true VALIDATE_PYTHON_FLAKE8: true - VALIDATE_CSHARP: false + # VALIDATE_CSHARP: false build-docs: runs-on: ubuntu-latest From ce780b10148a4e6b9c64fbf17935583c69addaf0 Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Fri, 3 Mar 2023 19:11:08 +0200 Subject: [PATCH 48/55] Add confings for Java and Python linters --- .github/linters/.flake8 | 6 ++ .github/linters/sun_checks.xml | 190 +++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 .github/linters/.flake8 create mode 100644 .github/linters/sun_checks.xml 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..cb78d6ecd --- /dev/null +++ b/.github/linters/sun_checks.xml @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2f94cb802c78d05a6166fcb1cecdeaefce22c597 Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Sat, 4 Mar 2023 20:55:22 +0200 Subject: [PATCH 49/55] Update push.yml --- .github/workflows/push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 7419bd9e5..7136d95eb 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -20,6 +20,7 @@ jobs: VALIDATE_JAVA: true VALIDATE_PYTHON_FLAKE8: true # VALIDATE_CSHARP: false + FILTER_REGEX_EXCLUDE: .*Docs/**/*.[py|cs|java] build-docs: runs-on: ubuntu-latest From 696c7b388600b25a4037edf4088ba38891e3558e Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Sun, 5 Mar 2023 16:52:47 +0200 Subject: [PATCH 50/55] Ignore JavaDocs checks --- .github/linters/sun_checks.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/linters/sun_checks.xml b/.github/linters/sun_checks.xml index cb78d6ecd..be7b95119 100644 --- a/.github/linters/sun_checks.xml +++ b/.github/linters/sun_checks.xml @@ -185,6 +185,19 @@ + + + + + + + + + + + + + + - From 844617e2e2e25aff3d39e4d806a8a56623961876 Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Sun, 5 Mar 2023 16:58:43 +0200 Subject: [PATCH 51/55] Ignore JavaDocs checks --- .github/linters/sun_checks.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/linters/sun_checks.xml b/.github/linters/sun_checks.xml index be7b95119..834f4341b 100644 --- a/.github/linters/sun_checks.xml +++ b/.github/linters/sun_checks.xml @@ -188,16 +188,16 @@ - + - + - + - + From b55f5a93215098bb9b0921e4b0a366785222a750 Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Sun, 5 Mar 2023 17:07:46 +0200 Subject: [PATCH 52/55] Ignore JavaDocs checks --- .github/linters/sun_checks.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/linters/sun_checks.xml b/.github/linters/sun_checks.xml index 834f4341b..01d6f1b9e 100644 --- a/.github/linters/sun_checks.xml +++ b/.github/linters/sun_checks.xml @@ -188,16 +188,16 @@ - + - + - + - + From 8c28fd8d50055271faf56e4bf4e393cf3c979bce Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Sun, 5 Mar 2023 17:15:35 +0200 Subject: [PATCH 53/55] Ignore JavaDocs checks --- .github/linters/sun_checks.xml | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/linters/sun_checks.xml b/.github/linters/sun_checks.xml index 01d6f1b9e..708629afc 100644 --- a/.github/linters/sun_checks.xml +++ b/.github/linters/sun_checks.xml @@ -45,7 +45,8 @@ - + + @@ -90,9 +91,10 @@ - - - + + + + @@ -184,20 +186,5 @@ - - - - - - - - - - - - - - - From 6ab8572c06273551def589202e3bdc5ef5c23a56 Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Sun, 5 Mar 2023 17:27:46 +0200 Subject: [PATCH 54/55] Ignore JavaDocs checks --- .github/linters/sun_checks.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/linters/sun_checks.xml b/.github/linters/sun_checks.xml index 708629afc..1e9ab6465 100644 --- a/.github/linters/sun_checks.xml +++ b/.github/linters/sun_checks.xml @@ -91,12 +91,12 @@ - + + - From 27dff753656c072601a586bc4eb80b53a932af91 Mon Sep 17 00:00:00 2001 From: Robert Dezmerean Date: Sun, 5 Mar 2023 21:13:33 +0200 Subject: [PATCH 55/55] Fix Java lint issues --- .github/linters/sun_checks.xml | 2 +- Bindings~/java/pom.xml | 4 +- .../main/java/com/alttester/AltDriver.java | 150 ++++++++--------- .../com/alttester/AltDriverConfigFactory.java | 16 +- .../com/alttester/AltMessageResponse.java | 1 - .../main/java/com/alttester/AltObject.java | 65 ++++---- .../java/com/alttester/AltObjectAction.java | 13 +- .../java/com/alttester/AltPortForwarding.java | 157 ------------------ .../alttester/Commands/AltBaseCommand.java | 2 +- .../AltFindObjectAtCoordinatesParams.java | 2 +- .../Commands/FindObject/AltWaitForObject.java | 2 +- .../AltWaitForObjectToNotBePresent.java | 2 +- .../AltWaitForObjectWhichContains.java | 2 +- .../InputActions/AltBeginTouchParams.java | 2 +- .../Commands/InputActions/AltHoldParams.java | 2 +- .../InputActions/AltMoveMouseParams.java | 2 +- .../InputActions/AltMoveTouchParams.java | 2 +- .../AltMultiPointSwipeParams.java | 2 +- .../Commands/InputActions/AltSwipeParams.java | 2 +- .../AltTapClickCoordinatesParams.java | 2 +- .../Commands/InputActions/AltTiltParams.java | 2 +- .../AltWaitForCurrentSceneToBe.java | 2 +- .../AltErrors.java | 2 +- .../AltException.java | 2 +- .../AltInputModuleException.java | 2 +- .../AltInvalidServerResponse.java | 2 +- .../AltRecvallException.java | 2 +- .../AltRecvallMessageFormatException.java | 2 +- .../AltRecvallMessageIdException.java | 2 +- .../AssemblyNotFoundException.java | 2 +- .../CameraNotFoundException.java | 2 +- .../CommandResponseTimeoutException.java | 2 +- .../ComponentNotFoundException.java | 2 +- .../ConnectionException.java | 2 +- .../ConnectionTimeoutException.java | 2 +- .../CouldNotParseJsonStringException.java | 2 +- .../CouldNotPerformOperationException.java | 2 +- .../FailedToParseArgumentsException.java | 2 +- .../FormatException.java | 2 +- .../InvalidCommandException.java | 2 +- .../InvalidParameterException.java | 2 +- .../InvalidParameterTypeException.java | 2 +- .../InvalidPathException.java | 2 +- .../MethodNotFoundException.java | 2 +- ...dWithGivenParametersNotFoundException.java | 2 +- .../NotFoundException.java | 2 +- .../NullReferenceException.java | 2 +- .../ObjectWasNotFoundException.java | 2 +- .../PortForwardingException.java | 2 +- .../PropertyCannotBeSetException.java | 2 +- .../PropertyNotFoundException.java | 2 +- .../ResponseFormatException.java | 2 +- .../SceneNotFoundException.java | 2 +- .../UnknownErrorException.java | 2 +- .../WaitTimeOutException.java | 2 +- .../java/com/alttester/IMessageHandler.java | 19 +-- .../java/com/alttester/MessageHandler.java | 87 +++++----- .../com/alttester/WebsocketConnection.java | 20 +-- .../java/com/alttester/position/Vector2.java | 2 +- .../java/com/alttester/position/Vector3.java | 2 +- .../test/java/com/alttester/TestsForNIS.java | 19 +-- .../com/alttester/TestsNotifications.java | 2 +- .../java/com/alttester/TestsSampleScene1.java | 54 +++--- .../java/com/alttester/TestsSampleScene2.java | 18 +- .../java/com/alttester/TestsSampleScene3.java | 12 +- .../java/com/alttester/TestsSampleScene5.java | 22 +-- 66 files changed, 275 insertions(+), 484 deletions(-) delete mode 100644 Bindings~/java/src/main/java/com/alttester/AltPortForwarding.java rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/AltErrors.java (97%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/AltException.java (89%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/AltInputModuleException.java (81%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/AltInvalidServerResponse.java (84%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/AltRecvallException.java (89%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/AltRecvallMessageFormatException.java (84%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/AltRecvallMessageIdException.java (83%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/AssemblyNotFoundException.java (82%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/CameraNotFoundException.java (81%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/CommandResponseTimeoutException.java (83%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/ComponentNotFoundException.java (82%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/ConnectionException.java (87%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/ConnectionTimeoutException.java (87%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/CouldNotParseJsonStringException.java (83%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/CouldNotPerformOperationException.java (83%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/FailedToParseArgumentsException.java (83%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/FormatException.java (79%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/InvalidCommandException.java (77%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/InvalidParameterException.java (77%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/InvalidParameterTypeException.java (83%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/InvalidPathException.java (89%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/MethodNotFoundException.java (81%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/MethodWithGivenParametersNotFoundException.java (85%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/NotFoundException.java (80%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/NullReferenceException.java (81%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/ObjectWasNotFoundException.java (82%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/PortForwardingException.java (92%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/PropertyCannotBeSetException.java (82%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/PropertyNotFoundException.java (82%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/ResponseFormatException.java (84%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/SceneNotFoundException.java (81%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/UnknownErrorException.java (81%) rename Bindings~/java/src/main/java/com/alttester/{altTesterExceptions => Exceptions}/WaitTimeOutException.java (80%) diff --git a/.github/linters/sun_checks.xml b/.github/linters/sun_checks.xml index 1e9ab6465..9d542076b 100644 --- a/.github/linters/sun_checks.xml +++ b/.github/linters/sun_checks.xml @@ -157,7 +157,7 @@ - + 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 544b01078..1ae91d138 100644 --- a/Bindings~/java/src/main/java/com/alttester/AltDriver.java +++ b/Bindings~/java/src/main/java/com/alttester/AltDriver.java @@ -80,8 +80,8 @@ 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.InvalidParameterException; public class AltDriver { static { @@ -89,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; } @@ -114,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()) { @@ -142,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", @@ -157,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() { @@ -186,7 +187,7 @@ private void checkServerVersion() { } /** - * Closes the connection to the running instrumented app + * Closes the connection to the running instrumented app. * * @throws IOException */ @@ -195,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 */ @@ -204,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); } @@ -226,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()); } @@ -236,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()); } @@ -257,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); } @@ -274,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()); } @@ -285,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()); } @@ -296,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()); } @@ -307,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()); } @@ -318,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; @@ -330,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; @@ -342,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; @@ -375,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()); } @@ -389,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()); @@ -402,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()); } @@ -412,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()); } @@ -423,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); } @@ -433,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()); } @@ -444,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); @@ -457,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()); } @@ -468,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); } @@ -479,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()); } @@ -489,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); } @@ -500,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()); } @@ -511,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()); } @@ -522,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()); } @@ -532,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; @@ -544,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()); @@ -557,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; @@ -570,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()); @@ -585,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()); @@ -599,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()); } @@ -613,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()); @@ -628,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()); } @@ -642,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()); @@ -654,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()); } @@ -675,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; @@ -686,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()); @@ -697,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()); } @@ -708,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. @@ -759,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/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 d0bcfb2d4..df5e63fb0 100644 --- a/Bindings~/java/src/main/java/com/alttester/AltObject.java +++ b/Bindings~/java/src/main/java/com/alttester/AltObject.java @@ -17,14 +17,13 @@ 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 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; @@ -42,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; } @@ -54,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; @@ -72,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(); @@ -96,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 */ @@ -109,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 */ @@ -118,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 */ @@ -128,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()); @@ -144,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()); @@ -157,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 @@ -165,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()); @@ -176,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() { @@ -189,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); @@ -205,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()); @@ -218,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() { @@ -227,7 +228,7 @@ public AltObject pointerUp() { /** * Simulates pointer down action on the object. - * + * * @return Element that simulates pointer down action */ public AltObject pointerDown() { @@ -236,7 +237,7 @@ public AltObject pointerDown() { /** * Simulates pointer enter action on the object. - * + * * @return Element that simulates pointer enter action */ public AltObject pointerEnter() { @@ -245,7 +246,7 @@ public AltObject pointerEnter() { /** * Simulates pointer exit action on the object. - * + * * @return Element that simulates pointer exit action */ public AltObject pointerExit() { @@ -262,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(); } @@ -288,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 8cf1274df..7f1ec4865 100644 --- a/Bindings~/java/src/main/java/com/alttester/Commands/AltBaseCommand.java +++ b/Bindings~/java/src/main/java/com/alttester/Commands/AltBaseCommand.java @@ -5,7 +5,7 @@ import com.alttester.AltMessage; import com.alttester.IMessageHandler; -import com.alttester.altTesterExceptions.AltInvalidServerResponse; +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/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/AltWaitForObject.java b/Bindings~/java/src/main/java/com/alttester/Commands/FindObject/AltWaitForObject.java index b64a114ac..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 @@ -3,7 +3,7 @@ import com.alttester.AltObject; import com.alttester.IMessageHandler; import com.alttester.Utils; -import com.alttester.altTesterExceptions.WaitTimeOutException; +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 2f15c147b..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 @@ -3,7 +3,7 @@ import com.alttester.AltObject; import com.alttester.IMessageHandler; import com.alttester.Utils; -import com.alttester.altTesterExceptions.AltException; +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 8d938e4bd..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 @@ -3,7 +3,7 @@ import com.alttester.AltObject; import com.alttester.IMessageHandler; import com.alttester.Utils; -import com.alttester.altTesterExceptions.WaitTimeOutException; +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/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 ae672fcf2..e0500739d 100644 --- a/Bindings~/java/src/main/java/com/alttester/MessageHandler.java +++ b/Bindings~/java/src/main/java/com/alttester/MessageHandler.java @@ -10,40 +10,42 @@ 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.CommandResponseTimeoutException; -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.google.gson.Gson; -import com.google.gson.JsonParseException; 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(); @@ -52,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); @@ -107,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); @@ -125,7 +127,7 @@ public void onMessage(String message) { } } - private void handleNotification(AltMessageResponse message) { + private void handleNotification(final AltMessageResponse message) { switch (message.commandName) { case "loadSceneNotification": @@ -154,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; } @@ -203,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) { @@ -257,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 95ec710b6..d846de5c5 100644 --- a/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java +++ b/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java @@ -14,13 +14,11 @@ import javax.websocket.OnError; import javax.websocket.OnMessage; import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.alttester.altTesterExceptions.*; +import com.alttester.Exceptions.*; @ClientEndpoint public class WebsocketConnection { @@ -34,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) { @@ -50,7 +48,7 @@ public URI getURI() throws ConnectionException { } } - public void connect() { + public final void connect() { URI uri = getURI(); logger.info("Connecting to: '{}'.", uri.toString()); @@ -105,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) { @@ -114,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 2ecdc579a..2feefaca9 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsForNIS.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsForNIS.java @@ -1,16 +1,8 @@ package com.alttester; -import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.assertFalse; -import static junit.framework.TestCase.assertTrue; -import static org.junit.Assert.assertNotEquals; - import java.util.ArrayList; import java.util.List; -import org.junit.Assert; -import org.junit.Test; - import com.alttester.AltDriver.By; import com.alttester.Commands.FindObject.AltFindObjectsParams; import com.alttester.Commands.FindObject.AltWaitForObjectsParams; @@ -26,22 +18,17 @@ import com.alttester.Commands.InputActions.AltTiltParams; import com.alttester.Commands.ObjectCommand.AltGetComponentPropertyParams; import com.alttester.Commands.ObjectCommand.AltTapClickElementParams; -import com.alttester.Commands.FindObject.AltWaitForObjectsParams; 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"; 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 0f3624e0e..55c09c0d7 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java @@ -1,22 +1,7 @@ package com.alttester; -import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.assertFalse; -import static junit.framework.TestCase.assertNotNull; -import static junit.framework.TestCase.assertNotSame; -import static junit.framework.TestCase.assertNull; -import static junit.framework.TestCase.assertTrue; -import static junit.framework.TestCase.fail; -import static org.junit.Assert.assertNotEquals; - import java.io.File; -import org.junit.Before; -import org.junit.Test; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - import com.alttester.AltDriver.By; import com.alttester.Commands.AltCallStaticMethodParams; import com.alttester.Commands.FindObject.AltFindObjectAtCoordinatesParams; @@ -41,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; @@ -71,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 diff --git a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene2.java b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene2.java index a5673539f..8a2ed572d 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene2.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene2.java @@ -1,16 +1,13 @@ package com.alttester; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; - import java.util.Arrays; import java.util.List; -import org.junit.Before; -import org.junit.Test; 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; @@ -23,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 9f23f2e20..d97897175 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene3.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene3.java @@ -1,14 +1,8 @@ package com.alttester; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; - import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; - import com.alttester.AltDriver.By; import com.alttester.Commands.FindObject.AltFindObjectsParams; import com.alttester.Commands.FindObject.AltWaitForObjectsParams; @@ -16,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; diff --git a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene5.java b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene5.java index f272bfd91..de28f0344 100644 --- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene5.java +++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene5.java @@ -1,14 +1,12 @@ package com.alttester; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; - import java.util.ArrayList; -import org.junit.Before; -import org.junit.Test; +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.position.Vector3; import com.alttester.AltDriver.By; import com.alttester.Commands.FindObject.AltFindObjectsParams; import com.alttester.Commands.InputActions.AltKeyDownParams; @@ -17,16 +15,8 @@ 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 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; public class TestsSampleScene5 extends BaseTest { @@ -95,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