Skip to content

[fix] Client: getDataForComp Parameteranpassung #3

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.

Sign up for GitHub

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

Merged
philipkbh merged 3 commits into from
Dec 7, 2021
Merged

[fix] Client: getDataForComp Parameteranpassung #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b6ac83
[fix] getDataForComp: Parameter dataType
Dec 5, 2021
ed0cd81
[test] Anpassung ClientTest bzgl. Parameter
Dec 5, 2021
2adf8d2
Merge branch 'main' into patch-analyseclient
philipkbh Dec 6, 2021
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
2 changes: 1 addition & 1 deletion src/main/java/github/weichware10/analyse/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public boolean getData(DateTime start, DateTime end, ToolType dataType) {
* wurden;
* false, falls benötigte Daten zum Vergleich nicht gefunden wurden
*/
public boolean getDataForComp(DateTime start, DateTime end) {
public boolean getDataForComp(DateTime start, DateTime end, ToolType dataType) {
if (start.isAfter(end) || start.isAfter(DateTime.now()) || end.isAfter(DateTime.now())) {
return false;
}
Expand Down
16 changes: 8 additions & 8 deletions src/test/java/github/weichware10/analyse/ClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,44 +123,44 @@ public void dataForCompShouldBeSet() {
Client client1 = new Client();
assertTrue("getDataForComp sollte True zurückgeben", client1.getDataForComp(
new DateTime(2021, 11, 28, 16, 0, 0),
new DateTime(2021, 11, 28, 19, 0, 0)));
new DateTime(2021, 11, 28, 19, 0, 0), ToolType.ZOOMMAPS));

Client client2 = new Client();
assertTrue("getDataForComp sollte True zurückgeben", client2.getDataForComp(
new DateTime(2021, 11, 28, 15, 0, 0),
new DateTime(2021, 11, 28, 18, 0, 0)));
new DateTime(2021, 11, 28, 18, 0, 0), ToolType.EYETRACKING));

Client client3 = new Client();
assertTrue("getDataForComp sollte True zurückgeben", client3.getDataForComp(
new DateTime(2021, 11, 28, 19, 0, 0),
new DateTime(2021, 11, 28, 20, 0, 0)));
new DateTime(2021, 11, 28, 20, 0, 0), ToolType.CODECHARTS));

// * Falsche Zeiteingabe
Client client7 = new Client();
assertFalse("getDataForComp sollte False zurückgeben", client7.getDataForComp(
new DateTime(2021, 11, 28, 18, 0, 0),
new DateTime(2021, 11, 28, 17, 0, 0)));
new DateTime(2021, 11, 28, 17, 0, 0), ToolType.ZOOMMAPS));

Client client8 = new Client();
assertFalse("getDataForComp sollte False zurückgeben", client8.getDataForComp(
new DateTime(2021, 11, 28, 18, 0, 0),
new DateTime(2021, 11, 28, 17, 0, 0)));
new DateTime(2021, 11, 28, 17, 0, 0), ToolType.EYETRACKING));

Client client9 = new Client();
assertFalse("getDataForComp sollte False zurückgeben", client9.getDataForComp(
new DateTime(2021, 11, 28, 18, 0, 0),
new DateTime(2021, 11, 28, 17, 0, 0)));
new DateTime(2021, 11, 28, 17, 0, 0), ToolType.CODECHARTS));

// * Zeitpunkt in der Zunkunft
Client client10 = new Client();
assertFalse("getDataForComp sollte False zurückgeben", client10.getDataForComp(
new DateTime(2021, 11, 28, 18, 0, 0),
DateTime.now().plusMinutes(5)));
DateTime.now().plusMinutes(5), ToolType.ZOOMMAPS));

Client client11 = new Client();
assertFalse("getDataForComp sollte False zurückgeben", client11.getDataForComp(
DateTime.now().plusMinutes(5),
DateTime.now().plusMinutes(10)));
DateTime.now().plusMinutes(10), ToolType.EYETRACKING));
}

// ? Woher kommen Daten für den Export?
Expand Down