From 1dd74833af22f45928205f25bbdbc2151eb1d759 Mon Sep 17 00:00:00 2001
From: Andrus Adamchik <andrus@objectstyle.com>
Date: Mon, 21 Dec 2015 16:12:03 +0300
Subject: [PATCH]  Service/Module override support #6

proper itests
---
 .../java/com/nhl/bootique/BootiqueIT.java     | 40 ++-----------------
 .../java/com/nhl/bootique/it/ItestModule.java |  6 +--
 .../nhl/bootique/it/ItestModuleProvider.java  |  8 ----
 3 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/src/test/java/com/nhl/bootique/BootiqueIT.java b/src/test/java/com/nhl/bootique/BootiqueIT.java
index b0b5c2c7..9aec9272 100644
--- a/src/test/java/com/nhl/bootique/BootiqueIT.java
+++ b/src/test/java/com/nhl/bootique/BootiqueIT.java
@@ -2,55 +2,21 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
-import com.google.inject.Module;
-import com.nhl.bootique.it.ItestModule;
 import com.nhl.bootique.it.ItestModuleProvider;
 
 public class BootiqueIT {
 
-	@Before
-	public void before() {
-		ItestModule.MOCK_DELEGATE = mock(Module.class);
-	}
-
-	@After
-	public void after() {
-		ItestModuleProvider.REPLACES = null;
-		ItestModule.MOCK_DELEGATE = null;
-	}
-
 	@Test
-	public void testCreateAutoLoadModules() {
-		Collection<Module> autoLoaded = Bootique.app(new String[0]).autoLoadModules()
-				.createAutoLoadModules(Collections.emptyList());
+	public void testAutoLoadedProviders() {
+		Collection<BQModuleProvider> autoLoaded = Bootique.app(new String[0]).autoLoadedProviders();
 
 		assertEquals(1, autoLoaded.size());
-		autoLoaded.forEach(m -> assertTrue(m instanceof ItestModule));
-	}
-
-	@Test
-	public void testCreateAutoLoadModules_ExplicitIgnored() {
-
-		Collection<Module> existing = Arrays.asList(new ItestModule());
-		assertEquals(0, Bootique.app(new String[0]).autoLoadModules().createAutoLoadModules(existing).size());
+		autoLoaded.forEach(m -> assertTrue(m instanceof ItestModuleProvider));
 	}
 
-	@Test
-	public void testCreateAutoLoadModules_ReplaceAnotherModule() {
-
-		ItestModuleProvider.REPLACES = BQCoreModule.class;
-
-		Collection<Module> existing = Arrays.asList(new ItestModule());
-		assertEquals(0, Bootique.app(new String[0]).autoLoadModules().createAutoLoadModules(existing).size());
-	}
 }
diff --git a/src/test/java/com/nhl/bootique/it/ItestModule.java b/src/test/java/com/nhl/bootique/it/ItestModule.java
index 016b5b03..bfa41ab9 100644
--- a/src/test/java/com/nhl/bootique/it/ItestModule.java
+++ b/src/test/java/com/nhl/bootique/it/ItestModule.java
@@ -5,13 +5,9 @@
 
 public class ItestModule implements Module {
 
-	public static Module MOCK_DELEGATE;
-
 	@Override
 	public void configure(Binder binder) {
-		if (MOCK_DELEGATE != null) {
-			MOCK_DELEGATE.configure(binder);
-		}
+		// do nothing for now
 	}
 
 }
diff --git a/src/test/java/com/nhl/bootique/it/ItestModuleProvider.java b/src/test/java/com/nhl/bootique/it/ItestModuleProvider.java
index af1bf6ff..33c19366 100644
--- a/src/test/java/com/nhl/bootique/it/ItestModuleProvider.java
+++ b/src/test/java/com/nhl/bootique/it/ItestModuleProvider.java
@@ -1,21 +1,13 @@
 package com.nhl.bootique.it;
 
-import java.util.Optional;
-
 import com.google.inject.Module;
 import com.nhl.bootique.BQModuleProvider;
 
 public class ItestModuleProvider implements BQModuleProvider {
 
-	public static Class<? extends Module> REPLACES;
-
 	@Override
 	public Module module() {
 		return new ItestModule();
 	}
 
-	@Override
-	public Optional<Class<? extends Module>> replaces() {
-		return Optional.ofNullable(REPLACES);
-	}
 }