From 3eecb4c739a40ac1af066a89d863be338fa54e00 Mon Sep 17 00:00:00 2001 From: Achim Kraus Date: Thu, 26 May 2022 09:13:55 +0200 Subject: [PATCH] Move libcoap interop test into separate packages. Signed-off-by: Achim Kraus --- .../{ => gnutls}/LibCoapClientGnuTlsInteroperabilityTest.java | 3 ++- .../{ => gnutls}/LibCoapServerGnuTlsInteroperabilityTest.java | 3 ++- .../LibCoapClientMbedTlsInteroperabilityTest.java | 3 ++- .../LibCoapServerMbedTlsInteroperabilityTest.java | 3 ++- .../LibCoapClientOpensslInteroperabilityTest.java | 3 ++- .../LibCoapServerOpensslInteroperabilityTest.java | 3 ++- .../LibCoapClientTinyDtlsInteroperabilityTest.java | 3 ++- .../LibCoapServerTinyDtlsInteroperabilityTest.java | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) rename californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/{ => gnutls}/LibCoapClientGnuTlsInteroperabilityTest.java (98%) rename californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/{ => gnutls}/LibCoapServerGnuTlsInteroperabilityTest.java (99%) rename californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/{ => mbedtls}/LibCoapClientMbedTlsInteroperabilityTest.java (98%) rename californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/{ => mbedtls}/LibCoapServerMbedTlsInteroperabilityTest.java (98%) rename californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/{ => openssl}/LibCoapClientOpensslInteroperabilityTest.java (98%) rename californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/{ => openssl}/LibCoapServerOpensslInteroperabilityTest.java (99%) rename californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/{ => tinydtls}/LibCoapClientTinyDtlsInteroperabilityTest.java (97%) rename californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/{ => tinydtls}/LibCoapServerTinyDtlsInteroperabilityTest.java (97%) diff --git a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientGnuTlsInteroperabilityTest.java b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/gnutls/LibCoapClientGnuTlsInteroperabilityTest.java similarity index 98% rename from californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientGnuTlsInteroperabilityTest.java rename to californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/gnutls/LibCoapClientGnuTlsInteroperabilityTest.java index 1441cff9d7..a88977a0ac 100644 --- a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientGnuTlsInteroperabilityTest.java +++ b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/gnutls/LibCoapClientGnuTlsInteroperabilityTest.java @@ -13,7 +13,7 @@ * Contributors: * Achim Kraus (Bosch.IO GmbH) - initial implementation. ******************************************************************************/ -package org.eclipse.californium.interoperability.test.libcoap; +package org.eclipse.californium.interoperability.test.libcoap.gnutls; import static org.eclipse.californium.interoperability.test.CredentialslUtil.CLIENT_RSA_CERTIFICATE; import static org.eclipse.californium.interoperability.test.CredentialslUtil.SERVER_CA_RSA_CERTIFICATE; @@ -39,6 +39,7 @@ import org.eclipse.californium.interoperability.test.CaliforniumUtil; import org.eclipse.californium.interoperability.test.ConnectorUtil; import org.eclipse.californium.interoperability.test.ProcessUtil.ProcessResult; +import org.eclipse.californium.interoperability.test.libcoap.LibCoapProcessUtil; import org.eclipse.californium.interoperability.test.ScandiumUtil; import org.eclipse.californium.interoperability.test.ShutdownUtil; import org.eclipse.californium.scandium.config.DtlsConfig; diff --git a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerGnuTlsInteroperabilityTest.java b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/gnutls/LibCoapServerGnuTlsInteroperabilityTest.java similarity index 99% rename from californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerGnuTlsInteroperabilityTest.java rename to californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/gnutls/LibCoapServerGnuTlsInteroperabilityTest.java index dd8d30db23..fdd2f708ff 100644 --- a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerGnuTlsInteroperabilityTest.java +++ b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/gnutls/LibCoapServerGnuTlsInteroperabilityTest.java @@ -13,7 +13,7 @@ * Contributors: * Achim Kraus (Bosch.IO GmbH) - initial implementation. ******************************************************************************/ -package org.eclipse.californium.interoperability.test.libcoap; +package org.eclipse.californium.interoperability.test.libcoap.gnutls; import static org.eclipse.californium.interoperability.test.ConnectorUtil.CLIENT_RSA_NAME; import static org.eclipse.californium.interoperability.test.CredentialslUtil.SERVER_RSA_CERTIFICATE; @@ -47,6 +47,7 @@ import org.eclipse.californium.elements.util.StringUtil; import org.eclipse.californium.interoperability.test.CaliforniumUtil; import org.eclipse.californium.interoperability.test.ProcessUtil.ProcessResult; +import org.eclipse.californium.interoperability.test.libcoap.LibCoapProcessUtil; import org.eclipse.californium.interoperability.test.ScandiumUtil; import org.eclipse.californium.interoperability.test.ShutdownUtil; import org.eclipse.californium.scandium.config.DtlsConfig; diff --git a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientMbedTlsInteroperabilityTest.java b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/mbedtls/LibCoapClientMbedTlsInteroperabilityTest.java similarity index 98% rename from californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientMbedTlsInteroperabilityTest.java rename to californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/mbedtls/LibCoapClientMbedTlsInteroperabilityTest.java index 588b753289..8c930be769 100644 --- a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientMbedTlsInteroperabilityTest.java +++ b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/mbedtls/LibCoapClientMbedTlsInteroperabilityTest.java @@ -13,7 +13,7 @@ * Contributors: * Achim Kraus (Bosch.IO GmbH) - initial implementation. ******************************************************************************/ -package org.eclipse.californium.interoperability.test.libcoap; +package org.eclipse.californium.interoperability.test.libcoap.mbedtls; import static org.eclipse.californium.interoperability.test.CredentialslUtil.SERVER_CA_RSA_CERTIFICATE; import static org.eclipse.californium.interoperability.test.CredentialslUtil.CLIENT_RSA_CERTIFICATE; @@ -38,6 +38,7 @@ import org.eclipse.californium.interoperability.test.CaliforniumUtil; import org.eclipse.californium.interoperability.test.ConnectorUtil; import org.eclipse.californium.interoperability.test.ProcessUtil.ProcessResult; +import org.eclipse.californium.interoperability.test.libcoap.LibCoapProcessUtil; import org.eclipse.californium.interoperability.test.ScandiumUtil; import org.eclipse.californium.interoperability.test.ShutdownUtil; import org.eclipse.californium.scandium.config.DtlsConfig; diff --git a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerMbedTlsInteroperabilityTest.java b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/mbedtls/LibCoapServerMbedTlsInteroperabilityTest.java similarity index 98% rename from californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerMbedTlsInteroperabilityTest.java rename to californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/mbedtls/LibCoapServerMbedTlsInteroperabilityTest.java index 193d44a650..a418f822b1 100644 --- a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerMbedTlsInteroperabilityTest.java +++ b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/mbedtls/LibCoapServerMbedTlsInteroperabilityTest.java @@ -13,7 +13,7 @@ * Contributors: * Achim Kraus (Bosch.IO GmbH) - initial implementation. ******************************************************************************/ -package org.eclipse.californium.interoperability.test.libcoap; +package org.eclipse.californium.interoperability.test.libcoap.mbedtls; import static org.eclipse.californium.interoperability.test.ConnectorUtil.CLIENT_RSA_NAME; import static org.eclipse.californium.interoperability.test.CredentialslUtil.SERVER_CA_RSA_CERTIFICATE; @@ -46,6 +46,7 @@ import org.eclipse.californium.elements.util.StringUtil; import org.eclipse.californium.interoperability.test.CaliforniumUtil; import org.eclipse.californium.interoperability.test.ProcessUtil.ProcessResult; +import org.eclipse.californium.interoperability.test.libcoap.LibCoapProcessUtil; import org.eclipse.californium.interoperability.test.ScandiumUtil; import org.eclipse.californium.interoperability.test.ShutdownUtil; import org.eclipse.californium.scandium.config.DtlsConfig; diff --git a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientOpensslInteroperabilityTest.java b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/openssl/LibCoapClientOpensslInteroperabilityTest.java similarity index 98% rename from californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientOpensslInteroperabilityTest.java rename to californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/openssl/LibCoapClientOpensslInteroperabilityTest.java index d5e003c262..acd2799973 100644 --- a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientOpensslInteroperabilityTest.java +++ b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/openssl/LibCoapClientOpensslInteroperabilityTest.java @@ -13,7 +13,7 @@ * Contributors: * Achim Kraus (Bosch.IO GmbH) - initial implementation. ******************************************************************************/ -package org.eclipse.californium.interoperability.test.libcoap; +package org.eclipse.californium.interoperability.test.libcoap.openssl; import static org.eclipse.californium.interoperability.test.CredentialslUtil.CLIENT_RSA_CERTIFICATE; import static org.eclipse.californium.interoperability.test.CredentialslUtil.SERVER_CA_RSA_CERTIFICATE; @@ -47,6 +47,7 @@ import org.eclipse.californium.interoperability.test.CaliforniumUtil; import org.eclipse.californium.interoperability.test.ConnectorUtil; import org.eclipse.californium.interoperability.test.ProcessUtil.ProcessResult; +import org.eclipse.californium.interoperability.test.libcoap.LibCoapProcessUtil; import org.eclipse.californium.interoperability.test.ScandiumUtil; import org.eclipse.californium.interoperability.test.ShutdownUtil; import org.eclipse.californium.scandium.config.DtlsConfig; diff --git a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerOpensslInteroperabilityTest.java b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/openssl/LibCoapServerOpensslInteroperabilityTest.java similarity index 99% rename from californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerOpensslInteroperabilityTest.java rename to californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/openssl/LibCoapServerOpensslInteroperabilityTest.java index 67249c78a7..234f1f32b8 100644 --- a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerOpensslInteroperabilityTest.java +++ b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/openssl/LibCoapServerOpensslInteroperabilityTest.java @@ -13,7 +13,7 @@ * Contributors: * Achim Kraus (Bosch.IO GmbH) - initial implementation. ******************************************************************************/ -package org.eclipse.californium.interoperability.test.libcoap; +package org.eclipse.californium.interoperability.test.libcoap.openssl; import static org.eclipse.californium.interoperability.test.ConnectorUtil.CLIENT_RSA_NAME; import static org.eclipse.californium.interoperability.test.CredentialslUtil.SERVER_CA_RSA_CERTIFICATE; @@ -52,6 +52,7 @@ import org.eclipse.californium.elements.util.StringUtil; import org.eclipse.californium.interoperability.test.CaliforniumUtil; import org.eclipse.californium.interoperability.test.ProcessUtil.ProcessResult; +import org.eclipse.californium.interoperability.test.libcoap.LibCoapProcessUtil; import org.eclipse.californium.interoperability.test.ScandiumUtil; import org.eclipse.californium.interoperability.test.ShutdownUtil; import org.eclipse.californium.scandium.config.DtlsConfig; diff --git a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientTinyDtlsInteroperabilityTest.java b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/tinydtls/LibCoapClientTinyDtlsInteroperabilityTest.java similarity index 97% rename from californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientTinyDtlsInteroperabilityTest.java rename to californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/tinydtls/LibCoapClientTinyDtlsInteroperabilityTest.java index 270140b093..b83e8babd1 100644 --- a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapClientTinyDtlsInteroperabilityTest.java +++ b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/tinydtls/LibCoapClientTinyDtlsInteroperabilityTest.java @@ -13,7 +13,7 @@ * Contributors: * Achim Kraus (Bosch.IO GmbH) - initial implementation. ******************************************************************************/ -package org.eclipse.californium.interoperability.test.libcoap; +package org.eclipse.californium.interoperability.test.libcoap.tinydtls; import static org.eclipse.californium.interoperability.test.ProcessUtil.TIMEOUT_MILLIS; import static org.eclipse.californium.interoperability.test.libcoap.LibCoapProcessUtil.REQUEST_TIMEOUT_MILLIS; @@ -34,6 +34,7 @@ import org.eclipse.californium.elements.rule.TestNameLoggerRule; import org.eclipse.californium.interoperability.test.CaliforniumUtil; import org.eclipse.californium.interoperability.test.ProcessUtil.ProcessResult; +import org.eclipse.californium.interoperability.test.libcoap.LibCoapProcessUtil; import org.eclipse.californium.interoperability.test.ScandiumUtil; import org.eclipse.californium.interoperability.test.ShutdownUtil; import org.eclipse.californium.scandium.config.DtlsConfig; diff --git a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerTinyDtlsInteroperabilityTest.java b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/tinydtls/LibCoapServerTinyDtlsInteroperabilityTest.java similarity index 97% rename from californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerTinyDtlsInteroperabilityTest.java rename to californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/tinydtls/LibCoapServerTinyDtlsInteroperabilityTest.java index 296200ab70..3d459df487 100644 --- a/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/LibCoapServerTinyDtlsInteroperabilityTest.java +++ b/californium-tests/californium-interoperability-tests/src/test/java/org/eclipse/californium/interoperability/test/libcoap/tinydtls/LibCoapServerTinyDtlsInteroperabilityTest.java @@ -13,7 +13,7 @@ * Contributors: * Achim Kraus (Bosch.IO GmbH) - initial implementation. ******************************************************************************/ -package org.eclipse.californium.interoperability.test.libcoap; +package org.eclipse.californium.interoperability.test.libcoap.tinydtls; import static org.eclipse.californium.interoperability.test.ProcessUtil.TIMEOUT_MILLIS; import static org.eclipse.californium.interoperability.test.libcoap.LibCoapProcessUtil.REQUEST_TIMEOUT_MILLIS; @@ -39,6 +39,7 @@ import org.eclipse.californium.elements.util.StringUtil; import org.eclipse.californium.interoperability.test.CaliforniumUtil; import org.eclipse.californium.interoperability.test.ProcessUtil.ProcessResult; +import org.eclipse.californium.interoperability.test.libcoap.LibCoapProcessUtil; import org.eclipse.californium.interoperability.test.ScandiumUtil; import org.eclipse.californium.interoperability.test.ShutdownUtil; import org.eclipse.californium.scandium.dtls.cipher.CipherSuite;