Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C379E102AE for ; Tue, 8 Oct 2013 10:03:38 +0000 (UTC) Received: (qmail 63276 invoked by uid 500); 8 Oct 2013 10:03:38 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 63249 invoked by uid 500); 8 Oct 2013 10:03:36 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 63242 invoked by uid 99); 8 Oct 2013 10:03:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Oct 2013 10:03:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Oct 2013 10:03:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D6A2C238889B; Tue, 8 Oct 2013 10:03:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1530206 - in /felix/trunk/dependencymanager: test/src/test/java/org/apache/felix/dm/test/AspectBaseTest.java test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java Date: Tue, 08 Oct 2013 10:03:14 -0000 To: commits@felix.apache.org From: pderop@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131008100314.D6A2C238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pderop Date: Tue Oct 8 10:03:14 2013 New Revision: 1530206 URL: http://svn.apache.org/r1530206 Log: Migrated old test/.../AspectBaseTest into new test2/ module. Added: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java - copied, changed from r1528830, felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectBaseTest.java Removed: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectBaseTest.java Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java (from r1528830, felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectBaseTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java&p1=felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectBaseTest.java&r1=1528830&r2=1530206&rev=1530206&view=diff ============================================================================== --- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectBaseTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java Tue Oct 8 10:03:14 2013 @@ -16,11 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dm.test; - -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import static org.ops4j.pax.exam.CoreOptions.options; -import static org.ops4j.pax.exam.CoreOptions.provision; +package org.apache.felix.dependencymanager.test2.integration.api; import java.util.ArrayList; import java.util.List; @@ -28,32 +24,21 @@ import java.util.Properties; import junit.framework.Assert; +import org.apache.felix.dependencymanager.test2.components.Ensure; +import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; import org.apache.felix.dm.ServiceUtil; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import org.osgi.framework.BundleContext; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; -@RunWith(JUnit4TestRunner.class) -public class AspectBaseTest extends Base { - @Configuration - public static Option[] configuration() { - return options( - provision( - mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version(Base.OSGI_SPEC_VERSION), - mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject() - ) - ); - } - +@RunWith(PaxExam.class) +public class AspectBaseTest extends TestBase { @Test - public void testSingleAspect(BundleContext context) { + public void testSingleAspect() { DependencyManager m = new DependencyManager(context); // helper class that ensures certain steps get executed in sequence Ensure e = new Ensure(); @@ -96,7 +81,7 @@ public class AspectBaseTest extends Base } @Test - public void testSingleAspectThatAlreadyExisted(BundleContext context) { + public void testSingleAspectThatAlreadyExisted() { DependencyManager m = new DependencyManager(context); // helper class that ensures certain steps get executed in sequence Ensure e = new Ensure(); @@ -137,7 +122,7 @@ public class AspectBaseTest extends Base } @Test - public void testMultipleAspects(BundleContext context) { + public void testMultipleAspects() { DependencyManager m = new DependencyManager(context); // helper class that ensures certain steps get executed in sequence Ensure e = new Ensure();