[camel] 01/01: Merging CAMEL-13826 branch with master

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a commit to branch CAMEL-13826
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 57915848d37f65db04d9cbe87cdb220f2a10ac77
Author: aldettinger <al...@gmail.com>
AuthorDate: Mon Aug 19 16:41:46 2019 +0200

    Merging CAMEL-13826 branch with master
---
 .../apache/camel/test/AvailablePortFinderTest.java | 38 ++++++++++------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
index 3b96852..c4fdf09 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
@@ -1,19 +1,19 @@
 /*
- *  * 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.
- *                */
+ * 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.camel.test;
 
 import java.net.DatagramSocket;
@@ -24,14 +24,12 @@ import java.net.ServerSocket;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class AvailablePortFinderTest {
 
     @Test
-    public void testNotAvailableTcpPort() {
+    public void testNotAvailableTcpPort() throws Exception {
         int p1 = AvailablePortFinder.getNextAvailable();
         ServerSocket socket = new ServerSocket(p1);
         int p2 = AvailablePortFinder.getNextAvailable();
@@ -40,7 +38,7 @@ public class AvailablePortFinderTest {
     }
 
     @Test
-    public void testNotAvailableUdpPort() {
+    public void testNotAvailableUdpPort() throws Exception {
         int p1 = AvailablePortFinder.getNextAvailable();
         DatagramSocket socket = new DatagramSocket(p1);
         int p2 = AvailablePortFinder.getNextAvailable();
@@ -49,7 +47,7 @@ public class AvailablePortFinderTest {
     }
 
     @Test
-    public void testNotAvailableMulticastPort() {
+    public void testNotAvailableMulticastPort() throws Exception {
         int p1 = AvailablePortFinder.getNextAvailable();
         MulticastSocket socket = new MulticastSocket(null);
         socket.setReuseAddress(false); // true is default for MulticastSocket, we wan to fail if port is occupied