svn commit: r926517 - in /felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation: MultipleAnnotationTest.java MultipleAnnotationsTest.java

[pd...@apache.org]

Author: pderop
Date: Tue Mar 23 10:16:25 2010
New Revision: 926517

URL: http://svn.apache.org/viewvc?rev=926517&view=rev
Log:
renamed the MultipleAnnotationTest class name to see if it fixes a weird Bamboo issue, where the MultipleAnnotationTest bundle can't be installed because of an unexpected "Unexpected end of ZLIB input stream" exception

Added:
    felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/MultipleAnnotationsTest.java
      - copied, changed from r926510, felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/MultipleAnnotationTest.java
Removed:
    felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/MultipleAnnotationTest.java

Copied: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/MultipleAnnotationsTest.java (from r926510, felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/MultipleAnnotationTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/MultipleAnnotationsTest.java?p2=felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/MultipleAnnotationsTest.java&p1=felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/MultipleAnnotationTest.java&r1=926510&r2=926517&rev=926517&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/MultipleAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/MultipleAnnotationsTest.java Tue Mar 23 10:16:25 2010
@@ -38,7 +38,7 @@ import org.osgi.framework.Constants;
  * Use case: Verify complex Annotation usage.
  */
 @RunWith(JUnit4TestRunner.class)
-public class MultipleAnnotationTest extends AnnotationBase
+public class MultipleAnnotationsTest extends AnnotationBase
 {
     @Configuration
     public static Option[] configuration()
@@ -51,7 +51,7 @@ public class MultipleAnnotationTest exte
                 mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager.runtime").versionAsInProject()),
             provision(
                 new BundleGenerator()
-                    .set(Constants.BUNDLE_SYMBOLICNAME, "MultipleAnnotationTest")
+                    .set(Constants.BUNDLE_SYMBOLICNAME, "MultipleAnnotationsTest")
                     .set("Export-Package", "org.apache.felix.dm.test.bundle.annotation.sequencer")
                     .set("Private-Package", "org.apache.felix.dm.test.bundle.annotation.multiple")
                     .set("Import-Package", "*")
@@ -63,14 +63,14 @@ public class MultipleAnnotationTest exte
     public void testMultipleAnnotations(BundleContext context)
     {
         DependencyManager m = new DependencyManager(context);
-        // Provide the Sequencer service to the MultipleAnnotationTest class.
+        // Provide the Sequencer service to the MultipleAnnotationsTest class.
         m.add(m.createService()
             .setImplementation(this)
             .setInterface(Sequencer.class.getName(), null));
         // Check if the test.annotation components have been initialized orderly
         m_ensure.waitForStep(7, 10000);
         // Stop the test.annotation bundle
-        stopBundle("MultipleAnnotationTest", context);
+        stopBundle("MultipleAnnotationsTest", context);
         // And check if the test.annotation bundle has been deactivated orderly
         m_ensure.waitForStep(11, 10000);
     }