From 486479c8285b70bf396c2c9da2fc663d3b062420 Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 20 Mar 2023 15:42:12 +0100 Subject: [PATCH 01/13] #3 Markdown tasks --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index e26e034fc..fdbeb9e1f 100644 --- a/README.md +++ b/README.md @@ -62,3 +62,11 @@ The figure below illustrates this behavior using an example. 1. As the joystick remains at a positive value, the reference speed is incremented again. 1. However, it reaches the speed limit so in the next step it is not incremented even though the joystick still has a positive value. 1. Later, the joystick is set to a negative position for one time unit, making the reference speed to decrease as well. + +### 3 Markdown tasks +*emphasis* +# Header 1 +1. First item +2. Second item +..* Second item - subitem + From 4a6e5e7557d60a6935101dd2051e083314c6e989 Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 20 Mar 2023 16:16:26 +0100 Subject: [PATCH 02/13] Emergency brake implemenatiton --- .../train/controller/TrainControllerImpl.java | 4 ++ .../compile/default-compile/createdFiles.lst | 1 + .../compile/default-compile/inputFiles.lst | 1 + .../mit/train/interfaces/TrainController.java | 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 | 64 ++++++++++++++++++ ...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 | 65 +++++++++++++++++++ ...u.bme.mit.train.system.TrainSystemTest.txt | 4 ++ .../compile/default-compile/createdFiles.lst | 1 + .../compile/default-compile/inputFiles.lst | 1 + 20 files changed, 160 insertions(+) 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 06649d278..4933891ed 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,4 +46,8 @@ public void setJoystickPosition(int joystickPosition) { this.step = joystickPosition; } + @Override + public void emergencyBrake(){ + this.referenceSpeed=0; + } } 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..7f5a1ef4a --- /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..6063b4a14 --- /dev/null +++ b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/Desktop/mit2/base/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java diff --git a/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainController.java b/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainController.java index c8adca066..4c2f3734b 100644 --- a/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainController.java +++ b/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainController.java @@ -10,4 +10,5 @@ public interface TrainController { void setJoystickPosition(int joystickPosition); + void emergencyBrake(); } 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..248759f35 --- /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..7152c1e0d --- /dev/null +++ b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,3 @@ +/home/cloud/Desktop/mit2/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainUser.java +/home/cloud/Desktop/mit2/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainSensor.java +/home/cloud/Desktop/mit2/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainController.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..5c6a37510 --- /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..492fe9c1c --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/Desktop/mit2/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..0ad3f3de4 --- /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..cd1714819 --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/Desktop/mit2/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..e3a08d3a4 --- /dev/null +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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..e6c0e05f2 --- /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.145 sec 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..104d0eff5 --- /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..2262469d3 --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/Desktop/mit2/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..f347beb05 --- /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..77bcec89f --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/Desktop/mit2/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..1b914a81e --- /dev/null +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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..665b8d299 --- /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.116 sec 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..f84f69174 --- /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..d6b28481b --- /dev/null +++ b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/Desktop/mit2/base/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java From f89372279808da83799aa396232d0e2d90c97d22 Mon Sep 17 00:00:00 2001 From: LaszloAbrok <88158820+LaszloAbrok@users.noreply.github.com> Date: Mon, 20 Mar 2023 15:40:05 +0100 Subject: [PATCH 03/13] Create maven.yml --- .github/workflows/maven.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 000000000..f7367e0d4 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,35 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Java CI with Maven + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B package --file pom.xml + + # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive + - name: Update dependency graph + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 From edef3741611fdef115c513e1f87361322d9d6b83 Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 20 Mar 2023 16:28:36 +0100 Subject: [PATCH 04/13] referenceSpeed to 1 --- .../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 4933891ed..98e485c56 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 @@ -16,7 +16,7 @@ public void followSpeed() { if(referenceSpeed+step > 0) { referenceSpeed += step; } else { - referenceSpeed = 0; + referenceSpeed = 1; } } From fb72a0522c4e4a253f07e9c02b6f98a6f6201477 Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 20 Mar 2023 16:29:28 +0100 Subject: [PATCH 05/13] referenceSpeed to 2 --- .../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 4933891ed..59149965d 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 @@ -16,7 +16,7 @@ public void followSpeed() { if(referenceSpeed+step > 0) { referenceSpeed += step; } else { - referenceSpeed = 0; + referenceSpeed = 2; } } From 483f3660100c007c831774cdb8ba0012a2b160d8 Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 20 Mar 2023 16:49:27 +0100 Subject: [PATCH 06/13] fixed an error in TrainControllerImpl --- .../train/controller/TrainControllerImpl.java | 4 -- ...u.bme.mit.train.sensor.TrainSensorTest.xml | 4 +- ...u.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- ...u.bme.mit.train.system.TrainSystemTest.xml | 44 +++++++++++++++++-- ...u.bme.mit.train.system.TrainSystemTest.txt | 40 ++++++++++++++++- 5 files changed, 83 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 3b5223e46..59149965d 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 @@ -16,11 +16,7 @@ public void followSpeed() { if(referenceSpeed+step > 0) { referenceSpeed += step; } else { -<<<<<<< HEAD - referenceSpeed = 1; -======= referenceSpeed = 2; ->>>>>>> branch-B } } 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 e3a08d3a4..dec152bb4 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 @@ - + @@ -60,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 e6c0e05f2..bed36a16a 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.145 sec +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.098 sec 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 1b914a81e..9f095ea26 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 @@ - + @@ -60,6 +60,44 @@ - - + + java.lang.AssertionError: expected:<0> but was:<2> + 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.OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero(TrainSystemTest.java:50) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + 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:252) + at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141) + at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189) + at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165) + at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85) + at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115) + at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75) + + + \ 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 665b8d299..2acd0bffa 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,42 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.116 sec +Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.162 sec <<< FAILURE! +OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero(hu.bme.mit.train.system.TrainSystemTest) Time elapsed: 0.009 sec <<< FAILURE! +java.lang.AssertionError: expected:<0> but was:<2> + 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.OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero(TrainSystemTest.java:50) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + 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:252) + at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141) + at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189) + at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165) + at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85) + at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115) + at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75) + From a9d6190b90d71be330440dc3b3d42bd5f617fbdf Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 20 Mar 2023 16:52:07 +0100 Subject: [PATCH 07/13] fixed error of incorrect merge --- .../TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml | 4 ++-- .../hu.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- .../TEST-hu.bme.mit.train.system.TrainSystemTest.xml | 6 +++--- .../hu.bme.mit.train.system.TrainSystemTest.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 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 dec152bb4..e3a08d3a4 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 @@ - + @@ -60,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 bed36a16a..73943124e 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.098 sec +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.143 sec 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 9f095ea26..86d56c0fd 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 @@ - + @@ -60,7 +60,7 @@ - + java.lang.AssertionError: expected:<0> but was:<2> at org.junit.Assert.fail(Assert.java:88) at org.junit.Assert.failNotEquals(Assert.java:834) @@ -99,5 +99,5 @@ at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75) - + \ 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 2acd0bffa..d84a34596 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,8 +1,8 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.162 sec <<< FAILURE! -OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero(hu.bme.mit.train.system.TrainSystemTest) Time elapsed: 0.009 sec <<< FAILURE! +Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.183 sec <<< FAILURE! +OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero(hu.bme.mit.train.system.TrainSystemTest) Time elapsed: 0.013 sec <<< FAILURE! java.lang.AssertionError: expected:<0> but was:<2> at org.junit.Assert.fail(Assert.java:88) at org.junit.Assert.failNotEquals(Assert.java:834) From 8f76036d533d6537b808789cb0656c1e473a98b1 Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 20 Mar 2023 16:55:25 +0100 Subject: [PATCH 08/13] referenceSpeed set to original value for passing test --- .../train/controller/TrainControllerImpl.java | 4 +- ...u.bme.mit.train.sensor.TrainSensorTest.xml | 4 +- ...u.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- ...u.bme.mit.train.system.TrainSystemTest.xml | 42 +------------------ ...u.bme.mit.train.system.TrainSystemTest.txt | 40 +----------------- 5 files changed, 9 insertions(+), 83 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 59149965d..33960ecfd 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 @@ -16,7 +16,9 @@ public void followSpeed() { if(referenceSpeed+step > 0) { referenceSpeed += step; } else { - referenceSpeed = 2; + //This was modified for the previous task + //Was set to correct value for passing test + referenceSpeed = 0; } } 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 e3a08d3a4..501102a94 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 @@ - + @@ -60,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 73943124e..ce869e214 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.143 sec +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.147 sec 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 86d56c0fd..94a69764c 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 @@ - + @@ -60,44 +60,6 @@ - - java.lang.AssertionError: expected:<0> but was:<2> - 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.OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero(TrainSystemTest.java:50) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.base/java.lang.reflect.Method.invoke(Method.java:566) - 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:252) - at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141) - at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.base/java.lang.reflect.Method.invoke(Method.java:566) - at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189) - at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165) - at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85) - at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115) - at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75) - - + \ 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 d84a34596..687cd56cb 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,42 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TrainSystemTest ------------------------------------------------------------------------------- -Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.183 sec <<< FAILURE! -OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero(hu.bme.mit.train.system.TrainSystemTest) Time elapsed: 0.013 sec <<< FAILURE! -java.lang.AssertionError: expected:<0> but was:<2> - 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.OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero(TrainSystemTest.java:50) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.base/java.lang.reflect.Method.invoke(Method.java:566) - 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:252) - at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141) - at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.base/java.lang.reflect.Method.invoke(Method.java:566) - at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189) - at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165) - at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85) - at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115) - at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75) - +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.137 sec From 8bfb581527858145d1dcf54d23b7b6860ef6fdea Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 20 Mar 2023 16:58:33 +0100 Subject: [PATCH 09/13] compilation error inserted --- .../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 33960ecfd..eeb3bbe08 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 @@ -18,7 +18,7 @@ public void followSpeed() { } else { //This was modified for the previous task //Was set to correct value for passing test - referenceSpeed = 0; + referenceSpeed = 0 } } From b428db33dfdbb984e8f085b487030277afd0d587 Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 20 Mar 2023 17:12:16 +0100 Subject: [PATCH 10/13] error fixed and test inserted --- .../mit/train/controller/TrainControllerImpl.java | 2 +- ...TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml | 4 ++-- .../hu.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- .../hu/bme/mit/train/system/TrainSystemTest.java | 13 ++++++++++++- ...TEST-hu.bme.mit.train.system.TrainSystemTest.xml | 5 +++-- .../hu.bme.mit.train.system.TrainSystemTest.txt | 2 +- 6 files changed, 20 insertions(+), 8 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 eeb3bbe08..33960ecfd 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 @@ -18,7 +18,7 @@ public void followSpeed() { } else { //This was modified for the previous task //Was set to correct value for passing test - referenceSpeed = 0 + referenceSpeed = 0; } } 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 501102a94..0a444e7a7 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 @@ - + @@ -60,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 ce869e214..57a36cd0f 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.147 sec +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.089 sec diff --git a/train-system/src/test/java/hu/bme/mit/train/system/TrainSystemTest.java b/train-system/src/test/java/hu/bme/mit/train/system/TrainSystemTest.java index 04ae3dac0..acba2e4be 100644 --- a/train-system/src/test/java/hu/bme/mit/train/system/TrainSystemTest.java +++ b/train-system/src/test/java/hu/bme/mit/train/system/TrainSystemTest.java @@ -50,5 +50,16 @@ public void OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero() { Assert.assertEquals(0, controller.getReferenceSpeed()); } - + //#6 Task new unit test + @Test + public void NewTest(){ + sensor.overrideSpeedLimit(5); + + Assert.assertEquals(0, controller.getReferenceSpeed()); + + user.overrideJoystickPosition(5); + + controller.followSpeed(); + Assert.assertEquals(5, controller.getReferenceSpeed()); + } } 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 94a69764c..f1790cec5 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 @@ - + @@ -60,6 +60,7 @@ - + + \ 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 687cd56cb..27c1f73d4 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.137 sec +Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.116 sec From 2b68578fc7bfdc9ad947405ead4d275bbce356a5 Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 20 Mar 2023 18:43:39 +0100 Subject: [PATCH 11/13] tachograph implementation and test --- ...u.bme.mit.train.sensor.TrainSensorTest.xml | 4 +- ...u.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- train-system/pom.xml | 5 ++ .../hu/bme/mit/train/system/Tachograph.java | 24 +++++++ .../bme/mit/train/system/TachographTest.java | 30 +++++++++ .../compile/default-compile/inputFiles.lst | 1 + .../default-testCompile/createdFiles.lst | 1 - .../default-testCompile/inputFiles.lst | 1 + ...hu.bme.mit.train.system.TachographTest.xml | 64 +++++++++++++++++++ ...u.bme.mit.train.system.TrainSystemTest.xml | 8 +-- ...hu.bme.mit.train.system.TachographTest.txt | 4 ++ ...u.bme.mit.train.system.TrainSystemTest.txt | 2 +- 12 files changed, 137 insertions(+), 9 deletions(-) create mode 100644 train-system/src/main/java/hu/bme/mit/train/system/Tachograph.java create mode 100644 train-system/src/test/java/hu/bme/mit/train/system/TachographTest.java create mode 100644 train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml create mode 100644 train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt 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 0a444e7a7..796f254ea 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 @@ - + @@ -60,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 57a36cd0f..300f07e92 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.089 sec +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.096 sec diff --git a/train-system/pom.xml b/train-system/pom.xml index bd8083c62..7724838ce 100644 --- a/train-system/pom.xml +++ b/train-system/pom.xml @@ -32,5 +32,10 @@ hu.bme.mit.train.user 0.5.0-SNAPSHOT + + com.google.guava + guava + 31.1-jre + \ No newline at end of file diff --git a/train-system/src/main/java/hu/bme/mit/train/system/Tachograph.java b/train-system/src/main/java/hu/bme/mit/train/system/Tachograph.java new file mode 100644 index 000000000..f77b82260 --- /dev/null +++ b/train-system/src/main/java/hu/bme/mit/train/system/Tachograph.java @@ -0,0 +1,24 @@ +package hu.bme.mit.train.system; + +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Table; + +public class Tachograph{ + + private Table table; + private TrainSystem system; + + public Tachograph(TrainSystem system){ + table = HashBasedTable.create(); + this.system=system; + } + + public void newInput(Integer time){ + table.put(time, system.getUser().getJoystickPosition(), system.getController().getReferenceSpeed()); + } + + public int getReferenceSpeed(int time, int joystickPosition){ + return table.get(time, joystickPosition); + } + +} \ No newline at end of file diff --git a/train-system/src/test/java/hu/bme/mit/train/system/TachographTest.java b/train-system/src/test/java/hu/bme/mit/train/system/TachographTest.java new file mode 100644 index 000000000..41821be38 --- /dev/null +++ b/train-system/src/test/java/hu/bme/mit/train/system/TachographTest.java @@ -0,0 +1,30 @@ +package hu.bme.mit.train.system; + +import static org.junit.Assert.assertEquals; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import hu.bme.mit.train.system.Tachograph; + +public class TachographTest { + public Tachograph graph; + public TrainSystem system; + + + @Before + public void before() { + system=new TrainSystem(); + graph = new Tachograph(system); + } + + + @Test + public void EntryTest(){ + + graph.newInput(0); + assertEquals(graph.getReferenceSpeed(0,system.getUser().getJoystickPosition()), system.getController().getReferenceSpeed()); + } + +} \ No newline at end of file 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 index 2262469d3..f0b622ff5 100644 --- 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 @@ -1 +1,2 @@ /home/cloud/Desktop/mit2/base/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java +/home/cloud/Desktop/mit2/base/train-system/src/main/java/hu/bme/mit/train/system/Tachograph.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 index f347beb05..e69de29bb 100644 --- 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 @@ -1 +0,0 @@ -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 index 77bcec89f..659bad94f 100644 --- 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 @@ -1 +1,2 @@ /home/cloud/Desktop/mit2/base/train-system/src/test/java/hu/bme/mit/train/system/TrainSystemTest.java +/home/cloud/Desktop/mit2/base/train-system/src/test/java/hu/bme/mit/train/system/TachographTest.java diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml new file mode 100644 index 000000000..a0361f3b0 --- /dev/null +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 f1790cec5..3d425e8b6 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 @@ - + @@ -60,7 +60,7 @@ - - - + + + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt new file mode 100644 index 000000000..8a7618b63 --- /dev/null +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: hu.bme.mit.train.system.TachographTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.045 sec 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 27c1f73d4..2fc0fbd38 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: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.116 sec +Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.113 sec From 736d95baef39767b1dd157cca7f8b1d8bd847fbb Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 17 Apr 2023 16:50:03 +0200 Subject: [PATCH 12/13] ref speed mod --- .../train/controller/TrainControllerImpl.java | 17 +++++++++++++++-- .../compile/default-compile/inputFiles.lst | 6 +++--- .../compile/default-compile/inputFiles.lst | 2 +- ...-hu.bme.mit.train.sensor.TrainSensorTest.xml | 8 ++++---- .../hu.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- .../compile/default-compile/createdFiles.lst | 1 + .../default-testCompile/createdFiles.lst | 2 ++ ...T-hu.bme.mit.train.system.TachographTest.xml | 8 ++++---- ...-hu.bme.mit.train.system.TrainSystemTest.xml | 12 ++++++------ .../hu.bme.mit.train.system.TachographTest.txt | 2 +- .../hu.bme.mit.train.system.TrainSystemTest.txt | 2 +- .../compile/default-compile/inputFiles.lst | 2 +- 12 files changed, 40 insertions(+), 24 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 33960ecfd..4a8e49cf6 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 @@ -2,7 +2,7 @@ import hu.bme.mit.train.interfaces.TrainController; -public class TrainControllerImpl implements TrainController { +public class TrainControllerImpl implements TrainController, Runnable { private int step = 0; private int referenceSpeed = 0; @@ -45,11 +45,24 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { - this.step = joystickPosition; + this.step = joystickPosition; + try { + Thread.sleep(100); + } catch (Exception e) { + System.out.println("thread exception"); + } + } @Override public void emergencyBrake(){ this.referenceSpeed=0; } + + + public void run(){ + while(true){ + followSpeed(); + } + } } 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 index 7152c1e0d..44ccb7fa3 100644 --- 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 @@ -1,3 +1,3 @@ -/home/cloud/Desktop/mit2/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainUser.java -/home/cloud/Desktop/mit2/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainSensor.java -/home/cloud/Desktop/mit2/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainController.java +/home/cloud/Desktop/mit_3/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainUser.java +/home/cloud/Desktop/mit_3/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainSensor.java +/home/cloud/Desktop/mit_3/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainController.java 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 index 492fe9c1c..49360e53f 100644 --- 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 @@ -1 +1 @@ -/home/cloud/Desktop/mit2/base/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java +/home/cloud/Desktop/mit_3/base/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.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 index 796f254ea..6b0d93468 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 @@ - + - + @@ -14,7 +14,7 @@ - + @@ -60,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 300f07e92..73943124e 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.096 sec +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.143 sec 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 index 104d0eff5..1ee0512d2 100644 --- 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 @@ -1 +1,2 @@ hu/bme/mit/train/system/TrainSystem.class +hu/bme/mit/train/system/Tachograph.class 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 index e69de29bb..38eb260a7 100644 --- 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 @@ -0,0 +1,2 @@ +hu/bme/mit/train/system/TachographTest.class +hu/bme/mit/train/system/TrainSystemTest.class diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml index a0361f3b0..84c7e2f6e 100644 --- a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml @@ -1,10 +1,10 @@ - + - + @@ -13,7 +13,7 @@ - + @@ -60,5 +60,5 @@ - + \ No newline at end of file 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 3d425e8b6..4ddfa1321 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 @@ - + - + @@ -13,7 +13,7 @@ - + @@ -60,7 +60,7 @@ - - - + + + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt index 8a7618b63..3f3233096 100644 --- a/train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TachographTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.045 sec +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 sec 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 2fc0fbd38..a224a89cc 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: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.113 sec +Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.165 sec 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 index d6b28481b..c3723241c 100644 --- 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 @@ -1 +1 @@ -/home/cloud/Desktop/mit2/base/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java +/home/cloud/Desktop/mit_3/base/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java From 23ee2f0c4ade76162c7c468ee47e86616e0d8b00 Mon Sep 17 00:00:00 2001 From: LaszloAbrok Date: Mon, 17 Apr 2023 17:02:48 +0200 Subject: [PATCH 13/13] fixed review issues --- .../hu/bme/mit/train/controller/TrainControllerImpl.java | 4 ++-- .../compile/default-compile/inputFiles.lst | 2 +- .../testCompile/default-testCompile/inputFiles.lst | 2 +- .../TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml | 4 ++-- .../hu.bme.mit.train.sensor.TrainSensorTest.txt | 2 +- .../TEST-hu.bme.mit.train.system.TachographTest.xml | 4 ++-- .../TEST-hu.bme.mit.train.system.TrainSystemTest.xml | 8 ++++---- .../hu.bme.mit.train.system.TachographTest.txt | 2 +- .../hu.bme.mit.train.system.TrainSystemTest.txt | 2 +- 9 files changed, 15 insertions(+), 15 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 4a8e49cf6..353e29e25 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 @@ -45,9 +45,9 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { - this.step = joystickPosition; try { - Thread.sleep(100); + this.step = joystickPosition; + Thread.sleep(200); } catch (Exception e) { System.out.println("thread exception"); } 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 index 6063b4a14..1e19c82bb 100644 --- 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 @@ -1 +1 @@ -/home/cloud/Desktop/mit2/base/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +/home/cloud/Desktop/mit_3/base/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java 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 index cd1714819..46057dc25 100644 --- 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 @@ -1 +1 @@ -/home/cloud/Desktop/mit2/base/train-sensor/src/test/java/hu/bme/mit/train/sensor/TrainSensorTest.java +/home/cloud/Desktop/mit_3/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 index 6b0d93468..5ec156120 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 @@ - + @@ -60,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 73943124e..451eab3bd 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.143 sec +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.169 sec diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml index 84c7e2f6e..effc07fcf 100644 --- a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TachographTest.xml @@ -1,5 +1,5 @@ - + @@ -60,5 +60,5 @@ - + \ No newline at end of file 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 4ddfa1321..a14296803 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 @@ - + @@ -60,7 +60,7 @@ - - - + + + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt index 3f3233096..6d80d40c6 100644 --- a/train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TachographTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: hu.bme.mit.train.system.TachographTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 sec +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.087 sec 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 a224a89cc..4bdc8b4c9 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: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.165 sec +Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.955 sec