From fb890e80ddfd8ac5f4f8be4e84140b2eb1f61015 Mon Sep 17 00:00:00 2001
From: Vladislav Golubinov <vlad.vdlald@gmail.com>
Date: Thu, 3 Sep 2020 20:02:52 +0300
Subject: [PATCH] refactor

---
 .../com/iluwatar/abstractfactory/App.java     | 12 -----------
 .../abstractfactory/AbstractFactoryTest.java  | 21 +++++++++++++------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java
index e158ece74..21b4af305 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java
+++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java
@@ -58,10 +58,6 @@ public class App {
     setArmy(factory.createArmy());
   }
 
-  King getKing(final KingdomFactory factory) {
-    return factory.createKing();
-  }
-
   public King getKing() {
     return king;
   }
@@ -70,10 +66,6 @@ public class App {
     this.king = king;
   }
 
-  Castle getCastle(final KingdomFactory factory) {
-    return factory.createCastle();
-  }
-
   public Castle getCastle() {
     return castle;
   }
@@ -82,10 +74,6 @@ public class App {
     this.castle = castle;
   }
 
-  Army getArmy(final KingdomFactory factory) {
-    return factory.createArmy();
-  }
-
   public Army getArmy() {
     return army;
   }
diff --git a/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java b/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java
index f3db525a1..1506844cf 100644
--- a/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java
+++ b/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java
@@ -48,30 +48,39 @@ public class AbstractFactoryTest {
 
   @Test
   public void king() {
-    final var elfKing = app.getKing(elfFactory);
+    app.createKingdom(elfFactory);
+    final var elfKing = app.getKing();
     assertTrue(elfKing instanceof ElfKing);
     assertEquals(ElfKing.DESCRIPTION, elfKing.getDescription());
-    final var orcKing = app.getKing(orcFactory);
+
+    app.createKingdom(orcFactory);
+    final var orcKing = app.getKing();
     assertTrue(orcKing instanceof OrcKing);
     assertEquals(OrcKing.DESCRIPTION, orcKing.getDescription());
   }
 
   @Test
   public void castle() {
-    final var elfCastle = app.getCastle(elfFactory);
+    app.createKingdom(elfFactory);
+    final var elfCastle = app.getCastle();
     assertTrue(elfCastle instanceof ElfCastle);
     assertEquals(ElfCastle.DESCRIPTION, elfCastle.getDescription());
-    final var orcCastle = app.getCastle(orcFactory);
+
+    app.createKingdom(orcFactory);
+    final var orcCastle = app.getCastle();
     assertTrue(orcCastle instanceof OrcCastle);
     assertEquals(OrcCastle.DESCRIPTION, orcCastle.getDescription());
   }
 
   @Test
   public void army() {
-    final var elfArmy = app.getArmy(elfFactory);
+    app.createKingdom(elfFactory);
+    final var elfArmy = app.getArmy();
     assertTrue(elfArmy instanceof ElfArmy);
     assertEquals(ElfArmy.DESCRIPTION, elfArmy.getDescription());
-    final var orcArmy = app.getArmy(orcFactory);
+
+    app.createKingdom(orcFactory);
+    final var orcArmy = app.getArmy();
     assertTrue(orcArmy instanceof OrcArmy);
     assertEquals(OrcArmy.DESCRIPTION, orcArmy.getDescription());
   }