Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reference speed update #362

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.organization>szfp98</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
</properties>

<packaging>pom</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ private void enforceSpeedLimit() {

@Override
public void setJoystickPosition(int joystickPosition) {
this.step = joystickPosition;
this.step = joystickPosition;
followSpeed();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@

public interface TrainUser {

boolean alarmState = false;

int getJoystickPosition();

boolean getAlarmFlag();

void overrideJoystickPosition(int joystickPosition);

public boolean getAlarmState();

public void setAlarmState(boolean alarmState);

}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ public int getSpeedLimit() {
public void overrideSpeedLimit(int speedLimit) {
this.speedLimit = speedLimit;
controller.setSpeedLimit(speedLimit);

if(speedLimit < 0 || speedLimit > 500 || speedLimit < controller.getReferenceSpeed() / 2) {
user.setAlarmState(true);
}
}

}
Original file line number Diff line number Diff line change
@@ -1,19 +1,48 @@
package hu.bme.mit.train.sensor;

import hu.bme.mit.train.interfaces.TrainController;
import hu.bme.mit.train.sensor.TrainSensorImpl;
import hu.bme.mit.train.interfaces.TrainUser;

import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import static org.mockito.Mockito.*;

public class TrainSensorTest {
public class TrainSensorTest {

TrainController mockTC;
TrainUser mockTU;
TrainSensorImpl trainSensor;

@Before
public void before() {
// TODO Add initializations
mockTC = mock(TrainController.class);
mockTU = mock(TrainUser.class);
trainSensor = new TrainSensorImpl(mockTC, mockTU);
}

@Test
public void setAlarmState_TrainUser_Min() {
trainSensor.overrideSpeedLimit(-1);
verify(mockTU, times(1)).setAlarmState(true);
}

@Test
public void setAlarmState_TrainUser_Max() {
trainSensor.overrideSpeedLimit(501);
verify(mockTU, times(1)).setAlarmState(true);
}

@Test
public void setAlarmState_TrainUser_RelativeLimit() {
trainSensor.overrideSpeedLimit(3);
verify(mockTU, times(1)).setAlarmState(true);
}

@Test
public void ThisIsAnExampleTestStub() {
// TODO Delete this and add test cases based on the issues
public void setAlarmState_TrainUser_Between() {
trainSensor.overrideSpeedLimit(300);
verify(mockTU, times(0)).setAlarmState(false);
}
}
13 changes: 13 additions & 0 deletions train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,19 @@ public int getJoystickPosition() {
public void overrideJoystickPosition(int joystickPosition) {
this.joystickPosition = joystickPosition;
controller.setJoystickPosition(joystickPosition);

controller.followSpeed();
}

@Override
public boolean getAlarmState() {
return alarmState;
}

public void setAlarmState(boolean alarmState) {
alarmState = alarmState;
}



}