From ac04e7f0253ea77ccdff8ad60613c5d2cbe6afe9 Mon Sep 17 00:00:00 2001 From: szfp98 <78967799+szfp98@users.noreply.github.com> Date: Mon, 25 Mar 2024 16:06:59 +0100 Subject: [PATCH 1/5] Create build.yml --- .github/workflows/build.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..5c4762f30 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,37 @@ +name: SonarCloud +on: + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened] +jobs: + build: + name: Build and analyze + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'zulu' # Alternative distribution options are available. + - name: Cache SonarCloud packages + uses: actions/cache@v3 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Cache Maven packages + uses: actions/cache@v3 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Build and analyze + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=szfp98_base From a4e4da7a3fb6632fbc85603c3e56b68ecc46c5d0 Mon Sep 17 00:00:00 2001 From: szfp98 Date: Mon, 25 Mar 2024 16:13:03 +0100 Subject: [PATCH 2/5] fix reference speed modification --- .../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 437a4ac65798e44920babc036929105c54542d42 Mon Sep 17 00:00:00 2001 From: szfp98 Date: Mon, 25 Mar 2024 17:12:24 +0100 Subject: [PATCH 3/5] update pom.xml --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 2be9fb5f5..2fc82dd58 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,8 @@ UTF-8 + szfp98 + https://sonarcloud.io pom From 7d3c122d8e1d3ca541b03969334ff163d6fb1775 Mon Sep 17 00:00:00 2001 From: szfp98 Date: Mon, 25 Mar 2024 16:22:11 +0100 Subject: [PATCH 4/5] fix joystick pos --- .../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 dec7961f8..f55d75057 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 @@ -44,7 +44,7 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { this.step = joystickPosition; - followSpeed(); + followSpeed(); } } From 9171454cf6f49f4b71e8ed7f6b6938276030f889 Mon Sep 17 00:00:00 2001 From: szfp98 Date: Mon, 25 Mar 2024 17:40:09 +0100 Subject: [PATCH 5/5] fix train sensor test --- pom.xml | 2 ++ .../hu/bme/mit/train/sensor/TrainSensorTest.java | 12 ++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 2be9fb5f5..2fc82dd58 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,8 @@ UTF-8 + szfp98 + https://sonarcloud.io pom diff --git a/train-sensor/src/test/java/hu/bme/mit/train/sensor/TrainSensorTest.java b/train-sensor/src/test/java/hu/bme/mit/train/sensor/TrainSensorTest.java index ae5dee21b..b4001fdac 100644 --- a/train-sensor/src/test/java/hu/bme/mit/train/sensor/TrainSensorTest.java +++ b/train-sensor/src/test/java/hu/bme/mit/train/sensor/TrainSensorTest.java @@ -5,15 +5,7 @@ import org.junit.Test; import static org.mockito.Mockito.*; -public class TrainSensorTest { + public class TrainSensorTest { - @Before - public void before() { - // TODO Add initializations - } - - @Test - public void ThisIsAnExampleTestStub() { - // TODO Delete this and add test cases based on the issues - } + }