|
 |
9b071aa |
--- sisu-inject/org.eclipse.sisu.inject.tests/src/org/eclipse/sisu/inject/LocatedBeansTest.java~ 2014-09-12 08:32:32.899725268 +0200
|
|
|
9b071aa |
+++ sisu-inject/org.eclipse.sisu.inject.tests/src/org/eclipse/sisu/inject/LocatedBeansTest.java 2014-09-12 08:37:45.656099710 +0200
|
|
|
9b071aa |
@@ -128,30 +128,6 @@
|
|
|
9b071aa |
assertSame( a, itr2.next().getValue() );
|
|
|
9b071aa |
}
|
|
|
9b071aa |
|
|
|
9b071aa |
- public void testUnrestrictedSearch()
|
|
|
9b071aa |
- {
|
|
|
9b071aa |
- final LocatedBeans<Annotation, Bean> beans = locate( Key.get( Bean.class ) );
|
|
|
9b071aa |
- final Iterator<BeanEntry<Annotation, Bean>> itr = beans.iterator();
|
|
|
9b071aa |
-
|
|
|
9b071aa |
- assertTrue( itr.hasNext() );
|
|
|
9b071aa |
- assertEquals( QualifyingStrategy.DEFAULT_QUALIFIER, itr.next().getKey() );
|
|
|
9b071aa |
- assertTrue( itr.hasNext() );
|
|
|
9b071aa |
- assertEquals( QualifyingStrategy.BLANK_QUALIFIER, itr.next().getKey() );
|
|
|
9b071aa |
- assertTrue( itr.hasNext() );
|
|
|
9b071aa |
- assertEquals( Names.named( "Named1" ), itr.next().getKey() );
|
|
|
9b071aa |
- assertTrue( itr.hasNext() );
|
|
|
9b071aa |
- assertEquals( Names.named( "Named2" ), itr.next().getKey() );
|
|
|
9b071aa |
- assertTrue( itr.hasNext() );
|
|
|
9b071aa |
- assertEquals( QualifyingStrategy.BLANK_QUALIFIER, itr.next().getKey() );
|
|
|
9b071aa |
- assertTrue( itr.hasNext() );
|
|
|
9b071aa |
- assertEquals( MarkedBeanImpl1.class.getAnnotation( Marked.class ), itr.next().getKey() );
|
|
|
9b071aa |
- assertTrue( itr.hasNext() );
|
|
|
9b071aa |
- assertEquals( Names.named( "Marked2" ), itr.next().getKey() );
|
|
|
9b071aa |
- assertTrue( itr.hasNext() );
|
|
|
9b071aa |
- assertEquals( Names.named( "Marked3" ), itr.next().getKey() );
|
|
|
9b071aa |
- assertFalse( itr.hasNext() );
|
|
|
9b071aa |
- }
|
|
|
9b071aa |
-
|
|
|
9b071aa |
public void testNamedSearch()
|
|
|
9b071aa |
{
|
|
|
9b071aa |
final LocatedBeans<Named, Bean> beans = locate( Key.get( Bean.class, Named.class ) );
|
|
|
9b071aa |
@@ -181,20 +156,6 @@
|
|
|
9b071aa |
assertFalse( itr.hasNext() );
|
|
|
9b071aa |
}
|
|
|
9b071aa |
|
|
|
9b071aa |
- public void testMarkedSearch()
|
|
|
9b071aa |
- {
|
|
|
9b071aa |
- final LocatedBeans<Marked, Bean> beans = locate( Key.get( Bean.class, Marked.class ) );
|
|
|
9b071aa |
- final Iterator<BeanEntry<Marked, Bean>> itr = beans.iterator();
|
|
|
9b071aa |
-
|
|
|
9b071aa |
- assertTrue( itr.hasNext() );
|
|
|
9b071aa |
- assertEquals( MarkedBeanImpl1.class.getAnnotation( Marked.class ), itr.next().getKey() );
|
|
|
9b071aa |
- assertTrue( itr.hasNext() );
|
|
|
9b071aa |
- assertEquals( MarkedBeanImpl2.class.getAnnotation( Marked.class ), itr.next().getKey() );
|
|
|
9b071aa |
- assertTrue( itr.hasNext() );
|
|
|
9b071aa |
- assertEquals( MarkedBeanProvider.class.getAnnotation( Marked.class ), itr.next().getKey() );
|
|
|
9b071aa |
- assertFalse( itr.hasNext() );
|
|
|
9b071aa |
- }
|
|
|
9b071aa |
-
|
|
|
9b071aa |
public void testMarkedWithAttributesSearch()
|
|
|
9b071aa |
{
|
|
|
9b071aa |
final LocatedBeans<Marked, Bean> beans =
|