Merge branch 'master' into master

strategy/README.md

@@ -3,7 +3,6 @@ layout: pattern
 title: Strategy
 folder: strategy
 permalink: /patterns/strategy/
-pumlid: FSV13OCm30NGLM00udktCS4AGOaJsTz5tRwSkBstLiqj3WbhombC_n0PtwbKdB67Y-MX44NAerDjSJFOwE8lRuTuBRfD1iJKgRC_88SnfFn8aD-ai9vczFO7
 categories: Behavioral
 tags:
  - Java

strategy/etc/strategy.urm.puml

@@ -1,37 +0,0 @@
-@startuml
-package com.iluwatar.strategy {
-  class App {
-    - LOGGER : Logger {static}
-    + App()
-    + main(args : String[]) {static}
-  }
-  class DragonSlayer {
-    - strategy : DragonSlayingStrategy
-    + DragonSlayer(strategy : DragonSlayingStrategy)
-    + changeStrategy(strategy : DragonSlayingStrategy)
-    + goToBattle()
-  }
-  interface DragonSlayingStrategy {
-    + execute() {abstract}
-  }
-  class MeleeStrategy {
-    - LOGGER : Logger {static}
-    + MeleeStrategy()
-    + execute()
-  }
-  class ProjectileStrategy {
-    - LOGGER : Logger {static}
-    + ProjectileStrategy()
-    + execute()
-  }
-  class SpellStrategy {
-    - LOGGER : Logger {static}
-    + SpellStrategy()
-    + execute()
-  }
-}
-DragonSlayer -->  "-strategy" DragonSlayingStrategy
-MeleeStrategy ..|> DragonSlayingStrategy 
-ProjectileStrategy ..|> DragonSlayingStrategy 
-SpellStrategy ..|> DragonSlayingStrategy 
-@enduml

strategy/pom.xml

@@ -29,13 +29,23 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.19.0-SNAPSHOT</version>
   </parent>
   <artifactId>strategy</artifactId>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

strategy/src/test/java/com/iluwatar/strategy/AppTest.java

@@ -22,7 +22,7 @@
  */
 package com.iluwatar.strategy;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * 

strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java

@@ -22,7 +22,7 @@
  */
 package com.iluwatar.strategy;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java

@@ -25,11 +25,10 @@ package com.iluwatar.strategy;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.AppenderBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
@@ -37,21 +36,19 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Date: 12/29/15 - 10:58 PM
  *
  * @author Jeroen Meulemeester
  */
-@RunWith(Parameterized.class)
 public class DragonSlayingStrategyTest {
 
   /**
    * @return The test parameters for each cycle
    */
-  @Parameterized.Parameters
-  public static Collection<Object[]> data() {
+  static Collection<Object[]> dataProvider() {
     return Arrays.asList(
         new Object[]{
             new MeleeStrategy(),
@@ -68,47 +65,27 @@ public class DragonSlayingStrategyTest {
     );
   }
 
-  /**
-   * The tested strategy
-   */
-  private final DragonSlayingStrategy strategy;
-
-  /**
-   * The expected action in the log
-   */
-  private final String expectedResult;
-
   private InMemoryAppender appender;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     appender = new InMemoryAppender();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     appender.stop();
   }
 
 
-  /**
-   * Create a new test instance for the given strategy
-   *
-   * @param strategy       The tested strategy
-   * @param expectedResult The expected result
-   */
-  public DragonSlayingStrategyTest(final DragonSlayingStrategy strategy, final String expectedResult) {
-    this.strategy = strategy;
-    this.expectedResult = expectedResult;
-  }
-
   /**
    * Test if executing the strategy gives the correct response
    */
-  @Test
-  public void testExecute() {
-    this.strategy.execute();
-    assertEquals(this.expectedResult, appender.getLastMessage());
+  @ParameterizedTest
+  @MethodSource("dataProvider")
+  public void testExecute(DragonSlayingStrategy strategy, String expectedResult) {
+    strategy.execute();
+    assertEquals(expectedResult, appender.getLastMessage());
     assertEquals(1, appender.getLogSize());
   }