/*
 * Copyright (C) 2008 Google Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.google.inject.testing.guiceberry.junit3;

import com.google.inject.AbstractModule;
import com.google.inject.Provider;
import com.google.inject.testing.guiceberry.GuiceBerryEnv;
import com.google.inject.testing.guiceberry.TestId;
import com.google.inject.testing.guiceberry.TestScoped;

import junit.framework.TestCase;

/**
 * This Module provides the three basic bindings required by 
 * {@link GuiceBerryJunit3}, namely {@link TestId}, 
 * {@link TestCase} and the {@link TestScoped} scope. Without these three
 * bindinds, {@link GuiceBerryJunit3#setUp(TestCase)} will fail.

 * <p>Thus, this module is all but required to be installed by all 
 * {@link GuiceBerryEnv}s using JUnit3. 
 * 
 * <p>The only alternative would be to provide the same bindings through some
 * other means.
 * 
 * @see GuiceBerryEnv
 * 
 * @author Luiz-Otavio Zorzella
 * @author Danka Karwanska
 */
public class BasicJunit3Module extends AbstractModule {
    
  @Override
  public void configure() {
    final JunitTestScope testScope = new JunitTestScope();
    bindScope(TestScoped.class, testScope);
    bind(TestId.class).toProvider(new Provider<TestId>() {
      public TestId get() {
        TestCase testCase = GuiceBerryJunit3.getActualTestCase(); 
        return new TestId(testCase.getClass().getName(), testCase.getName());
      } 
    }).in(TestScoped.class);
    bind(TestCase.class).toProvider(new Provider<TestCase>() {
      public TestCase get() {
        return GuiceBerryJunit3.getActualTestCase();
      }
    }).in(TestScoped.class);
  }
}

@@ -716,17 +716,17 @@
 .Provide
-r
+s
 ;%0Aimport
@@ -1690,164 +1690,79 @@
 ;%0A  
-  bind(TestId.class).toProvider(new Provider%3CTestId%3E() %7B%0A      public TestId get() %7B%0A        TestCase testCase = GuiceBerryJunit3.getActualTestCase(); %0A    
+%7D%0A  %0A  @Provides%0A  @TestScoped%0A  TestId getTestId(TestCase testCase) %7B%0A
     
@@ -1837,128 +1837,61 @@
 ;%0A  
+%7D%0A
   
+%0A
   
-%7D %0A    %7D).in(TestScoped.class);%0A    bind(TestCase.class).toProvider(new Provider%3CTestCase%3E() %7B%0A      public 
+@Provides%0A  @TestScoped%0A  TestCase get
 TestCase
  get
@@ -1890,21 +1890,13 @@
 Case
- get
 () %7B%0A
-    
     
@@ -1944,45 +1944,8 @@
 ();%0A
-      %7D%0A    %7D).in(TestScoped.class);%0A
   %7D%0A

Simplify BasicJunit3Module leveraging @Provides