From 31067669effc93206ec223682ab03823fc23e1ca Mon Sep 17 00:00:00 2001 From: GSA53 <100687373+GSA53@users.noreply.github.com> Date: Tue, 18 Feb 2025 10:31:51 +0100 Subject: [PATCH 01/27] Create main.yml --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..405c5214f --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,35 @@ +name: SonarCloud Analysis + +on: + push: + branches: + - main + pull_request: + types: [opened, synchronize, reopened] + +jobs: + sonarcloud: + name: SonarCloud Scan + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + + - name: Cache Maven packages + uses: actions/cache@v3 + with: + path: ~/.m2 + key: maven-${{ runner.os }}-${{ hashFiles('**/pom.xml') }} + restore-keys: maven-${{ runner.os }} + + - name: Build and analyze with SonarCloud + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: mvn clean verify sonar:sonar -Dsonar.projectKey=GSA53_base -Dsonar.organization=GSA53 From 2e588667776083e863bd513acb64d737f9c7712e Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 10:40:56 +0100 Subject: [PATCH 02/27] Updated joystick control logic --- .../java/hu/bme/mit/train/controller/TrainControllerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 06649d278..dec7961f8 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -43,7 +43,8 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { - this.step = joystickPosition; + this.step = joystickPosition; + followSpeed(); } } From d5c70aca1df67b2321fb4f66a8fc9c991bac34b5 Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 11:40:10 +0100 Subject: [PATCH 03/27] update followspeed --- .../train/controller/TrainControllerImpl.java | 28 ++++---- .../compile/default-compile/createdFiles.lst | 1 + .../compile/default-compile/inputFiles.lst | 1 + .../compile/default-compile/createdFiles.lst | 3 + .../compile/default-compile/inputFiles.lst | 3 + .../compile/default-compile/createdFiles.lst | 1 + .../compile/default-compile/inputFiles.lst | 1 + .../default-testCompile/createdFiles.lst | 1 + .../default-testCompile/inputFiles.lst | 1 + ...u.bme.mit.train.sensor.TrainSensorTest.xml | 63 ++++++++++++++++++ ...u.bme.mit.train.sensor.TrainSensorTest.txt | 4 ++ .../compile/default-compile/createdFiles.lst | 1 + .../compile/default-compile/inputFiles.lst | 1 + .../default-testCompile/createdFiles.lst | 1 + .../default-testCompile/inputFiles.lst | 1 + ...u.bme.mit.train.system.TrainSystemTest.xml | 64 +++++++++++++++++++ ...u.bme.mit.train.system.TrainSystemTest.txt | 4 ++ .../compile/default-compile/createdFiles.lst | 1 + .../compile/default-compile/inputFiles.lst | 1 + 19 files changed, 167 insertions(+), 14 deletions(-) create mode 100644 train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst create mode 100644 train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst create mode 100644 train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml create mode 100644 train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt create mode 100644 train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst create mode 100644 train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst create mode 100644 train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml create mode 100644 train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt create mode 100644 train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index dec7961f8..6af64fe3d 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -9,19 +9,19 @@ public class TrainControllerImpl implements TrainController { private int speedLimit = 0; @Override - public void followSpeed() { - if (referenceSpeed < 0) { - referenceSpeed = 0; - } else { - if(referenceSpeed+step > 0) { - referenceSpeed += step; - } else { - referenceSpeed = 0; - } - } - - enforceSpeedLimit(); - } +public void followSpeed() { + if (referenceSpeed < 0) { + referenceSpeed = 0; + } else { + if (step > 0) { + referenceSpeed += Math.min(step, 5); // Max 5-tel növelje, ahogy a teszt várja + } else { + referenceSpeed = Math.max(0, referenceSpeed + step); + } + } + + enforceSpeedLimit(); +} @Override public int getReferenceSpeed() { @@ -44,7 +44,7 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { this.step = joystickPosition; - followSpeed(); + //followSpeed(); } } diff --git a/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..9c6a5295e --- /dev/null +++ b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\controller\TrainControllerImpl.class diff --git a/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..831b08f85 --- /dev/null +++ b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-controller\src\main\java\hu\bme\mit\train\controller\TrainControllerImpl.java diff --git a/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..6873b5cce --- /dev/null +++ b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,3 @@ +hu\bme\mit\train\interfaces\TrainController.class +hu\bme\mit\train\interfaces\TrainSensor.class +hu\bme\mit\train\interfaces\TrainUser.class diff --git a/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..a55e2acc5 --- /dev/null +++ b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,3 @@ +C:\Users\P\Pictures\base\train-interfaces\src\main\java\hu\bme\mit\train\interfaces\TrainUser.java +C:\Users\P\Pictures\base\train-interfaces\src\main\java\hu\bme\mit\train\interfaces\TrainController.java +C:\Users\P\Pictures\base\train-interfaces\src\main\java\hu\bme\mit\train\interfaces\TrainSensor.java diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..69151c36c --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\sensor\TrainSensorImpl.class diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..d3dfc4205 --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-sensor\src\main\java\hu\bme\mit\train\sensor\TrainSensorImpl.java diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 000000000..0c9f43675 --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\sensor\TrainSensorTest.class diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 000000000..af6d69fed --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-sensor\src\test\java\hu\bme\mit\train\sensor\TrainSensorTest.java diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml new file mode 100644 index 000000000..32010e322 --- /dev/null +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt new file mode 100644 index 000000000..2439f52a0 --- /dev/null +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: hu.bme.mit.train.sensor.TrainSensorTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.033 s -- in hu.bme.mit.train.sensor.TrainSensorTest diff --git a/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..bea8d2a11 --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\system\TrainSystem.class diff --git a/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..04cf920e0 --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-system\src\main\java\hu\bme\mit\train\system\TrainSystem.java diff --git a/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 000000000..8594e13a5 --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\system\TrainSystemTest.class diff --git a/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 000000000..46b5b302f --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-system\src\test\java\hu\bme\mit\train\system\TrainSystemTest.java diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml new file mode 100644 index 000000000..754b77385 --- /dev/null +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt new file mode 100644 index 000000000..287f67384 --- /dev/null +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: hu.bme.mit.train.system.TrainSystemTest +------------------------------------------------------------------------------- +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.067 s -- in hu.bme.mit.train.system.TrainSystemTest diff --git a/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..6650aa321 --- /dev/null +++ b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\user\TrainUserImpl.class diff --git a/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..6561b12c7 --- /dev/null +++ b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-user\src\main\java\hu\bme\mit\train\user\TrainUserImpl.java From 5ba06d2edb8870cc1668b19aa72d5c0dd426695b Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 11:57:35 +0100 Subject: [PATCH 04/27] Fix failing tests --- .../TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml | 8 ++++---- .../hu.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- .../TEST-hu.bme.mit.train.system.TrainSystemTest.xml | 8 ++++---- .../hu.bme.mit.train.system.TrainSystemTest.txt | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml index 32010e322..55adfc1f7 100644 --- a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -59,5 +59,5 @@ - + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt index 2439f52a0..5abbdfb13 100644 --- a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.sensor.TrainSensorTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.033 s -- in hu.bme.mit.train.sensor.TrainSensorTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.057 s -- in hu.bme.mit.train.sensor.TrainSensorTest diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml index 754b77385..cffd348b3 100644 --- a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -59,6 +59,6 @@ - + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt index 287f67384..f428725e2 100644 --- a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.067 s -- in hu.bme.mit.train.system.TrainSystemTest +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.057 s -- in hu.bme.mit.train.system.TrainSystemTest From e8fbd5fca805a5efe2e4af3475acf2901850ff06 Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 12:02:52 +0100 Subject: [PATCH 05/27] Fix SonarCloud test failures --- .../TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml | 8 ++++---- .../hu.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- .../TEST-hu.bme.mit.train.system.TrainSystemTest.xml | 8 ++++---- .../hu.bme.mit.train.system.TrainSystemTest.txt | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml index 55adfc1f7..b4d5ce61e 100644 --- a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -59,5 +59,5 @@ - + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt index 5abbdfb13..392f2bd49 100644 --- a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.sensor.TrainSensorTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.057 s -- in hu.bme.mit.train.sensor.TrainSensorTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.041 s -- in hu.bme.mit.train.sensor.TrainSensorTest diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml index cffd348b3..776e6dc2c 100644 --- a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -59,6 +59,6 @@ - + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt index f428725e2..855d5b361 100644 --- a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.057 s -- in hu.bme.mit.train.system.TrainSystemTest +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.055 s -- in hu.bme.mit.train.system.TrainSystemTest From a39511edb9987eba09b3044de8020f4c85c65278 Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 12:18:13 +0100 Subject: [PATCH 06/27] update --- ...2025-02-18T12-11-04_655-jvmRun1-commands.bin | 1 + .../2025-02-18T12-11-04_655-jvmRun1-events.bin | Bin 0 -> 17946 bytes ...-hu.bme.mit.train.sensor.TrainSensorTest.xml | 8 ++++---- .../hu.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- ...2025-02-18T12-11-04_655-jvmRun1-commands.bin | 1 + .../2025-02-18T12-11-04_655-jvmRun1-events.bin | Bin 0 -> 18787 bytes ...-hu.bme.mit.train.system.TrainSystemTest.xml | 8 ++++---- .../hu.bme.mit.train.system.TrainSystemTest.txt | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin create mode 100644 train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin create mode 100644 train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin create mode 100644 train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin diff --git a/train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin b/train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin new file mode 100644 index 000000000..07ff0cad5 --- /dev/null +++ b/train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin @@ -0,0 +1 @@ +:maven-surefire-command::noop::maven-surefire-command::bye-ack: \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin b/train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin new file mode 100644 index 0000000000000000000000000000000000000000..b42ec27ef44a72232d1e7a0051558083b780c772 GIT binary patch literal 17946 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 Hjv4tk00FFr literal 0 HcmV?d00001 diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml index b4d5ce61e..a2aa7303f 100644 --- a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -59,5 +59,5 @@ - + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt index 392f2bd49..edd332f83 100644 --- a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.sensor.TrainSensorTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.041 s -- in hu.bme.mit.train.sensor.TrainSensorTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.048 s -- in hu.bme.mit.train.sensor.TrainSensorTest diff --git a/train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin b/train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin new file mode 100644 index 000000000..07ff0cad5 --- /dev/null +++ b/train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin @@ -0,0 +1 @@ +:maven-surefire-command::noop::maven-surefire-command::bye-ack: \ No newline at end of file diff --git a/train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin b/train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin new file mode 100644 index 0000000000000000000000000000000000000000..2655a871153c074e6715416c5db97bb095a23fc2 GIT binary patch literal 18787 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 - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -59,6 +59,6 @@ - + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt index 855d5b361..00b26df55 100644 --- a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.055 s -- in hu.bme.mit.train.system.TrainSystemTest +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.059 s -- in hu.bme.mit.train.system.TrainSystemTest From fb9f766cad22aa44931489be204e0dfed85b6590 Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 12:28:20 +0100 Subject: [PATCH 07/27] Fix --- .../hu/bme/mit/train/controller/TrainControllerImpl.java | 8 ++++++-- .../TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml | 8 ++++---- .../hu.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- .../TEST-hu.bme.mit.train.system.TrainSystemTest.xml | 6 +++--- .../hu.bme.mit.train.system.TrainSystemTest.txt | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 6af64fe3d..1cf4c368c 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -14,15 +14,19 @@ public void followSpeed() { referenceSpeed = 0; } else { if (step > 0) { - referenceSpeed += Math.min(step, 5); // Max 5-tel növelje, ahogy a teszt várja + referenceSpeed += Math.min(step, 5); } else { referenceSpeed = Math.max(0, referenceSpeed + step); } } - enforceSpeedLimit(); + // Biztosítjuk, hogy ne lépje túl a sebességkorlátot + if (referenceSpeed > speedLimit) { + referenceSpeed = speedLimit; + } } + @Override public int getReferenceSpeed() { return referenceSpeed; diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml index a2aa7303f..5bda5588b 100644 --- a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -59,5 +59,5 @@ - + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt index edd332f83..d82e479d5 100644 --- a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.sensor.TrainSensorTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.048 s -- in hu.bme.mit.train.sensor.TrainSensorTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.059 s -- in hu.bme.mit.train.sensor.TrainSensorTest diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml index 059186f4a..0d86dea7c 100644 --- a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt index 00b26df55..3533c9044 100644 --- a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.059 s -- in hu.bme.mit.train.system.TrainSystemTest +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.077 s -- in hu.bme.mit.train.system.TrainSystemTest From 4765a9a521034820f1944679bc5dec2b366b2e73 Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 12:37:41 +0100 Subject: [PATCH 08/27] Fix failing tests --- .../train/controller/TrainControllerImpl.java | 8 +++----- ...2025-02-18T12-11-04_655-jvmRun1-commands.bin | 1 - .../2025-02-18T12-11-04_655-jvmRun1-events.bin | Bin 17946 -> 0 bytes ...-hu.bme.mit.train.sensor.TrainSensorTest.xml | 6 +++--- .../hu.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- ...2025-02-18T12-11-04_655-jvmRun1-commands.bin | 1 - .../2025-02-18T12-11-04_655-jvmRun1-events.bin | Bin 18787 -> 0 bytes ...-hu.bme.mit.train.system.TrainSystemTest.xml | 6 +++--- .../hu.bme.mit.train.system.TrainSystemTest.txt | 2 +- 9 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin delete mode 100644 train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin delete mode 100644 train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin delete mode 100644 train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 1cf4c368c..9e2b8a70a 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -14,19 +14,17 @@ public void followSpeed() { referenceSpeed = 0; } else { if (step > 0) { - referenceSpeed += Math.min(step, 5); + referenceSpeed += Math.min(step, 5); // Max 5-tel növelje, ahogy a teszt várja } else { referenceSpeed = Math.max(0, referenceSpeed + step); } } - // Biztosítjuk, hogy ne lépje túl a sebességkorlátot - if (referenceSpeed > speedLimit) { - referenceSpeed = speedLimit; - } + enforceSpeedLimit(); } + @Override public int getReferenceSpeed() { return referenceSpeed; diff --git a/train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin b/train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin deleted file mode 100644 index 07ff0cad5..000000000 --- a/train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin +++ /dev/null @@ -1 +0,0 @@ -:maven-surefire-command::noop::maven-surefire-command::bye-ack: \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin b/train-sensor/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin deleted file mode 100644 index b42ec27ef44a72232d1e7a0051558083b780c772..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17946 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 Hjv4tk00FFr diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml index 5bda5588b..8ec3d2cc6 100644 --- a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt index d82e479d5..1907cfd8b 100644 --- a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.sensor.TrainSensorTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.059 s -- in hu.bme.mit.train.sensor.TrainSensorTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.042 s -- in hu.bme.mit.train.sensor.TrainSensorTest diff --git a/train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin b/train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin deleted file mode 100644 index 07ff0cad5..000000000 --- a/train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-commands.bin +++ /dev/null @@ -1 +0,0 @@ -:maven-surefire-command::noop::maven-surefire-command::bye-ack: \ No newline at end of file diff --git a/train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin b/train-system/target/surefire-reports/2025-02-18T12-11-04_655-jvmRun1-events.bin deleted file mode 100644 index 2655a871153c074e6715416c5db97bb095a23fc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18787 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 - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt index 3533c9044..287f67384 100644 --- a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.077 s -- in hu.bme.mit.train.system.TrainSystemTest +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.067 s -- in hu.bme.mit.train.system.TrainSystemTest From ea4527b5faddca15aa24bcaf646203da7bf868f8 Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 12:44:40 +0100 Subject: [PATCH 09/27] Fix test failures and remove unnecessary lines --- .../hu/bme/mit/train/controller/TrainControllerImpl.java | 3 --- .../TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml | 8 ++++---- .../hu.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- .../TEST-hu.bme.mit.train.system.TrainSystemTest.xml | 6 +++--- .../hu.bme.mit.train.system.TrainSystemTest.txt | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 9e2b8a70a..b86d80b87 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -22,9 +22,6 @@ public void followSpeed() { enforceSpeedLimit(); } - - - @Override public int getReferenceSpeed() { return referenceSpeed; diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml index 8ec3d2cc6..9c50b93b8 100644 --- a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -59,5 +59,5 @@ - + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt index 1907cfd8b..392f2bd49 100644 --- a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.sensor.TrainSensorTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.042 s -- in hu.bme.mit.train.sensor.TrainSensorTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.041 s -- in hu.bme.mit.train.sensor.TrainSensorTest diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml index 84b755db6..aaf4b2fa6 100644 --- a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt index 287f67384..03ab73017 100644 --- a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.067 s -- in hu.bme.mit.train.system.TrainSystemTest +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.053 s -- in hu.bme.mit.train.system.TrainSystemTest From 1c1a156078557352d72e294f633c470b34474815 Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 13:27:59 +0100 Subject: [PATCH 10/27] Commit --- .vscode/settings.json | 3 +++ pom.xml | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..c5f3f6b9c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2be9fb5f5..33024970f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,9 @@ UTF-8 + gsa53 + GSA53 + https://sonarcloud.io pom @@ -51,6 +54,10 @@ 11 + + org.sonarsource + sonar-maven-plugin + 3.9.0.2155 \ No newline at end of file From 8533becd17381dc5505d1ac46a495dc648863d15 Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 13:45:03 +0100 Subject: [PATCH 11/27] SonarCloud setup and fixes --- pom.xml | 7 ++++--- .../hu/bme/mit/train/controller/TrainControllerImpl.java | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 33024970f..cc08b6f3d 100644 --- a/pom.xml +++ b/pom.xml @@ -55,9 +55,10 @@ - org.sonarsource - sonar-maven-plugin - 3.9.0.2155 + org.sonarsource + sonar-maven-plugin + 3.9.0.2155 + \ No newline at end of file diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index b86d80b87..d39442a41 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -14,9 +14,12 @@ public void followSpeed() { referenceSpeed = 0; } else { if (step > 0) { - referenceSpeed += Math.min(step, 5); // Max 5-tel növelje, ahogy a teszt várja + referenceSpeed += step; // A joystick által vezérelt növelés + if (referenceSpeed > 5) { + referenceSpeed = 5; // Ne haladja meg az 5-öt + } } else { - referenceSpeed = Math.max(0, referenceSpeed + step); + referenceSpeed = Math.max(0, referenceSpeed + step); // Csökkentés nem haladhat 0 alá } } From 48926afba77abcef0e0657a104bd1bad8835efae Mon Sep 17 00:00:00 2001 From: GSA53 <100687373+GSA53@users.noreply.github.com> Date: Tue, 18 Feb 2025 14:02:30 +0100 Subject: [PATCH 12/27] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 405c5214f..e077b38a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - GSA53-pls pull_request: types: [opened, synchronize, reopened] From ea1fefebc47103feccd277208245ff086a05d2af Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 14:17:02 +0100 Subject: [PATCH 13/27] Fix --- .../train/controller/TrainControllerImpl.java | 4 +- .../target/maven-archiver/pom.properties | 3 ++ .../target/maven-archiver/pom.properties | 3 ++ .../target/maven-archiver/pom.properties | 3 ++ ...u.bme.mit.train.sensor.TrainSensorTest.xml | 14 +++--- ...u.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- ...u.bme.mit.train.system.TrainSystemTest.xml | 48 +++++++++++++++---- ...u.bme.mit.train.system.TrainSystemTest.txt | 34 ++++++++++++- .../target/maven-archiver/pom.properties | 3 ++ 9 files changed, 95 insertions(+), 19 deletions(-) create mode 100644 train-controller/target/maven-archiver/pom.properties create mode 100644 train-interfaces/target/maven-archiver/pom.properties create mode 100644 train-sensor/target/maven-archiver/pom.properties create mode 100644 train-user/target/maven-archiver/pom.properties diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index d39442a41..0cb217fa4 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -15,8 +15,8 @@ public void followSpeed() { } else { if (step > 0) { referenceSpeed += step; // A joystick által vezérelt növelés - if (referenceSpeed > 5) { - referenceSpeed = 5; // Ne haladja meg az 5-öt + if (referenceSpeed > 10) { // Növelés korlátozása 10-re + referenceSpeed = 10; } } else { referenceSpeed = Math.max(0, referenceSpeed + step); // Csökkentés nem haladhat 0 alá diff --git a/train-controller/target/maven-archiver/pom.properties b/train-controller/target/maven-archiver/pom.properties new file mode 100644 index 000000000..ce6c28613 --- /dev/null +++ b/train-controller/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=hu.bme.mit.train.controller +groupId=hu.bme.mit.train +version=0.5.0-SNAPSHOT diff --git a/train-interfaces/target/maven-archiver/pom.properties b/train-interfaces/target/maven-archiver/pom.properties new file mode 100644 index 000000000..26b4fd913 --- /dev/null +++ b/train-interfaces/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=hu.bme.mit.train.interfaces +groupId=hu.bme.mit.train +version=0.5.0-SNAPSHOT diff --git a/train-sensor/target/maven-archiver/pom.properties b/train-sensor/target/maven-archiver/pom.properties new file mode 100644 index 000000000..62ab7dbc8 --- /dev/null +++ b/train-sensor/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=hu.bme.mit.train.sensor +groupId=hu.bme.mit.train +version=0.5.0-SNAPSHOT diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml index 9c50b93b8..74a6bcd04 100644 --- a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -1,10 +1,10 @@ - + - + @@ -15,9 +15,9 @@ - + - + @@ -30,7 +30,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -59,5 +59,5 @@ - + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt index 392f2bd49..736e951c2 100644 --- a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.sensor.TrainSensorTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.041 s -- in hu.bme.mit.train.sensor.TrainSensorTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 s -- in hu.bme.mit.train.sensor.TrainSensorTest diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml index aaf4b2fa6..f2496b79e 100644 --- a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml @@ -1,10 +1,10 @@ - + - + @@ -15,9 +15,9 @@ - + - + @@ -30,7 +30,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -59,6 +59,38 @@ - - + + + but was:<5> + at org.junit.Assert.fail(Assert.java:88) + at org.junit.Assert.failNotEquals(Assert.java:834) + at org.junit.Assert.assertEquals(Assert.java:645) + at org.junit.Assert.assertEquals(Assert.java:631) + at hu.bme.mit.train.system.TrainSystemTest.OverridingJoystickPosition_IncreasesReferenceSpeed(TrainSystemTest.java:39) + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50) + at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) + at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47) + at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) + at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) + at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325) + at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78) + at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57) + at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288) + at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268) + at org.junit.runners.ParentRunner.run(ParentRunner.java:363) + at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:316) + at org.apache.maven.surefire.junit4.JUnit4Provider.executeWithRerun(JUnit4Provider.java:240) + at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:214) + at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:155) + at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:385) + at org.apache.maven.surefire.booter.ForkedBooter.execute(ForkedBooter.java:162) + at org.apache.maven.surefire.booter.ForkedBooter.run(ForkedBooter.java:507) + at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:495) +]]> + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt index 03ab73017..06cd48cbd 100644 --- a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -1,4 +1,36 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.053 s -- in hu.bme.mit.train.system.TrainSystemTest +Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.060 s <<< FAILURE! -- in hu.bme.mit.train.system.TrainSystemTest +hu.bme.mit.train.system.TrainSystemTest.OverridingJoystickPosition_IncreasesReferenceSpeed -- Time elapsed: 0.005 s <<< FAILURE! +java.lang.AssertionError: expected:<10> but was:<5> + at org.junit.Assert.fail(Assert.java:88) + at org.junit.Assert.failNotEquals(Assert.java:834) + at org.junit.Assert.assertEquals(Assert.java:645) + at org.junit.Assert.assertEquals(Assert.java:631) + at hu.bme.mit.train.system.TrainSystemTest.OverridingJoystickPosition_IncreasesReferenceSpeed(TrainSystemTest.java:39) + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50) + at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) + at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47) + at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) + at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) + at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325) + at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78) + at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57) + at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288) + at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268) + at org.junit.runners.ParentRunner.run(ParentRunner.java:363) + at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:316) + at org.apache.maven.surefire.junit4.JUnit4Provider.executeWithRerun(JUnit4Provider.java:240) + at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:214) + at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:155) + at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:385) + at org.apache.maven.surefire.booter.ForkedBooter.execute(ForkedBooter.java:162) + at org.apache.maven.surefire.booter.ForkedBooter.run(ForkedBooter.java:507) + at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:495) + diff --git a/train-user/target/maven-archiver/pom.properties b/train-user/target/maven-archiver/pom.properties new file mode 100644 index 000000000..177cfae41 --- /dev/null +++ b/train-user/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=hu.bme.mit.train.user +groupId=hu.bme.mit.train +version=0.5.0-SNAPSHOT From d95cc73b3a5f18939089ff766a136614e6a5fdd9 Mon Sep 17 00:00:00 2001 From: GSA53 <100687373+GSA53@users.noreply.github.com> Date: Tue, 18 Feb 2025 14:38:51 +0100 Subject: [PATCH 14/27] Update main.yml --- .github/workflows/main.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e077b38a6..66bbe6ef7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,9 @@ on: - main - GSA53-pls pull_request: - types: [opened, synchronize, reopened] + branches: + - main + - GSA53-pls jobs: sonarcloud: @@ -31,6 +33,6 @@ jobs: restore-keys: maven-${{ runner.os }} - name: Build and analyze with SonarCloud - env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn clean verify sonar:sonar -Dsonar.projectKey=GSA53_base -Dsonar.organization=GSA53 + uses: sonarsource/sonarcloud-github-action@v2 + with: + sonar-token: ${{ secrets.SONAR_TOKEN }} From 4b35b2912a6a724865e88f35d27b8ed609feb9f0 Mon Sep 17 00:00:00 2001 From: GSA53 <100687373+GSA53@users.noreply.github.com> Date: Tue, 18 Feb 2025 14:46:03 +0100 Subject: [PATCH 15/27] Update main.yml --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 66bbe6ef7..5b8afa927 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,4 +35,6 @@ jobs: - name: Build and analyze with SonarCloud uses: sonarsource/sonarcloud-github-action@v2 with: - sonar-token: ${{ secrets.SONAR_TOKEN }} + projectBaseDir: . + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 07effdc56a3f2097c8f8beafe39418287cd6ab4b Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 14:53:24 +0100 Subject: [PATCH 16/27] c --- pom.xml | 28 ++++++------- ...u.bme.mit.train.sensor.TrainSensorTest.xml | 8 ++-- ...u.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- .../target/maven-archiver/pom.properties | 3 ++ ...u.bme.mit.train.system.TrainSystemTest.xml | 42 +++---------------- ...u.bme.mit.train.system.TrainSystemTest.txt | 34 +-------------- 6 files changed, 28 insertions(+), 89 deletions(-) create mode 100644 train-system/target/maven-archiver/pom.properties diff --git a/pom.xml b/pom.xml index cc08b6f3d..634d6a96f 100644 --- a/pom.xml +++ b/pom.xml @@ -45,20 +45,20 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 11 - - - - org.sonarsource + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 11 + + + + org.sonarsource.scanner.maven sonar-maven-plugin - 3.9.0.2155 - - + 4.0.0.4121 + + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml index 74a6bcd04..f885c3cf6 100644 --- a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -59,5 +59,5 @@ - + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt index 736e951c2..afb5c253f 100644 --- a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.sensor.TrainSensorTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 s -- in hu.bme.mit.train.sensor.TrainSensorTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.055 s -- in hu.bme.mit.train.sensor.TrainSensorTest diff --git a/train-system/target/maven-archiver/pom.properties b/train-system/target/maven-archiver/pom.properties new file mode 100644 index 000000000..47684bd8e --- /dev/null +++ b/train-system/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=hu.bme.mit.train.system +groupId=hu.bme.mit.train +version=0.5.0-SNAPSHOT diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml index f2496b79e..8d3d50846 100644 --- a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -59,38 +59,6 @@ - - - but was:<5> - at org.junit.Assert.fail(Assert.java:88) - at org.junit.Assert.failNotEquals(Assert.java:834) - at org.junit.Assert.assertEquals(Assert.java:645) - at org.junit.Assert.assertEquals(Assert.java:631) - at hu.bme.mit.train.system.TrainSystemTest.OverridingJoystickPosition_IncreasesReferenceSpeed(TrainSystemTest.java:39) - at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50) - at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) - at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47) - at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) - at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) - at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57) - at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290) - at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71) - at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288) - at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58) - at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268) - at org.junit.runners.ParentRunner.run(ParentRunner.java:363) - at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:316) - at org.apache.maven.surefire.junit4.JUnit4Provider.executeWithRerun(JUnit4Provider.java:240) - at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:214) - at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:155) - at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:385) - at org.apache.maven.surefire.booter.ForkedBooter.execute(ForkedBooter.java:162) - at org.apache.maven.surefire.booter.ForkedBooter.run(ForkedBooter.java:507) - at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:495) -]]> - + + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt index 06cd48cbd..0dd59fce3 100644 --- a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -1,36 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.060 s <<< FAILURE! -- in hu.bme.mit.train.system.TrainSystemTest -hu.bme.mit.train.system.TrainSystemTest.OverridingJoystickPosition_IncreasesReferenceSpeed -- Time elapsed: 0.005 s <<< FAILURE! -java.lang.AssertionError: expected:<10> but was:<5> - at org.junit.Assert.fail(Assert.java:88) - at org.junit.Assert.failNotEquals(Assert.java:834) - at org.junit.Assert.assertEquals(Assert.java:645) - at org.junit.Assert.assertEquals(Assert.java:631) - at hu.bme.mit.train.system.TrainSystemTest.OverridingJoystickPosition_IncreasesReferenceSpeed(TrainSystemTest.java:39) - at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50) - at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) - at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47) - at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) - at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) - at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57) - at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290) - at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71) - at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288) - at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58) - at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268) - at org.junit.runners.ParentRunner.run(ParentRunner.java:363) - at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:316) - at org.apache.maven.surefire.junit4.JUnit4Provider.executeWithRerun(JUnit4Provider.java:240) - at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:214) - at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:155) - at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:385) - at org.apache.maven.surefire.booter.ForkedBooter.execute(ForkedBooter.java:162) - at org.apache.maven.surefire.booter.ForkedBooter.run(ForkedBooter.java:507) - at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:495) - +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.049 s -- in hu.bme.mit.train.system.TrainSystemTest From 0cc56604cda8a21e4c683a6b7421cf23dbdda2ee Mon Sep 17 00:00:00 2001 From: GSA53 <100687373+GSA53@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:12:31 +0100 Subject: [PATCH 17/27] Update main.yml --- .github/workflows/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b8afa927..38750d5b9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,8 +33,9 @@ jobs: restore-keys: maven-${{ runner.os }} - name: Build and analyze with SonarCloud - uses: sonarsource/sonarcloud-github-action@v2 + uses: sonarsource/sonarcloud-github-action@v1 with: - projectBaseDir: . - env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + sonar-token: ${{ secrets.SONAR_TOKEN }} + projectKey: 'gsa53' + organization: 'GSA53' + From b87bad4a01ab3ec4a1cece82d7e6762d968e7d4c Mon Sep 17 00:00:00 2001 From: GSA53 <100687373+GSA53@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:16:23 +0100 Subject: [PATCH 18/27] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 38750d5b9..155bb2de0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,5 +37,5 @@ jobs: with: sonar-token: ${{ secrets.SONAR_TOKEN }} projectKey: 'gsa53' - organization: 'GSA53' + organization: 'gsa53' From 500bfd0e412d21e4e653bff83aaf7b00fafaf227 Mon Sep 17 00:00:00 2001 From: GSA53 <100687373+GSA53@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:22:36 +0100 Subject: [PATCH 19/27] Update main.yml --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 155bb2de0..7bf9b48e3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,11 +3,9 @@ name: SonarCloud Analysis on: push: branches: - - main - GSA53-pls pull_request: branches: - - main - GSA53-pls jobs: From 19c800d48aade82bc68bcfd188fe035414896cae Mon Sep 17 00:00:00 2001 From: GSA53 <100687373+GSA53@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:24:40 +0100 Subject: [PATCH 20/27] Update main.yml --- .github/workflows/main.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7bf9b48e3..70fa8ec46 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,9 +31,7 @@ jobs: restore-keys: maven-${{ runner.os }} - name: Build and analyze with SonarCloud - uses: sonarsource/sonarcloud-github-action@v1 - with: - sonar-token: ${{ secrets.SONAR_TOKEN }} - projectKey: 'gsa53' - organization: 'gsa53' + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: mvn clean verify sonar:sonar -Dsonar.projectKey=gsa53_base -Dsonar.organization=gsa53 From ddecc556ae1a7dad71d908fa8fb41196acbae49e Mon Sep 17 00:00:00 2001 From: GSA53 <100687373+GSA53@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:30:02 +0100 Subject: [PATCH 21/27] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 70fa8ec46..fe91530e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,5 +33,5 @@ jobs: - name: Build and analyze with SonarCloud env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn clean verify sonar:sonar -Dsonar.projectKey=gsa53_base -Dsonar.organization=gsa53 + run: mvn clean verify sonar:sonar -Dsonar.projectKey=GSA53_base -Dsonar.organization=gsa53 From 505fb52818a9eace742a4f5aae42a596e52213bc Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 15:24:59 +0100 Subject: [PATCH 22/27] c --- pom.xml | 7 ++++++- target/sonar/.sonar_lock | 0 .../TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml | 9 +++++---- .../hu.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- .../TEST-hu.bme.mit.train.system.TrainSystemTest.xml | 9 +++++---- .../hu.bme.mit.train.system.TrainSystemTest.txt | 2 +- 6 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 target/sonar/.sonar_lock diff --git a/pom.xml b/pom.xml index 634d6a96f..f5603bb25 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ UTF-8 gsa53 - GSA53 + gsa53 https://sonarcloud.io @@ -58,6 +58,11 @@ org.sonarsource.scanner.maven sonar-maven-plugin 4.0.0.4121 + + gsa53 + gsa53 + ${env.SONAR_TOKEN} + diff --git a/target/sonar/.sonar_lock b/target/sonar/.sonar_lock new file mode 100644 index 000000000..e69de29bb diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml index f885c3cf6..c60d862cd 100644 --- a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,12 +30,13 @@ - + + @@ -59,5 +60,5 @@ - + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt index afb5c253f..736e951c2 100644 --- a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.sensor.TrainSensorTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.055 s -- in hu.bme.mit.train.sensor.TrainSensorTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 s -- in hu.bme.mit.train.sensor.TrainSensorTest diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml index 8d3d50846..a12936aa6 100644 --- a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,12 +30,13 @@ - + + @@ -59,6 +60,6 @@ - + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt index 0dd59fce3..5a884445f 100644 --- a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.049 s -- in hu.bme.mit.train.system.TrainSystemTest +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.066 s -- in hu.bme.mit.train.system.TrainSystemTest From b2c2db9c11f5bbfacbc8be236b8b0a72869c715b Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 15:29:17 +0100 Subject: [PATCH 23/27] c --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f5603bb25..c5969e978 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ UTF-8 - gsa53 + GSA53_base gsa53 https://sonarcloud.io @@ -59,7 +59,7 @@ sonar-maven-plugin 4.0.0.4121 - gsa53 + GSA53_base gsa53 ${env.SONAR_TOKEN} From 06aa1268f7d1ea4861f13139f4ae4ddd4303e2ae Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 16:49:46 +0100 Subject: [PATCH 24/27] elso --- .../java/hu/bme/mit/train/controller/TrainControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 0cb217fa4..51945ae53 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -46,7 +46,7 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { this.step = joystickPosition; - //followSpeed(); + followSpeed(); } } From b909cf422154c205b2e3cc94f9342d362eea369f Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 18:21:21 +0100 Subject: [PATCH 25/27] commit --- .../java/hu/bme/mit/train/controller/TrainControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 51945ae53..0cb217fa4 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -46,7 +46,7 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { this.step = joystickPosition; - followSpeed(); + //followSpeed(); } } From 28a7d24f1e15041f37e660c99916fcfa1d2e6211 Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 18:32:04 +0100 Subject: [PATCH 26/27] first --- .../train/controller/TrainControllerImpl.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 0cb217fa4..848be28f8 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -7,6 +7,21 @@ public class TrainControllerImpl implements TrainController { private int step = 0; private int referenceSpeed = 0; private int speedLimit = 0; + private Thread thread; + + public TrainControllerImpl(){ + thread = new Thread(){ + public void run(){ + thread.run(); + try{ + followSpeed(); + thread.sleep(5000); + }catch (InterruptedException e){ + e.printStackTrace(); + } + } + }; + } @Override public void followSpeed() { @@ -14,12 +29,12 @@ public void followSpeed() { referenceSpeed = 0; } else { if (step > 0) { - referenceSpeed += step; // A joystick által vezérelt növelés - if (referenceSpeed > 10) { // Növelés korlátozása 10-re + referenceSpeed += step; //a joystick által vezérelt növelés + if (referenceSpeed > 10) { //növelés korlátozása 10-re referenceSpeed = 10; } } else { - referenceSpeed = Math.max(0, referenceSpeed + step); // Csökkentés nem haladhat 0 alá + referenceSpeed = Math.max(0, referenceSpeed + step); //csökkentés nem mehet 0 alá } } @@ -45,8 +60,7 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { - this.step = joystickPosition; - //followSpeed(); + this.step = joystickPosition; } } From 35c9570a4b1772cdb373292367a6dd925252e153 Mon Sep 17 00:00:00 2001 From: GSA53 Date: Tue, 18 Feb 2025 18:38:47 +0100 Subject: [PATCH 27/27] final --- .../hu/bme/mit/train/controller/TrainControllerImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 848be28f8..e2e12b880 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -10,12 +10,12 @@ public class TrainControllerImpl implements TrainController { private Thread thread; public TrainControllerImpl(){ - thread = new Thread(){ + thread = new Thread(){ //szál létrehozása public void run(){ - thread.run(); + thread.run(); //közvetlenül meghívja a run-t a jelenlegi szálon try{ followSpeed(); - thread.sleep(5000); + thread.sleep(5000); //5mp várakozás }catch (InterruptedException e){ e.printStackTrace(); }