Skip to content

Commit

Permalink
Update testMethod names to comply with naming convention
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Kühnel committed May 18, 2020
1 parent ac60ce3 commit cf0c9fe
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion src/main/java/edu/hm/kuehnel/powergrid/datastore/FactoryProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public ResourceMarket newResourceMarket(Edition edition) {
@Override
public Board newBoard(Edition edition) { // ToDo: Caching implementieren.
final Board board = Optional.ofNullable(edition)
.map(n -> new BoardGenerator())
.map(createBoard -> new BoardGenerator())
.orElseThrow(
() -> new IllegalArgumentException("Die Edition darf nicht null sein.")
);
Expand Down
22 changes: 11 additions & 11 deletions src/test/java/edu/hm/kuehnel/powergrid/datastore/BoardGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public Board getSUT() {
}

@Test
public void testCloseRegions_VerifyFunctionality_NumberOfRegionalCitiesOnBoardAndEditionAreEqual() {
public void testCloseRegionsVerifyFunctionalityNumberOfRegionalCitiesOnBoardAndEditionAreEqual() {
Board sut = getSUT();

// Definition der Regionen deren Städte auf dem Spielbrett verbleiben sollen.
Expand All @@ -86,39 +86,39 @@ public void testCloseRegions_VerifyFunctionality_NumberOfRegionalCitiesOnBoardAn
}

@Test (expected = IllegalArgumentException.class)
public void testCloseRegions_RequireArgument_NonNegativeRemaining() {
public void testCloseRegionsRequireArgumentNonNegativeRemaining() {
Board sut = getSUT();
sut.closeRegions(-1);
}

@Test (expected = IllegalStateException.class)
public void testCloseRegions_DenyAction_CloseRegionsWhenBoardIsClosed() {
public void testCloseRegionsDenyActionCloseRegionsWhenBoardIsClosed() {
Board sut = getSUT();
sut.close();
sut.closeRegions(1);
}

@Test (expected = IllegalArgumentException.class)
public void testFindCity_RequireArgument_NonEmptyName() {
public void testFindCityRequireArgumentNonEmptyName() {
Board sut = getSUT();
sut.findCity("");
}

@Test (expected = IllegalArgumentException.class)
public void testFindCity_RequireArgument_NonNullName() {
public void testFindCityRequireArgumentNonNullName() {
Board sut = getSUT();
sut.findCity(null);
}

@Test
public void testFindCity_RequireReturn_NullIfCityIsNotFoundOnBoard() {
public void testFindCityRequireReturnNullIfCityIsNotFoundOnBoard() {
Board sut = getSUT();

assertNull(sut.findCity("Atlantis"));
}

@Test
public void testFindCity_VerifyFunctionality_RandomCityFromEditionIsFoundOnBoard() {
public void testFindCityVerifyFunctionalityRandomCityFromEditionIsFoundOnBoard() {
Board sut = getSUT();

String[] editionCityProperties = edition.getCitySpecifications().get(0).split("\\s+");
Expand All @@ -131,7 +131,7 @@ public void testFindCity_VerifyFunctionality_RandomCityFromEditionIsFoundOnBoard
}

@Test
public void testGetCities_VerifyFunctionality_CompareNumberOfCitiesWithEdition() {
public void testGetCitiesVerifyFunctionalityCompareNumberOfCitiesWithEdition() {
Board sut = getSUT();

int want = edition.getCitySpecifications().size();
Expand All @@ -141,7 +141,7 @@ public void testGetCities_VerifyFunctionality_CompareNumberOfCitiesWithEdition()
}

@Test (expected = UnsupportedOperationException.class)
public void testGetCities_RequireReturn_ImmutableSetWhenBoardIsClosed() {
public void testGetCitiesRequireReturnImmutableSetWhenBoardIsClosed() {
Board sut = getSUT();
City city = factory.newCity("Entenhausen", 1);

Expand All @@ -152,7 +152,7 @@ public void testGetCities_RequireReturn_ImmutableSetWhenBoardIsClosed() {
}

@Test (expected = IllegalStateException.class)
public void testClose_DenyAction_MultipleBoardCloseRequests() {
public void testCloseDenyActionMultipleBoardCloseRequests() {
Board sut = getSUT();

// Der Spielplan wird das erste Mal geschlossen.
Expand All @@ -163,7 +163,7 @@ public void testClose_DenyAction_MultipleBoardCloseRequests() {
}

@Test (expected = IllegalStateException.class)
public void testClose_DenyAction_ClosedCityOnBoardIsClosedAgain() {
public void testCloseDenyActionClosedCityOnBoardIsClosedAgain() {
Board sut = getSUT();

// Der Spielplan wird das erste Mal geschlossen.
Expand Down
36 changes: 18 additions & 18 deletions src/test/java/edu/hm/kuehnel/powergrid/datastore/CityGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import static org.junit.Assert.assertTrue;

/**
* Die Testklasse fuer den CityGenerator
* Die Testklasse fuer den CityGenerator.
* @author Stefan Kuehnel, stefan.kuehnel@hm.edu
* @version last-modified 2020-05-16
*/
Expand Down Expand Up @@ -59,44 +59,44 @@ public City getSUT() {
}

@Test (expected = IllegalArgumentException.class)
public void testNewCity_RequireArgument_NonNullName() {
public void testNewCityRequireArgumentNonNullName() {
final String name = null;
final int region = 1;
getSUT(name, region);
}

@Test (expected = IllegalArgumentException.class)
public void testNewCity_RequireArgument_NonEmptyName() {
public void testNewCityRequireArgumentNonEmptyName() {
final String name = "";
final int region = 1;
getSUT(name, region);
}

@Test
public void testGetName() {
public void testGetNameVerifyFunctionalitySuppliedAndReturnedCityNameAreEqual() {
final City sut = getSUT();
final String want = "Entenhausen";
final String have = sut.getName();
assertEquals(want, have);
}

@Test (expected = IllegalArgumentException.class)
public void testNewCity_RequireArgument_RegionNumberGreaterOrEqualOne() {
public void testNewCityRequireArgumentRegionNumberGreaterOrEqualOne() {
final String name = "Entenhausen";
final int region = -1;
getSUT(name, region);
}

@Test
public void testGetRegion_VerifyFunctionality_SuppliedAndReturnedRegionNumbersAreEqual() {
public void testGetRegionVerifyFunctionalitySuppliedAndReturnedRegionNumbersAreEqual() {
final City sut = getSUT();
final int want = 1;
final int have = sut.getRegion();
assertEquals(want, have);
}

@Test (expected = IllegalStateException.class)
public void testConnect_RequireArgument_NonClosedCity() {
public void testConnectRequireArgumentNonClosedCity() {
final City sut = getSUT();

// Initialisieren der zu verbindenden Stadt.
Expand All @@ -111,13 +111,13 @@ public void testConnect_RequireArgument_NonClosedCity() {
}

@Test (expected = IllegalArgumentException.class)
public void testConnect_RequireArgument_NotThisCity() {
public void testConnectRequireArgumentNotThisCity() {
final City sut = getSUT();
sut.connect(sut, 1);
}

@Test (expected = IllegalArgumentException.class)
public void testConnect_RequireArgument_NonIdenticalCity() {
public void testConnectRequireArgumentNonIdenticalCity() {
final City sut = getSUT();

final City city = getSUT("Entenhausen", 1);
Expand All @@ -127,7 +127,7 @@ public void testConnect_RequireArgument_NonIdenticalCity() {
}

@Test (expected = IllegalArgumentException.class)
public void testConnect_RequireArgument_NonConnectedCity() {
public void testConnectRequireArgumentNonConnectedCity() {
final City sut = getSUT();

final City city = getSUT("Entenhausen", 1);
Expand All @@ -141,7 +141,7 @@ public void testConnect_RequireArgument_NonConnectedCity() {
}

@Test (expected = IllegalArgumentException.class)
public void testConnect_RequireArgument_NonNullCity() {
public void testConnectRequireArgumentNonNullCity() {
final City sut = getSUT();

final City city = null;
Expand All @@ -151,7 +151,7 @@ public void testConnect_RequireArgument_NonNullCity() {
}

@Test (expected = IllegalArgumentException.class)
public void testConnect_RequireArgument_NonNegativeCosts() {
public void testConnectRequireArgumentNonNegativeCosts() {
final City sut = getSUT();

final City city = getSUT("Entenburg", 2);
Expand All @@ -161,7 +161,7 @@ public void testConnect_RequireArgument_NonNegativeCosts() {
}

@Test
public void testConnect_VerifyFunctionality_CheckIfCityIsIndeedConnected() {
public void testConnectVerifyFunctionalityCheckIfCityIsIndeedConnected() {
final City sut = getSUT();

// Die zu verbindende Stadt wird erstellt.
Expand All @@ -178,15 +178,15 @@ public void testConnect_VerifyFunctionality_CheckIfCityIsIndeedConnected() {
}

@Test (expected = IllegalStateException.class)
public void testGetConnections_RequireReturn_NonEmptyMap() {
public void testGetConnectionsRequireReturnNonEmptyMap() {
final City sut = getSUT();

// Das Auslesen der leeren Verbindungsliste wird einen Fehler verursachen.
sut.getConnections();
}

@Test (expected = UnsupportedOperationException.class)
public void testGetConnections_RequireReturn_ImmutableMapWhenCityIsClosed() {
public void testGetConnectionsRequireReturnImmutableMapWhenCityIsClosed() {
final City sut = getSUT();

// Die zu verbindende Stadt wird erstellt.
Expand All @@ -204,7 +204,7 @@ public void testGetConnections_RequireReturn_ImmutableMapWhenCityIsClosed() {
}

@Test
public void testGetConnections_VerifyFunctionality_CityIsProperlyConnected() {
public void testGetConnectionsVerifyFunctionalityCityIsProperlyConnected() {
final City sut = getSUT();

// Die zu verbindende Stadt wird erstellt.
Expand All @@ -221,7 +221,7 @@ public void testGetConnections_VerifyFunctionality_CityIsProperlyConnected() {
}

@Test (expected = IllegalStateException.class)
public void testClose_DenyAction_MultipleCityCloseRequests() {
public void testCloseDenyActionMultipleCityCloseRequests() {
final City sut = getSUT();

// Die Stadt wird zum ersten Mal geschlossen.
Expand All @@ -232,7 +232,7 @@ public void testClose_DenyAction_MultipleCityCloseRequests() {
}

@Test
public void testCompareTo_VerifyFunctionality_SuppliedAndReturnedNaturalOrdersAreEqual() {
public void testCompareToVerifyFunctionalitySuppliedAndReturnedNaturalOrdersAreEqual() {
final City sut = getSUT();

final City city = getSUT("Entenburg", 1);
Expand Down
22 changes: 11 additions & 11 deletions src/test/java/edu/hm/kuehnel/powergrid/datastore/FactoryProviderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import static org.junit.Assert.assertTrue;

/**
* Die Testklasse fuer den FactoryProvider
* Die Testklasse fuer den FactoryProvider.
* @author Stefan Kühnel, stefan.kuehnel@hm.edu
* @version last-modified 2020-05-18
*/
Expand All @@ -45,7 +45,7 @@ public FactoryProviderTest() throws IOException {
}

@Test
public void testNewCity_VerifyFunctionality_CompareCityNameWithActualName() {
public void testNewCityVerifyFunctionalityCompareCityNameWithActualName() {
// arrange
final String cityName = "Entenhausen";
final int cityRegion = 1;
Expand All @@ -61,7 +61,7 @@ public void testNewCity_VerifyFunctionality_CompareCityNameWithActualName() {
}

@Test
public void testNewCity_VerifyFunctionality_CompareCityRegionWithActualRegion() {
public void testNewCityVerifyFunctionalityCompareCityRegionWithActualRegion() {
// arrange
final String cityName = "Entenhausen";
final int cityRegion = 1;
Expand All @@ -77,7 +77,7 @@ public void testNewCity_VerifyFunctionality_CompareCityRegionWithActualRegion()
}

@Test
public void testNewBoard_VerifyFunctionality_CitiesAreConnectedViceVersa() {
public void testNewBoardVerifyFunctionalityCitiesAreConnectedViceVersa() {
Edition edition = new EditionGermany();
Board sut = factory.newBoard(edition);

Expand All @@ -94,14 +94,14 @@ public void testNewBoard_VerifyFunctionality_CitiesAreConnectedViceVersa() {
}

@Test (expected = IllegalArgumentException.class)
public void testNewBoard_RequireArgument_NonNullEdition() {
public void testNewBoardRequireArgumentNonNullEdition() {
Board sut = factory.newBoard(null);
}

/** NACHFOLGEND WERDEN LEDIGLICH DUMMY TEST IMPLEMENTIERUNGEN OHNE MEHRWERT VERWENDET. */

@Test
public void testNewPlayer_RequireReturn_DummyNull() {
public void testNewPlayerRequireReturnDummyNull() {
String secret = "Geheimnis";
String color = "Farbe";

Expand All @@ -111,7 +111,7 @@ public void testNewPlayer_RequireReturn_DummyNull() {
}

@Test
public void testNewPlant_RequireReturn_DummyNull() {
public void testNewPlantRequireReturnDummyNull() {
int number = 1;
int resources = 1;
int cities = 1;
Expand All @@ -122,7 +122,7 @@ public void testNewPlant_RequireReturn_DummyNull() {
}

@Test
public void testNewPlantMarket_RequireReturn_DummyNull() {
public void testNewPlantMarketRequireReturnDummyNull() {
Edition edition = new EditionGermany();

PlantMarket sut = factory.newPlantMarket(edition);
Expand All @@ -131,7 +131,7 @@ public void testNewPlantMarket_RequireReturn_DummyNull() {
}

@Test
public void testNewResourceMarket_RequireReturn_DummyNull() {
public void testNewResourceMarketRequireReturnDummyNull() {
Edition edition = new EditionGermany();

ResourceMarket sut = factory.newResourceMarket(edition);
Expand All @@ -140,7 +140,7 @@ public void testNewResourceMarket_RequireReturn_DummyNull() {
}

@Test
public void testNewAuction_RequireReturn_DummyNull() {
public void testNewAuctionRequireReturnDummyNull() {
Plant plant = null;
List<Player> players = null;

Expand All @@ -150,7 +150,7 @@ public void testNewAuction_RequireReturn_DummyNull() {
}

@Test
public void testNewGame_RequireReturn_DummyNull() {
public void testNewGameRequireReturnDummyNull() {
Edition edition = new EditionGermany();

Game sut = factory.newGame(edition);
Expand Down

0 comments on commit cf0c9fe

Please sign in to comment.