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 C5F49200D20 for ; Tue, 17 Oct 2017 11:24:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C482A1609DE; Tue, 17 Oct 2017 09:24:41 +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 161841609EB for ; Tue, 17 Oct 2017 11:24:40 +0200 (CEST) Received: (qmail 71259 invoked by uid 500); 17 Oct 2017 09:24:37 -0000 Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tamaya.incubator.apache.org Delivered-To: mailing list commits@tamaya.incubator.apache.org Received: (qmail 71126 invoked by uid 99); 17 Oct 2017 09:24:37 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Oct 2017 09:24:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id D787218070C for ; Tue, 17 Oct 2017 09:24:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id Q8HXDF-GcisW for ; Tue, 17 Oct 2017 09:24:35 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id F3EB460F1B for ; Tue, 17 Oct 2017 09:24:34 +0000 (UTC) Received: (qmail 69780 invoked by uid 99); 17 Oct 2017 09:24:34 -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; Tue, 17 Oct 2017 09:24:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 86B5ADFA29; Tue, 17 Oct 2017 09:24:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anatole@apache.org To: commits@tamaya.incubator.apache.org Message-Id: <90f0b5afdd3a45abb9c616b372e01a7b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-tamaya-extensions git commit: TAMAYA-300 Fixed tests. Date: Tue, 17 Oct 2017 09:24:33 +0000 (UTC) archived-at: Tue, 17 Oct 2017 09:24:42 -0000 Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master a1cd433a9 -> c26a1e06f TAMAYA-300 Fixed tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/c26a1e06 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/c26a1e06 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/c26a1e06 Branch: refs/heads/master Commit: c26a1e06f75fbee2097c8917100618f31536f5c3 Parents: a1cd433 Author: Anatole Tresch Authored: Tue Oct 17 11:24:26 2017 +0200 Committer: Anatole Tresch Committed: Tue Oct 17 11:24:26 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/tamaya/osgi/commands/ConfigCommandsTest.java | 4 ++-- .../java/org/apache/tamaya/osgi/injection/ActivatorTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/c26a1e06/modules/osgi/common/src/test/java/org/apache/tamaya/osgi/commands/ConfigCommandsTest.java ---------------------------------------------------------------------- diff --git a/modules/osgi/common/src/test/java/org/apache/tamaya/osgi/commands/ConfigCommandsTest.java b/modules/osgi/common/src/test/java/org/apache/tamaya/osgi/commands/ConfigCommandsTest.java index a2c273b..67bb22e 100644 --- a/modules/osgi/common/src/test/java/org/apache/tamaya/osgi/commands/ConfigCommandsTest.java +++ b/modules/osgi/common/src/test/java/org/apache/tamaya/osgi/commands/ConfigCommandsTest.java @@ -79,8 +79,8 @@ public class ConfigCommandsTest extends AbstractOSGITest{ assertTrue(result.contains("OSGI Configuration for PID")); assertTrue(result.contains("applyTamayaConfiguration")); assertTrue(result.contains("OVERRIDE")); - assertTrue(result.contains("Applied")); - assertTrue(result.contains("false")); + assertTrue(result.contains("Dryrun")); + assertTrue(result.contains("true")); } @Test http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/c26a1e06/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/ActivatorTest.java ---------------------------------------------------------------------- diff --git a/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/ActivatorTest.java b/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/ActivatorTest.java index 9cd587f..2a3e5d4 100644 --- a/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/ActivatorTest.java +++ b/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/ActivatorTest.java @@ -36,7 +36,7 @@ public class ActivatorTest extends AbstractOSGITest{ public void startStop() throws Exception { Activator activator = new Activator(); activator.start(this.bundleContext); - verify(bundleContext).registerService(eq(TamayaOSGIInjector.class), anyObject(), anyObject()); + verify(bundleContext).registerService(eq(ConfigInjectionService.class), anyObject(), anyObject()); activator.stop(this.bundleContext); }