ZHAW-IT21b_WIN
/
team02-AngryNerds-projekt2-turnierverwaltung
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring of Factory.java #44

Merged
schrom01 merged 2 commits from refactoring_of_factory into main 2022-05-13 15:17:15 +02:00
Conversation 0 Commits 2 Files Changed 8 +167 -25
5 changed files with 167 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e9d42b719b - Show all commits

6
app/build.gradle
View File

@ -26,6 +26,8 @@ dependencies {
// Use JUnit Jupiter for testing.
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
testImplementation 'org.mockito:mockito-core:4.3.+'
// This dependency is used by the application.
implementation 'com.google.guava:guava:30.1.1-jre'
@ -37,7 +39,9 @@ application {
mainClass = 'ch.zhaw.projekt2.turnierverwaltung.App'
}
tasks.named('test') {
test {
// Use JUnit Platform for unit tests.
useJUnitPlatform()
}

4
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Place.java
View File

@ -29,4 +29,8 @@ public class Place implements Serializable {
public boolean equals(Place place){
return name.equals(place.getName());
}
public void change(Place place) {
//TODO: If Place gets more developed in future releases
}
}

27
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
View File

@ -2,6 +2,7 @@ package ch.zhaw.projekt2.turnierverwaltung;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
@ -107,10 +108,14 @@ public class Tournament implements Serializable {
* Method to add a new Place, also checks if place does already exist.
*
* @param newPlace to be added in the list of all places
* @throws PlaceExistsException if the place already exists
*/
public void addPlace(Place newPlace) throws PlaceExistsException {
places.removeIf(place -> place.equals(newPlace));
public void savePlace(Place newPlace) {
for (Place place : places) {
if (place.equals(newPlace)) {
place.change(newPlace);
return;
}
}
places.add(newPlace);
}
@ -228,7 +233,7 @@ public class Tournament implements Serializable {
* @param type
*/
public void setType(Type type) {
logger.fine("Setting the type of the tournament to: " + type);
logger.fine("Setting the type of the tournament to: " + type);
this.type = type;
}
@ -295,20 +300,6 @@ public class Tournament implements Serializable {
}
/**
* Custom Exception thrown when a Place does already exist
*/
public class PlaceExistsException extends Exception {
public PlaceExistsException() {
super();
}
public PlaceExistsException(String errorMessage) {
super(errorMessage);
}
}
/**
* Custom Exception thrown when a Place does not exist
*/

8
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
View File

@ -27,7 +27,7 @@ public class TournamentDecorator implements IsObservable{
}
}
});
executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
executorService = Executors.newFixedThreadPool(1);
}
public void setFactoryDecorator(FactoryDecorator factoryDecorator) {
@ -148,13 +148,9 @@ public class TournamentDecorator implements IsObservable{
public void savePlace(String name){
try {
tournament.addPlace(new Place(name));
tournament.savePlace(new Place(name));
factoryDecorator.clearMessage(true);
informListener();
} catch (Tournament.PlaceExistsException e) {
e.printStackTrace(); //TODO handle and logging
factoryDecorator.printMessageToFooter("Ort existiert bereits",true);
} catch (InvalidNameException e) {
e.printStackTrace(); //TODO handle and logging
factoryDecorator.printMessageToFooter("Invalider Ortsname",true);

147
app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/TournamentTest.java Normal file
View File

@ -0,0 +1,147 @@
package ch.zhaw.projekt2.turnierverwaltung;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@DisplayName("TournamentTest")
public class TournamentTest {
@Nested
@DisplayName("KOMode")
public class KOMode {
private Tournament tournament;
@BeforeEach
void setup() {
try {
tournament = new Tournament("Name", Tournament.Type.KO);
} catch (InvalidNameException e) {
e.printStackTrace();
fail();
} catch (Tournament.InvalidTypeException e) {
e.printStackTrace();
fail();
}
}
@Test
@DisplayName("Test invalid instance")
void makeInvalidInstance() {
assertThrows(InvalidNameException.class, () -> new Tournament(".", Tournament.Type.KO));
}
@Test
@DisplayName("Save Participant")
void saveParticipantTest() {
//Checks if one Participant gets added
Participant participantOne = Mockito.mock(Player.class);
when(participantOne.equals(any(Participant.class))).thenReturn(false);
assertEquals(0, tournament.getParticipants().size());
tournament.saveParticipant(participantOne);
assertEquals(1, tournament.getParticipants().size());
//Checks if a second Participant gets added
Participant participantTwo = Mockito.mock(Player.class);
tournament.saveParticipant(participantTwo);
assertEquals(2, tournament.getParticipants().size());
//Checks if a allready added Particpant does not get added
when(participantOne.equals(any(Participant.class))).thenReturn(true);
tournament.saveParticipant(participantTwo);
assertEquals(2, tournament.getParticipants().size());
}
@Test
@DisplayName("Remove Participant")
void removeParticipantTest() {
Participant participant = Mockito.mock(Player.class);
//Checks if Error is thrown if Participant not in list
assertThrows(Tournament.ParticipantNotExistsException.class, () -> tournament.removeParticipant(participant));
//Checks if participant gets removed
tournament.saveParticipant(participant);
assertEquals(1, tournament.getParticipants().size());
try {
tournament.removeParticipant(participant);
assertEquals(0, tournament.getParticipants().size());
} catch (Tournament.ParticipantNotExistsException e) {
fail();
}
}
@Test
@DisplayName("Add Place")
void addPlaceTest() {
Place place = mock(Place.class);
when(place.equals(any(Place.class))).thenReturn(false).thenReturn(true);
assertEquals(0, tournament.getPlaces().size());
tournament.savePlace(place);
assertEquals(1, tournament.getPlaces().size());
tournament.savePlace(place);
assertEquals(2, tournament.getPlaces().size());
tournament.savePlace(place);
assertEquals(2, tournament.getPlaces().size());
}
@Test
@DisplayName("Remove Place")
void removePlaceTest() {
Place place = mock(Place.class);
assertThrows(Tournament.PlaceNotExistsException.class, () -> tournament.removePlace(place));
tournament.savePlace(place);
assertEquals(1, tournament.getPlaces().size());
try {
tournament.removePlace(place);
assertEquals(0, tournament.getPlaces().size());
} catch (Tournament.PlaceNotExistsException e) {
fail();
}
}
@Test
@DisplayName("Test gameschedule calculation")
void calcGameSchedule() {
Participant participant = mock(Player.class);
when(participant.equals(any(Participant.class))).thenReturn(false);
//Checks if invalid number of Participants throws error
assertThrows(Tournament.NumberOfParticipantInvalidException.class, () -> tournament.createGameSchedule());
for (int i = 0; i < 8; i++) {
if (i % 4 == 0 && i > 0) {
try {
tournament.createGameSchedule();
assertEquals(2, tournament.getGameList().size());
tournament.saveParticipant(participant);
} catch (Tournament.NumberOfParticipantInvalidException e) {
fail();
}
} else {
assertThrows(Tournament.NumberOfParticipantInvalidException.class, () -> tournament.createGameSchedule());
tournament.saveParticipant(participant);
}
}
try {
tournament.createGameSchedule();
} catch (Tournament.NumberOfParticipantInvalidException e) {
fail();
}
assertEquals(3, tournament.getGameList().size());
}
}
}