Projects >> errai >>4b79d061eca1f980dd5f97c3dc0c3603072dca95

Chunk
Conflicting content 
    assertSame("bean is not observing application scope", beanInst, beanInst2);
  }

<<<<<<< HEAD
=======
  public void testBeanManagerLookupBeanFromAbstractRootType() {
    final IOCBeanDef bean
            = IOC.getBeanManager().lookupBean(AbstractBean.class);
    assertNotNull("did not find any beans matching", bean);

    final AbstractBean beanInst = bean.getInstance();
    assertNotNull("bean instance is null", beanInst);

    assertTrue("bean is incorrect instance: " + beanInst.getClass(), beanInst instanceof InheritedFromAbstractBean);
  }

  /**
   * This test effectively tests that the IOC container comprehends the full type heirarchy, considering both
   * supertypes and transverse interface types.
   */
  public void testBeanManagerLookupBeanFromOuterInterfaceRootType() {
    final IOCBeanDef bean
            = IOC.getBeanManager().lookupBean(OuterBeanInterface.class);
    assertNotNull("did not find any beans matching", bean);

    final OuterBeanInterface beanInst = bean.getInstance();
    assertNotNull("bean instance is null", beanInst);

    assertTrue("bean is incorrect instance: " + beanInst.getClass(), beanInst instanceof InheritedFromAbstractBean);
  }


>>>>>>> 4daa9f321f3a8ce653e18e53249ab95be42c1146
  public void testBeanManagerAPIs() {
    final IOCBeanManager mgr = IOC.getBeanManager();
    final IOCBeanDef bean = mgr.lookupBean(QualAppScopeBeanA.class);
Solution content 
    assertSame("bean is not observing application scope", beanInst, beanInst2);
  }

  public void testBeanManagerLookupBeanFromAbstractRootType() {
    final IOCBeanDef bean
            = IOC.getBeanManager().lookupBean(AbstractBean.class);
    assertNotNull("did not find any beans matching", bean);

    final AbstractBean beanInst = bean.getInstance();
    assertNotNull("bean instance is null", beanInst);

    assertTrue("bean is incorrect instance: " + beanInst.getClass(), beanInst instanceof InheritedFromAbstractBean);
  }

  /**
   * This test effectively tests that the IOC container comprehends the full type heirarchy, considering both
   * supertypes and transverse interface types.
   */
  public void testBeanManagerLookupBeanFromOuterInterfaceRootType() {
    final IOCBeanDef bean
            = IOC.getBeanManager().lookupBean(OuterBeanInterface.class);
    assertNotNull("did not find any beans matching", bean);

    final OuterBeanInterface beanInst = bean.getInstance();
    assertNotNull("bean instance is null", beanInst);

    assertTrue("bean is incorrect instance: " + beanInst.getClass(), beanInst instanceof InheritedFromAbstractBean);
  }

  public void testBeanManagerAPIs() {
    final IOCBeanManager mgr = IOC.getBeanManager();
    final IOCBeanDef bean = mgr.lookupBean(QualAppScopeBeanA.class);
File
BeanManagerIntegrationTest.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
    if (injectorList == null) {
      injectors.put(type.getErased(), injectorList = new ArrayList());

<<<<<<< HEAD
      for (MetaClass iface : type.getInterfaces()) {
        final QualifiedTypeInjectorDelegate injectorDelegate
                = new QualifiedTypeInjectorDelegate(iface, injector, iface.getParameterizedType());
=======
      MetaClass cls = type;
      do {
        if (cls != type && (cls.isAbstract() || cls.isInterface())) {
          final QualifiedTypeInjectorDelegate injectorDelegate
                  = new QualifiedTypeInjectorDelegate(cls, injector, cls.getParameterizedType());
>>>>>>> 4daa9f321f3a8ce653e18e53249ab95be42c1146

          _registerInjector(cls, injectorDelegate, false);
        }
Solution content 
    if (injectorList == null) {
      injectors.put(type.getErased(), injectorList = new ArrayList());

      MetaClass cls = type;
      do {
        if (cls != type && (cls.isAbstract() || cls.isInterface())) {
          final QualifiedTypeInjectorDelegate injectorDelegate
                  = new QualifiedTypeInjectorDelegate(cls, injector, cls.getParameterizedType());

          _registerInjector(cls, injectorDelegate, false);
        }
File
InjectionContext.java
Developer's decision
Version 2
Kind of conflict
Do statement
For statement
If statement
Method invocation
Variable