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

refactor

Browse Source
This commit is contained in:
Vladislav Golubinov 2020-09-03 20:02:52 +03:00
parent 3df8472bf8
commit fb890e80dd
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java
View File

@ -58,10 +58,6 @@ public class App {
setArmy(factory.createArmy()); setArmy(factory.createArmy());
} }
King getKing(final KingdomFactory factory) {
return factory.createKing();
}
public King getKing() { public King getKing() {
return king; return king;
} }
@ -70,10 +66,6 @@ public class App {
this.king = king; this.king = king;
} }
Castle getCastle(final KingdomFactory factory) {
return factory.createCastle();
}
public Castle getCastle() { public Castle getCastle() {
return castle; return castle;
} }
@ -82,10 +74,6 @@ public class App {
this.castle = castle; this.castle = castle;
} }
Army getArmy(final KingdomFactory factory) {
return factory.createArmy();
}
public Army getArmy() { public Army getArmy() {
return army; return army;
} }

21
abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java
View File

@ -48,30 +48,39 @@ public class AbstractFactoryTest {
@Test @Test
public void king() { public void king() {
final var elfKing = app.getKing(elfFactory); app.createKingdom(elfFactory);
final var elfKing = app.getKing();
assertTrue(elfKing instanceof ElfKing); assertTrue(elfKing instanceof ElfKing);
assertEquals(ElfKing.DESCRIPTION, elfKing.getDescription()); assertEquals(ElfKing.DESCRIPTION, elfKing.getDescription());
final var orcKing = app.getKing(orcFactory);
app.createKingdom(orcFactory);
final var orcKing = app.getKing();
assertTrue(orcKing instanceof OrcKing); assertTrue(orcKing instanceof OrcKing);
assertEquals(OrcKing.DESCRIPTION, orcKing.getDescription()); assertEquals(OrcKing.DESCRIPTION, orcKing.getDescription());
} }
@Test @Test
public void castle() { public void castle() {
final var elfCastle = app.getCastle(elfFactory); app.createKingdom(elfFactory);
final var elfCastle = app.getCastle();
assertTrue(elfCastle instanceof ElfCastle); assertTrue(elfCastle instanceof ElfCastle);
assertEquals(ElfCastle.DESCRIPTION, elfCastle.getDescription()); assertEquals(ElfCastle.DESCRIPTION, elfCastle.getDescription());
final var orcCastle = app.getCastle(orcFactory);
app.createKingdom(orcFactory);
final var orcCastle = app.getCastle();
assertTrue(orcCastle instanceof OrcCastle); assertTrue(orcCastle instanceof OrcCastle);
assertEquals(OrcCastle.DESCRIPTION, orcCastle.getDescription()); assertEquals(OrcCastle.DESCRIPTION, orcCastle.getDescription());
} }
@Test @Test
public void army() { public void army() {
final var elfArmy = app.getArmy(elfFactory); app.createKingdom(elfFactory);
final var elfArmy = app.getArmy();
assertTrue(elfArmy instanceof ElfArmy); assertTrue(elfArmy instanceof ElfArmy);
assertEquals(ElfArmy.DESCRIPTION, elfArmy.getDescription()); assertEquals(ElfArmy.DESCRIPTION, elfArmy.getDescription());
final var orcArmy = app.getArmy(orcFactory);
app.createKingdom(orcFactory);
final var orcArmy = app.getArmy();
assertTrue(orcArmy instanceof OrcArmy); assertTrue(orcArmy instanceof OrcArmy);
assertEquals(OrcArmy.DESCRIPTION, orcArmy.getDescription()); assertEquals(OrcArmy.DESCRIPTION, orcArmy.getDescription());
} }