Adding Illegal Binding error

toothpick-runtime/src/main/java/toothpick/Configuration.java

@@ -1,5 +1,6 @@
 package toothpick;
 
+import java.lang.annotation.Annotation;
 import java.util.Stack;
 import toothpick.config.Binding;
 
@@ -31,7 +32,26 @@ protected Stack<Class> initialValue() {
 
       @Override
       void checkIllegalBinding(Binding binding) {
+        Class<?> clazz;
+        switch (binding.getMode()) {
+          case SIMPLE:
+            clazz = binding.getKey();
+            break;
+          case CLASS:
+            clazz = binding.getImplementationClass();
+            break;
+          case PROVIDER_CLASS:
+            clazz = binding.getProviderClass();
+            break;
+          default:
+            return;
+        }
 
+        for (Annotation annotation : clazz.getAnnotations()) {
+          if (annotation.annotationType().isAnnotationPresent(javax.inject.Scope.class)) {
+            throw new IllegalBindingException();
+          }
+        }
       }
 
       @Override

toothpick-runtime/src/main/java/toothpick/IllegalBindingException.java

@@ -0,0 +1,21 @@
+package toothpick;
+
+/**
+ * Thrown when a binding is illegal.
+ */
+public class IllegalBindingException extends IllegalStateException {
+  public IllegalBindingException() {
+  }
+
+  public IllegalBindingException(String s) {
+    super(s);
+  }
+
+  public IllegalBindingException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public IllegalBindingException(Throwable cause) {
+    super(cause);
+  }
+}

toothpick-runtime/src/main/java/toothpick/ScopeImpl.java

@@ -1,5 +1,6 @@
 package toothpick;
 
+import java.lang.annotation.Annotation;
 import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.Iterator;
@@ -175,6 +176,8 @@ private void installModule(Module module) {
     if (binding == null) {
       throw new IllegalStateException("null binding are not allowed. Should not happen unless getBindingSet is overridden.");
     }
+    Configuration.instance.checkIllegalBinding(binding);
+
     switch (binding.getMode()) {
       case SIMPLE:
         return createInternalProvider(this, binding.getKey(), false, binding.isScoped());

toothpick-runtime/src/test/java/toothpick/scoping/ScopingTest.java

@@ -1,21 +1,26 @@
 package toothpick.scoping;
 
 import org.junit.Test;
+import toothpick.IllegalBindingException;
 import toothpick.Scope;
 import toothpick.ScopeImpl;
+import toothpick.ToothPick;
 import toothpick.ToothPickBaseTest;
 import toothpick.config.Module;
 import toothpick.data.Bar;
 import toothpick.data.BarChild;
 import toothpick.data.Foo;
 import toothpick.data.FooChildWithoutInjectedFields;
 import toothpick.data.FooSingleton;
+import toothpick.data.IFooSingleton;
 
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+import static toothpick.Configuration.development;
 
 /*
  * Tests scopes related features of toothpick.
@@ -155,4 +160,64 @@ public void singletonDiscoveredDynamically_shouldGoInRootScope() throws Exceptio
     assertThat(instance, sameInstance(instance2));
     assertThat(instance, notNullValue());
   }
+
+  @Test
+  public void singleton_shouldBeSharedBySubscopes() throws Exception {
+    //GIVEN
+    Scope scopeParent = new ScopeImpl("");
+    Scope scope1 = new ScopeImpl("");
+    Scope scope2 = new ScopeImpl("");
+    scopeParent.addChild(scope1);
+    scopeParent.addChild(scope2);
+
+    //WHEN
+    FooSingleton instance = scope1.getInstance(FooSingleton.class);
+    FooSingleton instance2 = scope2.getInstance(FooSingleton.class);
+
+    //THEN
+    assertThat(instance, sameInstance(instance2));
+  }
+
+  @Test(expected = IllegalBindingException.class)
+  public void binding_shouldCrashForScopeAnnotatedClass_whenBindingIsSimple() throws Exception {
+    //GIVEN
+    ToothPick.setConfiguration(development());
+    Scope scopeParent = new ScopeImpl("");
+    Scope scope1 = new ScopeImpl("");
+    Scope scope2 = new ScopeImpl("");
+    scopeParent.addChild(scope1);
+    scopeParent.addChild(scope2);
+
+    //WHEN
+    scope1.installModules(new Module() {
+      {
+        bind(FooSingleton.class);
+      }
+    });
+
+    //THEN
+    fail("This test should throw a IllegalBindingException.");
+  }
+
+  @Test(expected = IllegalBindingException.class)
+  public void binding_shouldCrashForScopeAnnotatedClass_whenBindingToAClass() throws Exception {
+    //GIVEN
+    ToothPick.setConfiguration(development());
+    Scope scopeParent = new ScopeImpl("");
+    Scope scope1 = new ScopeImpl("");
+    Scope scope2 = new ScopeImpl("");
+    scopeParent.addChild(scope1);
+    scopeParent.addChild(scope2);
+
+
+    //WHEN
+    scope1.installModules(new Module() {
+      {
+        bind(IFooSingleton.class).to(FooSingleton.class);
+      }
+    });
+
+    //THEN
+    fail("This test should throw a IllegalBindingException.");
+  }
 }