diff --git a/.gitattributes b/.gitattributes index 00a51af..f91f646 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,12 @@ # # https://help.github.com/articles/dealing-with-line-endings/ # -# These are explicitly windows files and should use crlf +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf *.bat text eol=crlf +# Binary files should be left untouched +*.jar binary + diff --git a/.gitignore b/.gitignore index 652102b..1b6985c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,5 @@ -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - # Ignore Gradle project-specific cache directory .gradle # Ignore Gradle build output directory build - -# Ignore IntelliJ IDEA project files -.idea diff --git a/app/bin/main/org/example/App.class b/app/bin/main/org/example/App.class new file mode 100644 index 0000000..1d77653 Binary files /dev/null and b/app/bin/main/org/example/App.class differ diff --git a/app/bin/test/org/example/AppTest.class b/app/bin/test/org/example/AppTest.class new file mode 100644 index 0000000..838bfa6 Binary files /dev/null and b/app/bin/test/org/example/AppTest.class differ diff --git a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java index 84c04f2..c1a3764 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -81,7 +81,6 @@ public void pressUnaryOperationKey(String operation) { default -> throw new IllegalArgumentException(); }; screen = Double.toString(result); - if(screen.equals("NaN")) screen = "Error"; if(screen.contains(".") && screen.length() > 11) screen = screen.substring(0, 10); } @@ -94,7 +93,7 @@ public void pressUnaryOperationKey(String operation) { * Beim zweimaligem Drücken, oder wenn bereits ein Trennzeichen angezeigt wird, passiert nichts. */ public void pressDotKey() { - if(!screen.contains(".")) screen = screen + "."; + if(!screen.endsWith(".")) screen = screen + "."; } /** @@ -119,15 +118,20 @@ public void pressNegativeKey() { */ public void pressEqualsKey() { var result = switch(latestOperation) { + case "√" -> Math.sqrt(Double.parseDouble(screen));// todo methode testNegativeSquare + case "+" -> latestValue + Double.parseDouble(screen); case "-" -> latestValue - Double.parseDouble(screen); case "x" -> latestValue * Double.parseDouble(screen); case "/" -> latestValue / Double.parseDouble(screen); + default -> throw new IllegalArgumentException(); }; screen = Double.toString(result); - if(screen.equals("Infinity")) screen = "Error"; if(screen.endsWith(".0")) screen = screen.substring(0,screen.length()-2); if(screen.contains(".") && screen.length() > 11) screen = screen.substring(0, 10); + + if(screen.equals("NaN"))screen = "error"; //rote Test todo testNegativeSquare + if(screen.equals("Infinity"))screen = "error"; //rote test todo methode testNullDivision } } diff --git a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java index ddff0da..d0eca81 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -3,26 +3,26 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; + + import static org.junit.jupiter.api.Assertions.assertEquals; @DisplayName("Retro calculator") class CalculatorTest { + @Test @DisplayName("should display result after adding two positive multi-digit numbers") void testPositiveAddition() { Calculator calc = new Calculator(); - calc.pressDigitKey(2); calc.pressDigitKey(0); calc.pressBinaryOperationKey("+"); calc.pressDigitKey(2); calc.pressDigitKey(0); calc.pressEqualsKey(); - String expected = "40"; String actual = calc.readScreen(); - assertEquals(expected, actual); } @@ -30,65 +30,76 @@ void testPositiveAddition() { @DisplayName("should display result after getting the square root of two") void testSquareRoot() { Calculator calc = new Calculator(); - calc.pressDigitKey(2); calc.pressUnaryOperationKey("√"); - String expected = "1.41421356"; String actual = calc.readScreen(); - assertEquals(expected, actual); } + //Teilaufgabe ha1 1.grüner Test minus 2 positive nummer + @Test + @DisplayName("should display result after minus two positive multi-digit numbers") + void testPositiveMinus() { + Calculator calc = new Calculator(); + calc.pressDigitKey(4); + calc.pressDigitKey(0); + calc.pressBinaryOperationKey("-"); + calc.pressDigitKey(3); + calc.pressDigitKey(0); + calc.pressEqualsKey(); + String expected = "10"; + String actual = calc.readScreen(); + assertEquals(expected, actual); + } + //Teilaufgabe1 ha1 2.grüner Test division 2 positive nummer @Test - @DisplayName("should display error when dividing by zero") - void testDivisionByZero() { + @DisplayName("should display result after division two positive multi-digit numbers") + void testPositiveDivision() { Calculator calc = new Calculator(); - calc.pressDigitKey(7); + calc.pressDigitKey(2); calc.pressBinaryOperationKey("/"); - calc.pressDigitKey(0); + calc.pressDigitKey(2); calc.pressEqualsKey(); - String expected = "Error"; + String expected = "1"; String actual = calc.readScreen(); assertEquals(expected, actual); } - + //Teilaufgabe2 ha1. 1. roter Test division durch null ,error muss sein. @Test - @DisplayName("should display error when drawing the square root of a negative number") - void testSquareRootOfNegative() { + @DisplayName("should display result after division eine positive mit null multi-digit numbers") + void testNullDivision() { Calculator calc = new Calculator(); - calc.pressDigitKey(7); - calc.pressNegativeKey(); - calc.pressUnaryOperationKey("√"); + calc.pressDigitKey(4); + calc.pressBinaryOperationKey("/"); + calc.pressDigitKey(0); + calc.pressEqualsKey(); - String expected = "Error"; + String expected = "error"; String actual = calc.readScreen(); assertEquals(expected, actual); } + //Teilaufgabe2 ha1 2. roter Test negative square root nummer muss error sein. @Test - @DisplayName("should not allow multiple decimal dots") - void testMultipleDecimalDots() { + @DisplayName("should display result after the getting square root of negative numbers") + void testNegativeSquare() { Calculator calc = new Calculator(); + calc.pressNegativeKey(); - calc.pressDigitKey(1); - calc.pressDotKey(); - calc.pressDigitKey(7); - calc.pressDotKey(); - calc.pressDigitKey(8); + calc.pressDigitKey(9); + calc.pressNegativeKey(); + calc.pressUnaryOperationKey("√"); + calc.pressEqualsKey(); - String expected = "1.78"; + String expected = "error"; String actual = calc.readScreen(); assertEquals(expected, actual); } - - - //TODO hier weitere Tests erstellen -} - +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..18f452c --- /dev/null +++ b/gradle.properties @@ -0,0 +1,6 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.parallel=true +org.gradle.caching=true + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..f474039 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,8 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +guava = "33.2.1-jre" + +[libraries] +guava = { module = "com.google.guava:guava", version.ref = "guava" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e411586..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,12 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +217,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle index b08d2bc..c8d4d0f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,15 @@ -rootProject.name = 'ha1' +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.10.2/userguide/multi_project_builds.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} + +rootProject.name = 'myapp' include('app')