commit 8877720a74d9add73baa52bfa130fe93f9fdc9e2
author Pierre De Rop <pderop@apache.org> Tue Jan 12 19:14:43 2010 +0000
committer Pierre De Rop <pderop@apache.org> Tue Jan 12 19:14:43 2010 +0000
tree 3e83f1ddd4aacc922326872d13180dd18ed0203c
parent 7f7327430c666d0942c3a8b8099d3c2d66f18deb

reactivated annotation test

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@898472 13f79535-47bb-0310-9956-ffa450edef68

dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java

diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java
index e6428dc..d69fc3f 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java
@@ -51,12 +51,6 @@
     @Test
     public void testSimpleAnnotations(BundleContext context)
     {
-        /* Temporarily turn off this test because it seems that it disturb the AspectTest junit test. */
-        if (true) {
-            // See http://opensource.bamboo.atlassian.com/browse/FELIX-DEF-3090/test/org.apache.felix.dm.test.AspectTest
-            return;
-        }
-        
         m_ensure = new Ensure();
         DependencyManager m = new DependencyManager(context);
         // We provide ourself as a "Sequencer" service: this will active the "org.apache.felix.dependencymanager.test.annotation" bundle