Merge pull request #475 from TakayukiHoshi1984/bugfix_unit_test

JUnit 修正

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceTest/app/src/main/java/org/deviceconnect/android/deviceplugin/test/UnitTestDeviceService.java

@@ -41,6 +41,7 @@ public class UnitTestDeviceService extends DConnectMessageService {
     @Override
     public void onCreate() {
         super.onCreate();
+        setUseLocalOAuth(false);
 
         mFileManager = new FileManager(this);
 

dConnectManager/dConnectServer/build.gradle

@@ -11,7 +11,7 @@ compileJava {
 
 sourceSets {
     main.java.srcDirs = ['src']
-    main.resources.srcDirs = ['src']
+    main.resources.srcDirs = ['src/resources']
     test.java.srcDirs = ['tests/java']
     test.resources.srcDirs = ['tests/resources']
 }

dConnectManager/dConnectServerNanoHttpd/nanohttpd/build.gradle

@@ -2,6 +2,11 @@ apply plugin: 'com.android.library'
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
+    implementation 'org.nanohttpd:nanohttpd-websocket:2.3.0'
+    androidTestImplementation 'com.android.support.test:testing-support-lib:0.1'
+    androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
+    androidTestImplementation "org.java-websocket:java-websocket:1.3.3"
+
     api project(':dconnect-server')
     androidTestImplementation fileTree(include: '*.jar', dir: 'testLibs')
 }
@@ -45,12 +50,4 @@ android {
         maven { url 'http://clojars.org/repo' }
         mavenCentral()
     }
-
-    dependencies {
-        implementation fileTree(dir: 'libs', include: ['*.jar'])
-        implementation 'org.nanohttpd:nanohttpd-websocket:2.3.0'
-        androidTestImplementation 'com.android.support.test:testing-support-lib:0.1'
-        androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
-        androidTestImplementation "org.java-websocket:java-websocket:1.3.3"
-    }
 }

dConnectManager/dConnectServerNanoHttpd/nanohttpd/libs/polo.jar

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2009 Google Inc.  All rights reserved.
+ *
+ * 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.deviceconnect.server.nanohttpd.util;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.X509TrustManager;
+/**
+ * A trust manager that accepts all X509 client and server certificates.
+ *
+ * @see "http://java.sun.com/products/javamail/SSLNOTES.txt"
+ */
+public class DummyTrustManager implements X509TrustManager {
+    public void checkClientTrusted(X509Certificate[] chain, String authType) {
+        // Does not throw CertificateException: all chains trusted
+        return;
+    }
+    public void checkServerTrusted(X509Certificate[] chain, String authType) {
+        // Does not throw CertificateException: all chains trusted
+        return;
+    }
+    public X509Certificate[] getAcceptedIssuers() {
+        return new X509Certificate[0];
+    }
+}

dConnectManager/dConnectServerNanoHttpd/nanohttpd/src/androidTest/java/org/deviceconnect/server/nanohttpd/util/DummyTrustManager.java

@@ -52,7 +52,6 @@
 import android.provider.Settings;
 import android.util.Log;
 
-import com.google.polo.ssl.SslUtil;
 
 /**
  * キーストア・マネージャー. クライアントとサーバの証明書を管理する.

dConnectManager/dConnectServerNanoHttpd/nanohttpd/src/androidTest/java/org/deviceconnect/server/nanohttpd/util/KeyStoreManager.java

@@ -0,0 +1,57 @@
+/*
+ SecurityUtil.java
+ Copyright (c) 2019 NTT DOCOMO,INC.
+ Released under the MIT license
+ http://opensource.org/licenses/mit-license.php
+ */
+package org.deviceconnect.server.nanohttpd.util;
+
+import android.os.Build;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import java.security.Security;
+
+/**
+ * セキュリティ関連のユーティリティ.
+ *
+ * @author NTT DOCOMO, INC.
+ */
+final class SecurityUtil {
+
+    static {
+        if (canUseBouncyCastleProvider()) {
+            Security.addProvider(new BouncyCastleProvider());
+            SECURITY_PROVIDER = "BC";
+        } else {
+            SECURITY_PROVIDER = null; // デフォルトのプロバイダーを使用.
+        }
+    }
+
+    private static final String SECURITY_PROVIDER;
+
+    /**
+     * 本 SDK の内部で使用するセキュリティプロバイダの名前を取得する.
+     *
+     * @return セキュリティプロバイダの名前. デフォルトのプロバイダを使用する場合は <code>null</code>
+     */
+    public static String getSecurityProvider() {
+        return SECURITY_PROVIDER;
+    }
+
+    /**
+     * セキュリティプロバイダとして BouncyCastleProvider を使用可能かどうかを確認する.
+     *
+     * @return BouncyCastleProvider を使用できる場合は <code>true</code>, そうでない場合は <code>false</code>
+     */
+    private static boolean canUseBouncyCastleProvider() {
+        return Build.VERSION.SDK_INT < Build.VERSION_CODES.P;
+    }
+
+    /**
+     * プライベートコンストラクタ.
+     */
+    private SecurityUtil() {
+    }
+
+}