karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject karaf-decanter git commit: [KARAF-4546] Fix test fail
Date Mon, 06 Jun 2016 15:42:49 GMT
Repository: karaf-decanter
Updated Branches:
  refs/heads/master 07201b77d -> 145e39619


[KARAF-4546] Fix test fail


Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/145e3961
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/145e3961
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/145e3961

Branch: refs/heads/master
Commit: 145e396199d1eba93a5a2ac119993516cbdb488e
Parents: 07201b7
Author: Christian Schneider <chris@die-schneider.net>
Authored: Mon Jun 6 17:42:41 2016 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Mon Jun 6 17:42:41 2016 +0200

----------------------------------------------------------------------
 spring-boot-starter-decanter/etc/test.cfg       |  1 +
 .../boot/DecanterRegistryFactoryTest.java       | 24 ++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/145e3961/spring-boot-starter-decanter/etc/test.cfg
----------------------------------------------------------------------
diff --git a/spring-boot-starter-decanter/etc/test.cfg b/spring-boot-starter-decanter/etc/test.cfg
index e69de29..3f36e9e 100644
--- a/spring-boot-starter-decanter/etc/test.cfg
+++ b/spring-boot-starter-decanter/etc/test.cfg
@@ -0,0 +1 @@
+mykey=myvalue

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/145e3961/spring-boot-starter-decanter/src/test/java/org/apache/karaf/decanter/boot/DecanterRegistryFactoryTest.java
----------------------------------------------------------------------
diff --git a/spring-boot-starter-decanter/src/test/java/org/apache/karaf/decanter/boot/DecanterRegistryFactoryTest.java
b/spring-boot-starter-decanter/src/test/java/org/apache/karaf/decanter/boot/DecanterRegistryFactoryTest.java
index d5010ea..6a3ba11 100644
--- a/spring-boot-starter-decanter/src/test/java/org/apache/karaf/decanter/boot/DecanterRegistryFactoryTest.java
+++ b/spring-boot-starter-decanter/src/test/java/org/apache/karaf/decanter/boot/DecanterRegistryFactoryTest.java
@@ -16,9 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.karaf.decanter.boot;
 
-import java.io.IOException;
 import java.util.Arrays;
 
 import org.junit.Assert;
@@ -36,7 +53,7 @@ public class DecanterRegistryFactoryTest {
         String bundleFilter = DecanterRegistryFactory.getBundleFilter(Arrays.asList("test",
"test2"));
         FrameworkUtil.createFilter(bundleFilter);
     }
-    
+
     @Test
     public void testCreate() throws Exception {
         DecanterRegistryFactory factory = new DecanterRegistryFactory();
@@ -45,8 +62,7 @@ public class DecanterRegistryFactoryTest {
         context.getBundle().stop();
     }
 
-    private void checkConfigPresent(BundleContext context)
-        throws IOException {
+    private void checkConfigPresent(BundleContext context) throws Exception {
         ServiceReference<ConfigurationAdmin> sref = context.getServiceReference(ConfigurationAdmin.class);
         ConfigurationAdmin configAdmin = context.getService(sref);
         Configuration config = configAdmin.getConfiguration("test");


Mime
View raw message