Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-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 DC345D336 for ; Thu, 12 Jul 2012 15:05:21 +0000 (UTC) Received: (qmail 31843 invoked by uid 500); 12 Jul 2012 15:05:21 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 31614 invoked by uid 500); 12 Jul 2012 15:05:15 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 31575 invoked by uid 99); 12 Jul 2012 15:05:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jul 2012 15:05:14 +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; Thu, 12 Jul 2012 15:05:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7A6AB23888EA; Thu, 12 Jul 2012 15:04:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1360712 - /aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/DynamicImportTest.java Date: Thu, 12 Jul 2012 15:04:53 -0000 To: commits@aries.apache.org From: mnuttall@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120712150453.7A6AB23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mnuttall Date: Thu Jul 12 15:04:52 2012 New Revision: 1360712 URL: http://svn.apache.org/viewvc?rev=1360712&view=rev Log: Aries-868: Fix test setup logic. Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/DynamicImportTest.java Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/DynamicImportTest.java URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/DynamicImportTest.java?rev=1360712&r1=1360711&r2=1360712&view=diff ============================================================================== --- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/DynamicImportTest.java (original) +++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/DynamicImportTest.java Thu Jul 12 15:04:52 2012 @@ -9,6 +9,7 @@ import org.junit.Before; 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.Bundle; import org.osgi.framework.BundleException; @@ -62,12 +63,12 @@ public class DynamicImportTest extends S } } - protected static Option[] updateOptions(Option[] options) + @Configuration + public static Option[] extraConfig() { - Option[] helloOptions = options( + return options( mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.itest.interfaces") -// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"), +// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777") ); - return combine(helloOptions, options); } }