Author: pderop
Date: Tue Jan 12 19:14:43 2010
New Revision: 898472
URL: http://svn.apache.org/viewvc?rev=898472&view=rev
Log:
reactivated annotation test
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java?rev=898472&r1=898471&r2=898472&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java
Tue Jan 12 19:14:43 2010
@@ -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