From e9ca16ed128a5b8da4eddc985d39f435b6af4512 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 22 May 2021 13:31:48 +0200 Subject: [PATCH 1/2] [websocket-java11] Add test --- .../java11/Java11WebSocketFactoryTest.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 smack-websocket-java11/src/test/java/org/jivesoftware/smack/websocket/java11/Java11WebSocketFactoryTest.java diff --git a/smack-websocket-java11/src/test/java/org/jivesoftware/smack/websocket/java11/Java11WebSocketFactoryTest.java b/smack-websocket-java11/src/test/java/org/jivesoftware/smack/websocket/java11/Java11WebSocketFactoryTest.java new file mode 100644 index 000000000..eb2d5cbcd --- /dev/null +++ b/smack-websocket-java11/src/test/java/org/jivesoftware/smack/websocket/java11/Java11WebSocketFactoryTest.java @@ -0,0 +1,34 @@ +/** + * + * Copyright 2021 Florian Schmaus + * + * Licensed 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.jivesoftware.smack.websocket.java11; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.Mockito.mock; + +import org.jivesoftware.smack.c2s.internal.ModularXmppClientToServerConnectionInternal; +import org.jivesoftware.smack.websocket.rce.WebSocketRemoteConnectionEndpoint; + +public class Java11WebSocketFactoryTest { + + public void returnsNotNullTest() { + WebSocketRemoteConnectionEndpoint endpoint = mock(WebSocketRemoteConnectionEndpoint.class); + ModularXmppClientToServerConnectionInternal connectionInternal = mock(ModularXmppClientToServerConnectionInternal.class); + + Java11WebSocket java11WebSocket = Java11WebSocketFactory.INSTANCE.create(endpoint, connectionInternal); + assertNotNull(java11WebSocket); + } +} From b52e02740bf64b6d262bb7f5c306557daa07501e Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 22 May 2021 13:18:13 +0200 Subject: [PATCH 2/2] [ci] Re-enable coveralls --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a38b26f4c..e2ee71d93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,8 @@ jobs: java: - 11 - 15 + env: + PRIMARY_JAVA_VERSION: 11 steps: - name: Checkout @@ -78,12 +80,12 @@ jobs: # Javadoc - name: Javadoc - if: ${{ matrix.java == 11 }} + if: ${{ matrix.java == env.PRIMARY_JAVA_VERSION }} run: ${PATH_TO_GRADLE} javadocAll --stacktrace # Test Coverage Report - name: Jacoco Test Coverage - if: ${{ matrix.java == 1.8 }} + if: ${{ matrix.java == env.PRIMARY_JAVA_VERSION }} run: ${PATH_TO_GRADLE} jacocoRootReport coveralls env: COVERALLS_REPO_TOKEN: S2ecSJja2cKJa9yv45C8ZFPohXuRrTXKd