#605 Fix unit tests

scenarioo · Mar 21, 2018 · 82be0af · 82be0af
1 parent cf54d92
commit 82be0af
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/scenarioo-server/src/main/java/org/scenarioo/business/builds/BuildImporter.java b/scenarioo-server/src/main/java/org/scenarioo/business/builds/BuildImporter.java
@@ -69,7 +69,7 @@ public class BuildImporter {
 	 */
 	private final ExecutorService asyncBuildImportExecutor = newAsyncBuildImportExecutor();
 
-	private ComparisonExecutor comparisonExecutor = new ComparisonExecutor(asyncBuildImportExecutor);
+	private ComparisonExecutor comparisonExecutor = new ComparisonExecutor(asyncBuildImportExecutor, ScenarioDocuBuildsManager.INSTANCE);
 
 	private final LastSuccessfulScenariosBuild lastSuccessfulScenarioBuild = new LastSuccessfulScenariosBuild();
 

diff --git a/scenarioo-server/src/main/java/org/scenarioo/business/builds/ScenarioDocuBuildsManager.java b/scenarioo-server/src/main/java/org/scenarioo/business/builds/ScenarioDocuBuildsManager.java
@@ -58,12 +58,13 @@
  * using {@link #getAvailableBuilds()}.</li>
  * </ul>
  */
-public enum ScenarioDocuBuildsManager {
-	INSTANCE;
+public class ScenarioDocuBuildsManager {
 
 	private final static ConfigurationRepository configurationRepository = RepositoryLocator.INSTANCE
 			.getConfigurationRepository();
 
+	public static ScenarioDocuBuildsManager INSTANCE = new ScenarioDocuBuildsManager();
+
 	private static final Logger LOGGER = Logger.getLogger(ScenarioDocuBuildsManager.class);
 
 	/**

diff --git a/scenarioo-server/src/main/java/org/scenarioo/business/diffViewer/ComparisonExecutor.java b/scenarioo-server/src/main/java/org/scenarioo/business/diffViewer/ComparisonExecutor.java
@@ -59,9 +59,11 @@ public class ComparisonExecutor {
 		configurationRepository.getDocumentationDataDirectory());
 
 	private ExecutorService asyncComparisonExecutor;
+	private ScenarioDocuBuildsManager scenarioDocuBuildsManager;
 
-	public ComparisonExecutor(ExecutorService executorService) {
+	public ComparisonExecutor(ExecutorService executorService, ScenarioDocuBuildsManager scenarioDocuBuildsManager) {
 		asyncComparisonExecutor = executorService;
+		this.scenarioDocuBuildsManager = scenarioDocuBuildsManager;
 	}
 
 	/**
@@ -201,9 +203,9 @@ protected synchronized List<ComparisonConfiguration> getComparisonConfigurations
 
 		List<ComparisonConfiguration> comparisonConfigurations = configurationRepository.getConfiguration()
 			.getComparisonConfigurations();
-		String resolvedBaseBranchName = ScenarioDocuBuildsManager.INSTANCE.resolveBranchAlias(baseBranchName);
+		String resolvedBaseBranchName = scenarioDocuBuildsManager.resolveBranchAlias(baseBranchName);
 		for (ComparisonConfiguration comparisonConfiguration : comparisonConfigurations) {
-			String resolvedComparisonBranchName = ScenarioDocuBuildsManager.INSTANCE
+			String resolvedComparisonBranchName = scenarioDocuBuildsManager
 				.resolveBranchAlias(comparisonConfiguration.getBaseBranchName());
 			if (resolvedBaseBranchName.equals(resolvedComparisonBranchName)) {
 				comparisonConfigurationsForBaseBranch.add(comparisonConfiguration);
@@ -237,7 +239,7 @@ protected ComparisonConfiguration resolveComparisonConfiguration(
 			comparisonBuildIdentifier = getPreviousBuildIdentifier(
 				comparisonConfiguration, baseBuildName, false);
 		} else {
-			comparisonBuildIdentifier = ScenarioDocuBuildsManager.INSTANCE.resolveBranchAndBuildAliases(
+			comparisonBuildIdentifier = scenarioDocuBuildsManager.resolveBranchAndBuildAliases(
 				comparisonConfiguration.getComparisonBranchName(),
 				comparisonConfiguration.getComparisonBuildName());
 		}
@@ -254,7 +256,7 @@ private BuildIdentifier getPreviousBuildIdentifier(
 		boolean needsSuccessfulBuild) {
 
 		Build baseBuild = loadBaseBuild(comparisonConfiguration, baseBuildName);
-		String resolvedComparisonBranchName = ScenarioDocuBuildsManager.INSTANCE
+		String resolvedComparisonBranchName = scenarioDocuBuildsManager
 			.resolveBranchAlias(comparisonConfiguration.getComparisonBranchName());
 		Date baseBuildDate = baseBuild.getDate();
 		Date comparisonBuildDate = new Date(0);
@@ -284,7 +286,7 @@ private BuildIdentifier getPreviousBuildIdentifier(
 
 	private Build loadBaseBuild(ComparisonConfiguration comparisonConfiguration, String baseBuildName) {
 
-		BuildIdentifier resolvedBuildIdentifier = ScenarioDocuBuildsManager.INSTANCE
+		BuildIdentifier resolvedBuildIdentifier = scenarioDocuBuildsManager
 			.resolveBranchAndBuildAliases(comparisonConfiguration.getBaseBranchName(), baseBuildName);
 		Build baseBuild = docuReader.loadBuild(resolvedBuildIdentifier.getBranchName(),
 			resolvedBuildIdentifier.getBuildName());
@@ -299,7 +301,7 @@ private Build loadBaseBuild(ComparisonConfiguration comparisonConfiguration, Str
 
 	private ComparisonConfiguration getResolvedComparisonConfiguration(
 		ComparisonConfiguration comparisonConfiguration, BuildIdentifier comparisonBuildIdentifier) {
-		String resolvedBaseBranchName = ScenarioDocuBuildsManager.INSTANCE
+		String resolvedBaseBranchName = scenarioDocuBuildsManager
 			.resolveBranchAlias(comparisonConfiguration.getBaseBranchName());
 
 		ComparisonConfiguration resolvedComparisonConfiguration = new ComparisonConfiguration();

diff --git a/scenarioo-server/src/test/java/org/scenarioo/business/diffViewer/ComparisonExecutorTest.java b/scenarioo-server/src/test/java/org/scenarioo/business/diffViewer/ComparisonExecutorTest.java
@@ -17,17 +17,6 @@
 
 package org.scenarioo.business.diffViewer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.when;
-import static org.scenarioo.business.diffViewer.comparator.ConfigurationFixture.getComparisonConfiguration;
-
-import java.io.File;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -46,6 +35,17 @@
 import org.scenarioo.rest.base.BuildIdentifier;
 import org.scenarioo.utils.TestFileUtils;
 
+import java.io.File;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+import static org.scenarioo.business.diffViewer.comparator.ConfigurationFixture.getComparisonConfiguration;
+
 @RunWith(MockitoJUnitRunner.class)
 public class ComparisonExecutorTest {
 
@@ -80,7 +80,7 @@ public class ComparisonExecutorTest {
 	private ScenarioDocuReader docuReader;
 
 	@InjectMocks
-	private ComparisonExecutor comparisonExecutor = new ComparisonExecutor(null);
+	private ComparisonExecutor comparisonExecutor = new ComparisonExecutor(null, docuBuildsManager);
 
 	@BeforeClass
 	public static void setUpClass() {