gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add java 11 support (o) (#1222)

Browse Source
This commit is contained in:
Zhang WH
2020-04-26 20:06:09 +08:00
committed by GitHub
parent 751b3b9452
commit 845da1fa16
14 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
object-mother/src/main/java/com/iluwatar/objectmother/King.java
View File

@ -60,7 +60,7 @@ public class King implements Royalty {
* @param queen Queen which should be flirted.
*/
public void flirt(Queen queen) {
boolean flirtStatus = queen.getFlirted(this);
var flirtStatus = queen.getFlirted(this);
if (!flirtStatus) {
this.makeUnhappy();
} else {

8
object-mother/src/main/java/com/iluwatar/objectmother/RoyaltyObjectMother.java
View File

@ -43,7 +43,7 @@ public final class RoyaltyObjectMother {
* @return A drunk {@link com.iluwatar.objectmother.King}.
*/
public static King createDrunkKing() {
King king = new King();
var king = new King();
king.makeDrunk();
return king;
}
@ -54,7 +54,7 @@ public final class RoyaltyObjectMother {
* @return A happy {@link com.iluwatar.objectmother.King}.
*/
public static King createHappyKing() {
King king = new King();
var king = new King();
king.makeHappy();
return king;
}
@ -65,7 +65,7 @@ public final class RoyaltyObjectMother {
* @return A drunk and happy {@link com.iluwatar.objectmother.King}.
*/
public static King createHappyDrunkKing() {
King king = new King();
var king = new King();
king.makeHappy();
king.makeDrunk();
return king;
@ -77,7 +77,7 @@ public final class RoyaltyObjectMother {
* @return A flirty {@link com.iluwatar.objectmother.Queen}.
*/
public static Queen createFlirtyQueen() {
Queen queen = new Queen();
var queen = new Queen();
queen.setFlirtiness(true);
return queen;
}

28
object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java
View File

@ -40,50 +40,50 @@ public class RoyaltyObjectMotherTest {
@Test
public void unsuccessfulKingFlirt() {
King soberUnhappyKing = RoyaltyObjectMother.createSoberUnhappyKing();
Queen flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
var soberUnhappyKing = RoyaltyObjectMother.createSoberUnhappyKing();
var flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
soberUnhappyKing.flirt(flirtyQueen);
assertFalse(soberUnhappyKing.isHappy());
}
@Test
public void queenIsBlockingFlirtCauseDrunkKing() {
King drunkUnhappyKing = RoyaltyObjectMother.createDrunkKing();
Queen notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
var drunkUnhappyKing = RoyaltyObjectMother.createDrunkKing();
var notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
drunkUnhappyKing.flirt(notFlirtyQueen);
assertFalse(drunkUnhappyKing.isHappy());
}
@Test
public void queenIsBlockingFlirt() {
King soberHappyKing = RoyaltyObjectMother.createHappyKing();
Queen notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
var soberHappyKing = RoyaltyObjectMother.createHappyKing();
var notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
soberHappyKing.flirt(notFlirtyQueen);
assertFalse(soberHappyKing.isHappy());
}
@Test
public void successfullKingFlirt() {
King soberHappyKing = RoyaltyObjectMother.createHappyKing();
Queen flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
var soberHappyKing = RoyaltyObjectMother.createHappyKing();
var flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
soberHappyKing.flirt(flirtyQueen);
assertTrue(soberHappyKing.isHappy());
}
@Test
public void testQueenType() {
Royalty flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
Royalty notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
var flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
var notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
assertEquals(flirtyQueen.getClass(), Queen.class);
assertEquals(notFlirtyQueen.getClass(), Queen.class);
}
@Test
public void testKingType() {
Royalty drunkKing = RoyaltyObjectMother.createDrunkKing();
Royalty happyDrunkKing = RoyaltyObjectMother.createHappyDrunkKing();
Royalty happyKing = RoyaltyObjectMother.createHappyKing();
Royalty soberUnhappyKing = RoyaltyObjectMother.createSoberUnhappyKing();
var drunkKing = RoyaltyObjectMother.createDrunkKing();
var happyDrunkKing = RoyaltyObjectMother.createHappyDrunkKing();
var happyKing = RoyaltyObjectMother.createHappyKing();
var soberUnhappyKing = RoyaltyObjectMother.createSoberUnhappyKing();
assertEquals(drunkKing.getClass(), King.class);
assertEquals(happyDrunkKing.getClass(), King.class);
assertEquals(happyKing.getClass(), King.class);