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 0749511EB1 for ; Fri, 13 Jun 2014 16:29:05 +0000 (UTC) Received: (qmail 14481 invoked by uid 500); 13 Jun 2014 16:29:05 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 14414 invoked by uid 500); 13 Jun 2014 16:29:04 -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 14404 invoked by uid 99); 13 Jun 2014 16:29:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jun 2014 16:29:04 +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; Fri, 13 Jun 2014 16:29:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 385032388994; Fri, 13 Jun 2014 16:28:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1602470 - in /aries/trunk: jpa/jpa-container-itest/pom.xml jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java Date: Fri, 13 Jun 2014 16:28:43 -0000 To: commits@aries.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140613162843.385032388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cschneider Date: Fri Jun 13 16:28:42 2014 New Revision: 1602470 URL: http://svn.apache.org/r1602470 Log: Providing some diagnostic tooling for testsupport Modified: aries/trunk/jpa/jpa-container-itest/pom.xml aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java Modified: aries/trunk/jpa/jpa-container-itest/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/pom.xml?rev=1602470&r1=1602469&r2=1602470&view=diff ============================================================================== --- aries/trunk/jpa/jpa-container-itest/pom.xml (original) +++ aries/trunk/jpa/jpa-container-itest/pom.xml Fri Jun 13 16:28:42 2014 @@ -45,7 +45,7 @@ - + org.eclipse org.eclipse.osgi 3.8.0.v20120529-1548 Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java?rev=1602470&r1=1602469&r2=1602470&view=diff ============================================================================== --- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java (original) +++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java Fri Jun 13 16:28:42 2014 @@ -65,22 +65,7 @@ public abstract class AbstractJPAItest e return bundleContext.getAllServiceReferences(EntityManagerFactory.class.getName(), "(&(osgi.unit.name=" + name + ")" + FILTER_CONTAINER_MANAGED + FILTER_PROXY + ")"); } - - /** - * Help to diagnose bundles that did not start - * - * @throws BundleException - */ - protected void showBundles() throws BundleException { - Bundle[] bundles = bundleContext.getBundles(); - for (Bundle bundle : bundles) { - System.out.println(bundle.getBundleId() + ":" + bundle.getSymbolicName() + ":" + bundle.getVersion() + ":" + bundle.getState()); - if (bundle.getState() != 32) { - System.out.println(bundle.getBundleId() + ":" + bundle.getSymbolicName() + ":" + bundle.getState()); - bundle.start(); - } - } - } + protected Option baseOptions() { String localRepo = System.getProperty("maven.repo.local"); Modified: aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java URL: http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java?rev=1602470&r1=1602469&r2=1602470&view=diff ============================================================================== --- aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java (original) +++ aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java Fri Jun 13 16:28:42 2014 @@ -20,7 +20,9 @@ package org.apache.aries.itest; import javax.inject.Inject; +import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; /** * Base class for Pax Exam 1.2.x based unit tests @@ -47,4 +49,32 @@ public abstract class AbstractIntegratio } return localRepo; } + + + /** + * Help to diagnose bundles that did not start + * + * @throws BundleException + */ + protected void showBundles() throws BundleException { + Bundle[] bundles = bundleContext.getBundles(); + for (Bundle bundle : bundles) { + System.out.println(bundle.getBundleId() + ":" + bundle.getSymbolicName() + ":" + bundle.getVersion() + ":" + bundle.getState()); + } + } + + /** + * Helps to diagnose bundles that are not resolved as it will throw a detailed exception + * + * @throws BundleException + */ + protected void resolveBundles() throws BundleException { + Bundle[] bundles = bundleContext.getBundles(); + for (Bundle bundle : bundles) { + if (bundle.getState() == Bundle.INSTALLED) { + System.out.println("Found non resolved bundle " + bundle.getBundleId() + ":" + bundle.getSymbolicName() + ":" + bundle.getVersion()); + bundle.start(); + } + } + } }