From 7f068ee639bdd31795856376ed472cc5067a6a98 Mon Sep 17 00:00:00 2001 From: garnierj Date: Thu, 17 Jan 2019 11:32:14 +0100 Subject: [PATCH 1/2] [MPESW-287] follow dependency updates from BE-CO --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 03c36020e..297742ca0 100644 --- a/build.gradle +++ b/build.gradle @@ -90,14 +90,14 @@ sourceCompatibility = JavaVersion.VERSION_1_8 dependencies { compile 'org.jscience:jscience:4.3.1' - compile 'com.google.guava:guava:21.0' + compile 'com.google.guava:guava:27.0.1-jre' compile 'org.hamcrest:hamcrest-all:1.3' compile 'org.slf4j:slf4j-api:1.7.25' testCompile 'junit:junit:4.12' testCompile 'org.slf4j:slf4j-log4j12:+' testCompile 'pl.pragmatists:JUnitParams:1.0.4' - testCompile 'org.mockito:mockito-core:1.10.19' + testCompile 'org.mockito:mockito-core:2.23.+' testCompile 'org.objenesis:objenesis:2.4' testCompile 'com.openpojo:openpojo:0.8.10' testCompile 'org.assertj:assertj-core:3.6.1' From 40e295ec81784d01bf13b5dce81bd7348c0d5552 Mon Sep 17 00:00:00 2001 From: garnierj Date: Thu, 17 Jan 2019 13:04:57 +0100 Subject: [PATCH 2/2] [MPESW-287] adapted test to IsCloseTo (instead of IsEqualWithDelta that was failing --- gradlew.bat | 168 +++++++++--------- .../core/lang/TensoricDoublesTest.java | 3 +- 2 files changed, 86 insertions(+), 85 deletions(-) diff --git a/gradlew.bat b/gradlew.bat index f9553162f..e95643d6a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,84 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/test/org/tensorics/core/lang/TensoricDoublesTest.java b/src/test/org/tensorics/core/lang/TensoricDoublesTest.java index a9a35127c..a37e9378f 100644 --- a/src/test/org/tensorics/core/lang/TensoricDoublesTest.java +++ b/src/test/org/tensorics/core/lang/TensoricDoublesTest.java @@ -15,6 +15,7 @@ import javax.measure.unit.Unit; +import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; import org.mockito.internal.matchers.EqualsWithDelta; @@ -78,6 +79,6 @@ private void verifyQuantifiedIterableOperationResult( Unit expectedUnit) { QuantifiedValue result = operation.apply(iterableSample); assertThat(result.unit(), is(JScienceUnit.of(expectedUnit))); - assertThat(result.value(), is(new EqualsWithDelta(expectedResult, DELTA))); + assertThat(result.value(), is(Matchers.closeTo(expectedResult, DELTA))); } }