Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4DB8F200CED for ; Fri, 18 Aug 2017 16:01:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4C5CF16CAD5; Fri, 18 Aug 2017 14:01:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5B67C16C9DF for ; Fri, 18 Aug 2017 16:01:56 +0200 (CEST) Received: (qmail 73024 invoked by uid 500); 18 Aug 2017 14:01:55 -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 72119 invoked by uid 99); 18 Aug 2017 14:01:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Aug 2017 14:01:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6EF0CF5512; Fri, 18 Aug 2017 14:01:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: csierra@apache.org To: commits@aries.apache.org Date: Fri, 18 Aug 2017 14:01:54 -0000 Message-Id: <2654ee991a5b4f128868ffc31f0e0ef4@git.apache.org> In-Reply-To: <1aa0ad14e7a848b396707345cb3d9ca7@git.apache.org> References: <1aa0ad14e7a848b396707345cb3d9ca7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/14] aries-jax-rs-whiteboard git commit: Not according to spec archived-at: Fri, 18 Aug 2017 14:01:57 -0000 Not according to spec Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/7450672c Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/7450672c Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/7450672c Branch: refs/heads/master Commit: 7450672cdb8ce4db7634573a1ad6c059f85fc5e3 Parents: 2984180 Author: Carlos Sierra Authored: Mon Aug 14 14:17:02 2017 +0200 Committer: Carlos Sierra Committed: Fri Aug 18 15:59:21 2017 +0200 ---------------------------------------------------------------------- jax-rs.itests/src/main/java/test/JaxrsTest.java | 30 -------------------- 1 file changed, 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7450672c/jax-rs.itests/src/main/java/test/JaxrsTest.java ---------------------------------------------------------------------- diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java index b8abfa3..951a2cb 100644 --- a/jax-rs.itests/src/main/java/test/JaxrsTest.java +++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java @@ -17,7 +17,6 @@ package test; -import static org.junit.Assert.assertNotNull; import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.*; import java.util.Dictionary; @@ -29,8 +28,6 @@ import org.osgi.framework.PrototypeServiceFactory; import org.osgi.framework.ServiceFactory; import org.osgi.framework.ServiceRegistration; -import org.osgi.service.jaxrs.runtime.dto.FailedApplicationDTO; -import org.osgi.util.tracker.ServiceTracker; import test.types.TestAddon; import test.types.TestAddonConflict; import test.types.TestAddonConflict2; @@ -85,12 +82,6 @@ public class JaxrsTest extends TestHelper { target("http://localhost:8080"). path("test-application"); - @SuppressWarnings("rawtypes") - ServiceTracker serviceTracker = new ServiceTracker<>( - bundleContext, FailedApplicationDTO.class, null); - - serviceTracker.open(); - ServiceRegistration serviceRegistration = null; ServiceRegistration serviceRegistration2; @@ -103,8 +94,6 @@ public class JaxrsTest extends TestHelper { "Hello application", response.readEntity(String.class)); - assertNull(serviceTracker.getService()); - serviceRegistration2 = registerApplication( new TestApplicationConflict(), "service.ranking", -1); @@ -113,16 +102,12 @@ public class JaxrsTest extends TestHelper { assertEquals( "Hello application", response.readEntity(String.class)); - assertNotNull(serviceTracker.getService()); - assertEquals( Response.Status.NOT_FOUND.getStatusCode(), webTarget.path("conflict").request().get().getStatus()); serviceRegistration2.unregister(); - assertNull(serviceTracker.getService()); - response = webTarget.request().get(); assertEquals( @@ -132,8 +117,6 @@ public class JaxrsTest extends TestHelper { if (serviceRegistration != null) { serviceRegistration.unregister(); } - - serviceTracker.close(); } } @@ -145,11 +128,6 @@ public class JaxrsTest extends TestHelper { target("http://localhost:8080"). path("test-application"); - @SuppressWarnings("rawtypes") - ServiceTracker serviceTracker = new ServiceTracker<>( - bundleContext, FailedApplicationDTO.class, null); - - serviceTracker.open(); ServiceRegistration serviceRegistration = null; ServiceRegistration serviceRegistration2; @@ -163,8 +141,6 @@ public class JaxrsTest extends TestHelper { "Hello application", response.readEntity(String.class)); - assertNull(serviceTracker.getService()); - serviceRegistration2 = registerApplication( new TestApplicationConflict(), "service.ranking", 1); @@ -174,16 +150,12 @@ public class JaxrsTest extends TestHelper { "Hello application conflict", response.readEntity(String.class)); - assertNotNull(serviceTracker.getService()); - assertEquals( "conflict", webTarget.path("conflict").request().get(String.class)); serviceRegistration2.unregister(); - assertNull(serviceTracker.getService()); - response = webTarget.request().get(); assertEquals( @@ -193,8 +165,6 @@ public class JaxrsTest extends TestHelper { if (serviceRegistration != null) { serviceRegistration.unregister(); } - - serviceTracker.close(); } }