Test coverage (#199)

* Test coverage for Challenges Command * Added CompleteChallengeCommand test class * Added Utils test class * Added ChallengesGUI test class * Fix code smells from sonarcloud analysis * Added .gitignore * Added Travis CI config file * WIP ChallengesManager Test class * Added ChallengesManager test class * Removed debug * Removed code smells. * Added ChallengesAddon test class. * Added onDisbale test * Added new TryToComplete test class - WIP Covers inventory challenges. * Added Island Challenge entity tests to TryToComplete test class
BentoBoxWorld · Oct 30, 2019 · 9d45f08 · 9d45f08
1 parent d1c9e8f
commit 9d45f08
Show file tree

Hide file tree

Showing 23 changed files with 4,975 additions and 2,006 deletions.
diff --git a/.gitignore b/.gitignore
@@ -130,4 +130,5 @@ local.properties
 .springBeans
 /target/
 checkstyle.xml
-classes/
+classes/
+/.DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,21 @@
+language: java
+sudo: false
+addons:
+    sonarcloud:
+        organization: "bentobox-world"
+        token:
+            secure: $SONAR_TOKEN
+        branches:
+            - develop
+            - master
+jdk:
+    - openjdk8
+
+script:
+    #- sonar-scanner
+    - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package -P sonar sonar:sonar -B
+    #- echo "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
+cache:
+    directories:
+        - '$HOME/.m2/repository'
+        - '$HOME/.sonar/cache'
diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<powermock.version>1.7.4</powermock.version>
+		<powermock.version>2.0.2</powermock.version>
 		<!-- More visible way how to change dependency versions -->
 		<spigot.version>1.14.4-R0.1-SNAPSHOT</spigot.version>
 		<bentobox.version>1.7.0</bentobox.version>
@@ -129,24 +129,25 @@
 			<version>${spigot.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
-		</dependency>
+        <!-- Mockito (Unit testing) -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
 		<dependency>
 			<groupId>world.bentobox</groupId>
 			<artifactId>bentobox</artifactId>

diff --git a/src/main/java/world/bentobox/challenges/ChallengesAddon.java b/src/main/java/world/bentobox/challenges/ChallengesAddon.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 
 import world.bentobox.bentobox.api.addons.Addon;
@@ -88,15 +89,15 @@ public class ChallengesAddon extends Addon {
 	 * This flag allows to complete challenges in any part of the world. It will not limit
 	 * player to their island. Useful for skygrid without protection flags.
 	 */
-	public static Flag CHALLENGES_WORLD_PROTECTION =
+	public static final Flag CHALLENGES_WORLD_PROTECTION =
 		new Flag.Builder("CHALLENGES_WORLD_PROTECTION", Material.GRASS_BLOCK).type(Flag.Type.WORLD_SETTING).defaultSetting(true).build();
 
 	/**
 	 * This flag allows to define which users can complete challenge. F.e. it can be set
 	 * that only Island owner can complete challenge.
 	 * By default it is set to Visitor.
 	 */
-	public static Flag CHALLENGES_ISLAND_PROTECTION =
+	public static final Flag CHALLENGES_ISLAND_PROTECTION =
 		new Flag.Builder("CHALLENGES_ISLAND_PROTECTION", Material.COMMAND_BLOCK).defaultRank(RanksManager.VISITOR_RANK).build();
 
 
@@ -155,7 +156,11 @@ public void onEnable() {
         List<GameModeAddon> hookedGameModes = new ArrayList<>();
 
         this.getPlugin().getAddonsManager().getGameModeAddons().forEach(gameModeAddon -> {
-        	if (!this.settings.getDisabledGameModes().contains(gameModeAddon.getDescription().getName()))
+        	if (!this.settings
+        	        .getDisabledGameModes()
+        	        .contains(gameModeAddon
+        	                .getDescription()
+        	                .getName()))
 			{
 				if (gameModeAddon.getPlayerCommand().isPresent())
 				{
@@ -238,7 +243,7 @@ public void onEnable() {
 
             if (this.settings.getAutoSaveTimer() > 0)
             {
-                this.getPlugin().getServer().getScheduler().runTaskTimerAsynchronously(
+                Bukkit.getScheduler().runTaskTimerAsynchronously(
                     this.getPlugin(),
                     bukkitTask -> ChallengesAddon.this.challengesManager.save(),
                     this.settings.getAutoSaveTimer() * 60 * 20,
@@ -264,7 +269,7 @@ public void onReload()
         {
             this.loadSettings();
             this.challengesManager.reload();
-            this.getLogger().info("Challenges addon reloaded.");
+            this.log("Challenges addon reloaded.");
         }
     }