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 6A0F017ED4 for ; Thu, 5 Feb 2015 15:04:49 +0000 (UTC) Received: (qmail 62280 invoked by uid 500); 5 Feb 2015 15:04:49 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 62209 invoked by uid 500); 5 Feb 2015 15:04:49 -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 62197 invoked by uid 99); 5 Feb 2015 15:04:49 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Feb 2015 15:04:49 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id F01BFAC006D; Thu, 5 Feb 2015 15:04:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1657597 - in /aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest: EclipseLinkContextTest.java EclipseLinkStartupTest.java Date: Thu, 05 Feb 2015 15:04:48 -0000 To: commits@aries.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150205150448.F01BFAC006D@hades.apache.org> Author: cschneider Date: Thu Feb 5 15:04:48 2015 New Revision: 1657597 URL: http://svn.apache.org/r1657597 Log: Small refactoring Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkContextTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkContextTest.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkContextTest.java?rev=1657597&r1=1657596&r2=1657597&view=diff ============================================================================== --- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkContextTest.java (original) +++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkContextTest.java Thu Feb 5 15:04:48 2015 @@ -78,8 +78,8 @@ public class EclipseLinkContextTest exte ut.rollback(); } - Car c = em.find(Car.class, "AB11CDE"); - assertEquals(c, null); + Car car = em.find(Car.class, "AB11CDE"); + assertEquals(car, null); } @Test @@ -88,8 +88,8 @@ public class EclipseLinkContextTest exte EntityManagerFactory emf = getProxyEMF(SCRIPT_TEST_UNIT); EntityManager em = emf.createEntityManager(); - Car c = em.find(Car.class, "AB11CDE"); - assertEquals(1300, em.find(Car.class, "AB11CDE").getEngineSize()); + Car car = em.find(Car.class, "AB11CDE"); + assertEquals(1300, car.getEngineSize()); } @Configuration Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java?rev=1657597&r1=1657596&r2=1657597&view=diff ============================================================================== --- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java (original) +++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java Thu Feb 5 15:04:48 2015 @@ -15,39 +15,35 @@ */ package org.apache.aries.jpa.context.itest; +import static org.ops4j.pax.exam.CoreOptions.options; + +import javax.persistence.EntityManagerFactory; +import javax.persistence.spi.PersistenceProvider; + +import org.apache.aries.itest.RichBundleContext; import org.apache.aries.jpa.itest.AbstractJPAItest; import org.junit.Test; import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; -import org.osgi.framework.Bundle; - -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceProvider; public class EclipseLinkStartupTest extends AbstractJPAItest { - + @Test public void testContextCreationWithStartingBundle() throws Exception { + RichBundleContext context = context(); // wait for the Eclipselink provider to come up - context().getService(PersistenceProvider.class); - - for (Bundle b : bundleContext.getBundles()) { - if (b.getSymbolicName().equals("org.apache.aries.jpa.container.itest.bundle.eclipselink")) { - b.start(); - } - } - - context().getService(EntityManagerFactory.class); + context.getService(PersistenceProvider.class); + context.getBundleByName("org.apache.aries.jpa.container.itest.bundle.eclipselink").start(); + context.getService(EntityManagerFactory.class); } @Configuration public Option[] configuration() { - return CoreOptions.options( - baseOptions(), - ariesJpa21(), - eclipseLink(), - testBundleEclipseLink().noStart() - ); + return options(// + baseOptions(),// + ariesJpa21(),// + eclipseLink(),// + testBundleEclipseLink().noStart()// + ); } }