diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f7367e0..a7af0f8 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,11 +1,3 @@ -# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - name: Java CI with Maven on: @@ -16,7 +8,6 @@ on: jobs: build: - runs-on: ubuntu-latest steps: @@ -27,9 +18,9 @@ jobs: java-version: '11' distribution: 'temurin' cache: maven - - name: Build with Maven - run: mvn -B package --file pom.xml + - name: Test with Maven + run: ./mvnw -B test - # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - name: Update dependency graph uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 + diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..cb28b0e Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..346d645 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a8f0371..0000000 --- a/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: java -jdk: - - oraclejdk11 -branches: - only: - - master diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..8d937f4 --- /dev/null +++ b/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..c4586b5 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 73f4aaf..fbf19d8 100644 --- a/pom.xml +++ b/pom.xml @@ -147,11 +147,17 @@ com.github.stefano81 jpbc v2.0.0-m + + + bcprov-jdk16 + org.bouncycastle + + - junit - junit - 4.13.1 + org.junit.jupiter + junit-jupiter-engine + 5.9.2 test @@ -161,19 +167,19 @@ org.bouncycastle - bcprov-jdk16 - 1.46 - - - info.picocli - picocli - 4.5.2 + bcprov-jdk18on + 1.77 commons-io commons-io - 2.11.0 + 2.14.0 test + + info.picocli + picocli + 4.5.2 + diff --git a/src/main/java/sg/edu/ntu/sce/sands/crypto/BasicCommand.java b/src/main/java/sg/edu/ntu/sce/sands/crypto/BasicCommand.java index 0aa1a6a..37f043e 100644 --- a/src/main/java/sg/edu/ntu/sce/sands/crypto/BasicCommand.java +++ b/src/main/java/sg/edu/ntu/sce/sands/crypto/BasicCommand.java @@ -77,7 +77,6 @@ public void validateFileOutput() { } static abstract class ForcibleCommand extends BasicCommand { - @Option(names = { "-f", "--force" }, description = "Enables overwriting. Disabled by default") void setForceOverwrite(boolean forceFlag) { this.overwriteEnabled = forceFlag; diff --git a/src/main/java/sg/edu/ntu/sce/sands/crypto/DCPABETool.java b/src/main/java/sg/edu/ntu/sce/sands/crypto/DCPABETool.java index 41e981d..d67442f 100644 --- a/src/main/java/sg/edu/ntu/sce/sands/crypto/DCPABETool.java +++ b/src/main/java/sg/edu/ntu/sce/sands/crypto/DCPABETool.java @@ -45,7 +45,6 @@ }, footer = {"","Run COMMAND --help for more information on a command."}) public class DCPABETool implements Runnable { - @Spec CommandSpec commandSpec; @Option(names = {"--version", "-V"}, versionHelp = true, description = "print version information and exit") @@ -342,7 +341,7 @@ static class Help implements Runnable { @Override public void run() { - if (command.equals("")) { + if (command.isEmpty()) { cmd.usage(System.out); } else if (!cmd.getSubcommands().containsKey(command)) { System.out.println("Unknown command: " + command); diff --git a/src/main/java/sg/edu/ntu/sce/sands/crypto/dcpabe/ac/AccessStructure.java b/src/main/java/sg/edu/ntu/sce/sands/crypto/dcpabe/ac/AccessStructure.java index 1ab06ab..944cc42 100644 --- a/src/main/java/sg/edu/ntu/sce/sands/crypto/dcpabe/ac/AccessStructure.java +++ b/src/main/java/sg/edu/ntu/sce/sands/crypto/dcpabe/ac/AccessStructure.java @@ -9,7 +9,17 @@ import java.io.IOException; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Queue; +import java.util.Stack; @JsonSerialize(using = AccessStructure.Serialize.class) @JsonDeserialize(using = AccessStructure.Deserialize.class) diff --git a/src/test/java/ProgrammaticAccessTest.java b/src/test/java/ProgrammaticAccessTest.java index 8f788d0..d635e09 100644 --- a/src/test/java/ProgrammaticAccessTest.java +++ b/src/test/java/ProgrammaticAccessTest.java @@ -1,20 +1,24 @@ import org.apache.commons.io.IOUtils; -import org.junit.Test; -import sg.edu.ntu.sce.sands.crypto.dcpabe.*; +import org.junit.jupiter.api.Test; +import sg.edu.ntu.sce.sands.crypto.dcpabe.AuthorityKeys; +import sg.edu.ntu.sce.sands.crypto.dcpabe.Ciphertext; +import sg.edu.ntu.sce.sands.crypto.dcpabe.DCPABE; +import sg.edu.ntu.sce.sands.crypto.dcpabe.GlobalParameters; +import sg.edu.ntu.sce.sands.crypto.dcpabe.Message; +import sg.edu.ntu.sce.sands.crypto.dcpabe.PersonalKeys; +import sg.edu.ntu.sce.sands.crypto.dcpabe.PublicKeys; import sg.edu.ntu.sce.sands.crypto.dcpabe.ac.AccessStructure; import sg.edu.ntu.sce.sands.crypto.utility.Utility; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; public class ProgrammaticAccessTest { @Test - public void testKeyCorrectlyDecrypted() throws IOException { + public void testKeyCorrectlyDecrypted() { GlobalParameters GP = DCPABE.globalSetup(160); AccessStructure accessStructure = AccessStructure.buildFromPolicy("A"); @@ -47,7 +51,7 @@ public void testMessageCorrectlyDecrypted() throws IOException { byte[] fileBytes; try ( - InputStream inputStream = getClass().getResourceAsStream("/test_decryption.txt"); + InputStream inputStream = ProgrammaticAccessTest.class.getResourceAsStream("/test_decryption.txt"); ) { fileBytes = IOUtils.toByteArray(inputStream); } diff --git a/src/test/java/Testing.java b/src/test/java/Testing.java index cb43898..7245db1 100644 --- a/src/test/java/Testing.java +++ b/src/test/java/Testing.java @@ -2,20 +2,23 @@ import it.unisa.dia.gas.jpbc.Pairing; import it.unisa.dia.gas.plaf.jpbc.pairing.PairingFactory; import it.unisa.dia.gas.plaf.jpbc.pairing.a.TypeACurveGenerator; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import sg.edu.ntu.sce.sands.crypto.dcpabe.*; +import org.junit.jupiter.api.Test; +import sg.edu.ntu.sce.sands.crypto.dcpabe.AuthorityKeys; +import sg.edu.ntu.sce.sands.crypto.dcpabe.Ciphertext; +import sg.edu.ntu.sce.sands.crypto.dcpabe.DCPABE; +import sg.edu.ntu.sce.sands.crypto.dcpabe.GlobalParameters; +import sg.edu.ntu.sce.sands.crypto.dcpabe.Message; +import sg.edu.ntu.sce.sands.crypto.dcpabe.PersonalKeys; +import sg.edu.ntu.sce.sands.crypto.dcpabe.PublicKeys; import sg.edu.ntu.sce.sands.crypto.dcpabe.ac.AccessStructure; import sg.edu.ntu.sce.sands.crypto.dcpabe.key.PersonalKey; import java.security.SecureRandom; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -@RunWith(JUnit4.class) public class Testing { @Test public void testDCPABE2() { diff --git a/src/test/java/sg/edu/ntu/sce/sands/crypto/DCPABEToolTest.java b/src/test/java/sg/edu/ntu/sce/sands/crypto/DCPABEToolTest.java index fe93091..8ab661a 100644 --- a/src/test/java/sg/edu/ntu/sce/sands/crypto/DCPABEToolTest.java +++ b/src/test/java/sg/edu/ntu/sce/sands/crypto/DCPABEToolTest.java @@ -1,12 +1,10 @@ package sg.edu.ntu.sce.sands.crypto; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import picocli.CommandLine; import java.io.File; @@ -17,10 +15,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.stream.Stream; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DCPABEToolTest { private static CommandLine cmd; @@ -38,33 +39,37 @@ public class DCPABEToolTest { private static final String policy = "and a or d and b c"; - @Rule - public TemporaryFolder folder = new TemporaryFolder(); - - @BeforeClass + @BeforeAll public static void beforeAll() throws Exception { gpFile = Files.createTempFile("dcpabe", "gp").toFile(); cmd = new CommandLine(new DCPABETool()); cmd.execute("gsetup", "-f", gpFile.getPath()); - resFile = new File(DCPABEToolTest.class.getResource("/testResource.txt").toURI()); + resFile = new File(Objects.requireNonNull(DCPABEToolTest.class.getResource("/testResource.txt")).toURI()); } - @Before + @BeforeEach public void setUp() throws Exception { - fakeOutput = folder.newFile(); + fakeOutput = Files.createTempFile("fake", "output").toFile(); + fakeOutput.deleteOnExit(); fakeCmdOutput = new PrintWriter(fakeOutput); cmd.setErr(fakeCmdOutput); cmd.setOut(fakeCmdOutput); - apFileS = folder.newFile(); - apFileP = folder.newFile(); - encFile = folder.newFile(); - resFile2 = folder.newFile(); - key1AFile = folder.newFile(); - key1DFile = folder.newFile(); + apFileS = Files.createTempFile("fake", "apFileS").toFile(); + apFileS.deleteOnExit(); + apFileP = Files.createTempFile("fake", "apFileP").toFile(); + apFileP.deleteOnExit(); + encFile = Files.createTempFile("fake", "encFile").toFile(); + encFile.deleteOnExit(); + resFile2 = Files.createTempFile("fake", "resFile2").toFile(); + resFile2.deleteOnExit(); + key1AFile = Files.createTempFile("fake", "key1AFile").toFile(); + key1AFile.deleteOnExit(); + key1DFile = Files.createTempFile("fake", "key1DFile").toFile(); + key1DFile.deleteOnExit(); } - @After + @AfterEach public void tearDown() { fakeCmdOutput.close(); } @@ -215,8 +220,7 @@ public void testGSetupFailsWhenMissingArgs() { public void testKeyGenFailsWhenMissingArgs() { assertTrue(key1AFile.delete()); - List args = new ArrayList<>(); - args.addAll(Arrays.asList("keygen", gpFile.getPath(), "user1", "a", apFileS.getPath(), key1AFile.getPath())); + List args = new ArrayList<>(Arrays.asList("keygen", gpFile.getPath(), "user1", "a", apFileS.getPath(), key1AFile.getPath())); for (int i = 1; i < args.size(); i++) { String missingArgs = args.remove(i); int exitCode = cmd.execute(args.toArray(new String[0])); @@ -228,15 +232,13 @@ public void testKeyGenFailsWhenMissingArgs() { } @Test - public void testPrintsVersion() { + public void testPrintsVersion() throws IOException { String version_expected = "1.2.0"; int exitCode = cmd.execute("--version"); String version = null; try (Stream output = Files.lines(fakeOutput.toPath())) { version = output.iterator().next(); - } catch (IOException e) { - fail("failed to retrieve command output"); } assertEquals(0, exitCode); @@ -246,28 +248,30 @@ public void testPrintsVersion() { @Test public void testCommandFailsWhenInputFileDoesNotExist() throws IOException { - // BUG: CommandLine insists to print to System.err, but only when gpFile is missing - PrintStream SystemErr = System.err; - System.setErr(new PrintStream(fakeOutput)); - File gpFile_ = folder.newFile(); - gpFile_.delete(); - String[][] commands = { - {"asetup", "-f", gpFile_.getPath(), "authority1", apFileS.getPath(), apFileP.getPath(), "a", "b", "c", "d"}, - {"dec", gpFile_.getPath(), "user1", encFile.getPath(), resFile2.getPath(), - key1AFile.getPath()}, - {"enc", gpFile_.getPath(), resFile.getPath(), policy, encFile.getPath(), - apFileP.getPath()}, - {"keygen", gpFile_.getPath(), "user1", "a", apFileS.getPath(), key1AFile.getPath()} - }; - int exitCode_expected = 2; - - for (String[] command : commands) { - int exitCode = cmd.execute(command); - - String msg = String.format("command \"%s\" output %d exitCode. Expected: %d.", command[0], exitCode, exitCode_expected); - assertEquals(msg, exitCode_expected, exitCode); + PrintStream systemErr = System.err; + try (PrintStream errorStream = new PrintStream(fakeOutput)) { + System.setErr(errorStream); + File gpFile_ = Files.createTempFile("fake", "gpFile").toFile(); + gpFile.deleteOnExit(); + gpFile_.delete(); + String[][] commands = { + {"asetup", "-f", gpFile_.getPath(), "authority1", apFileS.getPath(), apFileP.getPath(), "a", "b", "c", "d"}, + {"dec", gpFile_.getPath(), "user1", encFile.getPath(), resFile2.getPath(), + key1AFile.getPath()}, + {"enc", gpFile_.getPath(), resFile.getPath(), policy, encFile.getPath(), + apFileP.getPath()}, + {"keygen", gpFile_.getPath(), "user1", "a", apFileS.getPath(), key1AFile.getPath()} + }; + int exitCode_expected = 2; + + for (String[] command : commands) { + int exitCode = cmd.execute(command); + + String msg = String.format("command \"%s\" output %d exitCode. Expected: %d.", command[0], exitCode, exitCode_expected); + assertEquals(exitCode_expected, exitCode, msg); + } } - System.setErr(SystemErr); + System.setErr(systemErr); } @Test @@ -287,7 +291,7 @@ public void testCommandFailsWhenInputFilePathIsInvalid() { int exitCode = cmd.execute(command); String msg = String.format("command \"%s\" output %d exitCode. Expected: %d.", command[0], exitCode, exitCode_expected); - assertEquals(msg, exitCode_expected, exitCode); + assertEquals(exitCode_expected, exitCode, msg); } } } diff --git a/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/CiphertextTest.java b/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/CiphertextTest.java index f64545b..e48572c 100644 --- a/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/CiphertextTest.java +++ b/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/CiphertextTest.java @@ -1,8 +1,8 @@ package sg.edu.ntu.sce.sands.crypto.dcpabe; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import sg.edu.ntu.sce.sands.crypto.dcpabe.ac.AccessStructure; import java.io.ByteArrayInputStream; @@ -10,8 +10,9 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CiphertextTest { private static GlobalParameters gp; @@ -19,13 +20,13 @@ public class CiphertextTest { private AccessStructure arho; private PublicKeys pks; - @BeforeClass + @BeforeAll public static void init() { gp = DCPABE.globalSetup(160); authority = DCPABE.authoritySetup("authority", gp, "A", "B", "C", "D"); } - @Before + @BeforeEach public void setUp() { arho = AccessStructure.buildFromPolicy("and A or D and C B"); pks = new PublicKeys(); @@ -35,28 +36,26 @@ public void setUp() { @Test public void testSerialization() throws Exception { Ciphertext ct = DCPABE.encrypt(DCPABE.generateRandomMessage(gp), arho, gp, pks); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(baos); - - oos.writeObject(ct); - - oos.close(); - - ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray())); + try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(baos);) { + oos.writeObject(ct); - Ciphertext ct1 = (Ciphertext) ois.readObject(); + try (ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));) { + Ciphertext ct1 = (Ciphertext) ois.readObject(); - assertArrayEquals("C0", ct.getC0(), ct1.getC0()); + assertArrayEquals(ct.getC0(), ct1.getC0()); - assertEquals("access structure differ", ct.getAccessStructure(), ct1.getAccessStructure()); + assertEquals(ct.getAccessStructure(), ct1.getAccessStructure()); - assertEquals("differ on l", ct.getAccessStructure().getL(), ct1.getAccessStructure().getL()); - assertEquals("differ on n", ct.getAccessStructure().getN(), ct1.getAccessStructure().getN()); + assertEquals(ct.getAccessStructure().getL(), ct1.getAccessStructure().getL()); + assertEquals(ct.getAccessStructure().getN(), ct1.getAccessStructure().getN()); - for (int i = 0; i < ct.getAccessStructure().getL(); i++) { - assertArrayEquals("differ on C1" + i, ct.getC1(i), ct1.getC1(i)); - assertArrayEquals("differ on C2" + i, ct.getC2(i), ct1.getC2(i)); - assertArrayEquals("differ on C3" + i, ct.getC3(i), ct1.getC3(i)); + for (int i = 0; i < ct.getAccessStructure().getL(); i++) { + assertArrayEquals(ct.getC1(i), ct1.getC1(i), "differ on C1" + i); + assertArrayEquals(ct.getC2(i), ct1.getC2(i), "differ on C2" + i); + assertArrayEquals(ct.getC3(i), ct1.getC3(i), "differ on C3" + i); + } + } } } } diff --git a/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/GlobalParametersTest.java b/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/GlobalParametersTest.java index ff9a4ba..61c386d 100644 --- a/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/GlobalParametersTest.java +++ b/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/GlobalParametersTest.java @@ -1,13 +1,14 @@ package sg.edu.ntu.sce.sands.crypto.dcpabe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class GlobalParametersTest { @@ -29,5 +30,4 @@ public void testSerialization() throws Exception { assertEquals(gp, gp1); } - } diff --git a/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/SerializationTest.java b/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/SerializationTest.java index 008f8f8..5a31dfd 100644 --- a/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/SerializationTest.java +++ b/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/SerializationTest.java @@ -1,7 +1,7 @@ package sg.edu.ntu.sce.sands.crypto.dcpabe; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import sg.edu.ntu.sce.sands.crypto.dcpabe.ac.AccessStructure; import sg.edu.ntu.sce.sands.crypto.dcpabe.key.PersonalKey; import sg.edu.ntu.sce.sands.crypto.dcpabe.key.PublicKey; @@ -9,14 +9,12 @@ import java.util.Collections; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class SerializationTest { private static final ObjectMapper mapper = new ObjectMapper(); - @Test public void serializeGlobalParameters() throws Exception { GlobalParameters gp = DCPABE.globalSetup(160); @@ -28,7 +26,7 @@ public void serializeGlobalParameters() throws Exception { GlobalParameters deserialized = mapper.readValue(serializedValue, GlobalParameters.class); assertNotNull(deserialized); - assertThat(gp, equalTo(deserialized)); + assertEquals(gp, deserialized); } @Test @@ -42,7 +40,7 @@ public void serializeAuthorityKeys() throws Exception { AuthorityKeys deserialized = mapper.readValue(serializedValue, AuthorityKeys.class); assertNotNull(deserialized); - assertThat(authorityKeys, equalTo(deserialized)); + assertEquals(authorityKeys, deserialized); } @Test @@ -56,7 +54,7 @@ public void serializeAccessStructure() throws Exception { AccessStructure deserialized = mapper.readValue(serializedValue, AccessStructure.class); assertNotNull(deserialized); - assertThat(ac.toString(), equalTo(deserialized.toString())); + assertEquals(ac.toString(), deserialized.toString()); } @Test @@ -70,7 +68,7 @@ public void serializeMessage() throws Exception { Message deserialized = mapper.readValue(serializedValue, Message.class); assertNotNull(deserialized); - assertThat(message, equalTo(deserialized)); + assertEquals(message, deserialized); } @Test @@ -84,7 +82,7 @@ public void serializePersonalKey() throws Exception { PersonalKey deserialized = mapper.readValue(serializedValue, PersonalKey.class); assertNotNull(deserialized); - assertThat(personalKey, equalTo(deserialized)); + assertEquals(personalKey, deserialized); } @Test @@ -98,7 +96,7 @@ public void serializePublicKey() throws Exception { PublicKey deserialized = mapper.readValue(serializedValue, PublicKey.class); assertNotNull(deserialized); - assertThat(publicKey, equalTo(deserialized)); + assertEquals(publicKey, deserialized); } @Test @@ -112,7 +110,7 @@ public void serializeSecretKey() throws Exception { SecretKey deserialized = mapper.readValue(serializedValue, SecretKey.class); assertNotNull(deserialized); - assertThat(secretKey, equalTo(deserialized)); + assertEquals(secretKey, deserialized); } @Test @@ -127,7 +125,7 @@ public void serializePersonalKeys() throws Exception { PersonalKeys deserialized = mapper.readValue(serializedValue, PersonalKeys.class); assertNotNull(deserialized); - assertThat(personalKeys, equalTo(deserialized)); + assertEquals(personalKeys, deserialized); } @Test @@ -144,6 +142,6 @@ public void serializePublicKeys() throws Exception { PublicKeys deserialized = mapper.readValue(serializedValue, PublicKeys.class); assertNotNull(deserialized); - assertThat(publicKeys, equalTo(deserialized)); + assertEquals(publicKeys, deserialized); } } diff --git a/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/ac/AccessStructureTest.java b/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/ac/AccessStructureTest.java index 94b1cd1..3a135fb 100644 --- a/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/ac/AccessStructureTest.java +++ b/src/test/java/sg/edu/ntu/sce/sands/crypto/dcpabe/ac/AccessStructureTest.java @@ -1,26 +1,19 @@ package sg.edu.ntu.sce.sands.crypto.dcpabe.ac; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.Test; import sg.edu.ntu.sce.sands.crypto.dcpabe.ac.AccessStructure.MatrixElement; -import static org.junit.Assert.assertEquals; - import java.util.Arrays; -public class AccessStructureTest { - private AccessStructure arho; - private String policy; +import static org.junit.jupiter.api.Assertions.assertEquals; - @Before - public void setUp() { - policy = "and or D and C B A"; - arho = AccessStructure.buildFromPolicy(policy); - } +public class AccessStructureTest { + private final String policy = "and or D and C B A"; @Test public void testPolicyToStringConversion() throws Exception { + AccessStructure arho = AccessStructure.buildFromPolicy(policy); + String recoveredPolicy = arho.toString(); assertEquals(policy, recoveredPolicy); }