diff --git a/.gitignore b/.gitignore index d16bbbe..7f55b2c 100644 --- a/.gitignore +++ b/.gitignore @@ -74,4 +74,8 @@ fabric.properties .idea/httpRequests # Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser \ No newline at end of file +.idea/caches/build_file_checksums.ser + +oolab/.idea +oolab/gradlew +oolab/gradlew.bat \ No newline at end of file diff --git a/README.md b/README.md index 586c886..c866fcf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ Kamil Rudny Piątek 11:20 Gerard -https://gitexercises.fracz.com/committer/4a757cf05e8a3f76ed8599ee38a79085391ed03d?email=karudny@student.agh.edu.pl \ No newline at end of file +https://gitexercises.fracz.com/committer/4a757cf05e8a3f76ed8599ee38a79085391ed03d?email=karudny@student.agh.edu.pl + +Za zadania z gita z srebrnej skrzynki chce marchewkę lab, a z brązowej weterynarza. diff --git a/oolab/.gitignore b/oolab/.gitignore deleted file mode 100644 index b63da45..0000000 --- a/oolab/.gitignore +++ /dev/null @@ -1,42 +0,0 @@ -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/oolab/.idea/.gitignore b/oolab/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/oolab/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/oolab/.idea/gradle.xml b/oolab/.idea/gradle.xml deleted file mode 100644 index 2a65317..0000000 --- a/oolab/.idea/gradle.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/oolab/.idea/misc.xml b/oolab/.idea/misc.xml deleted file mode 100644 index 10f381e..0000000 --- a/oolab/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/oolab/.idea/vcs.xml b/oolab/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/oolab/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/oolab/build.gradle b/oolab/build.gradle index 8cbbdd0..2618d76 100644 --- a/oolab/build.gradle +++ b/oolab/build.gradle @@ -13,6 +13,7 @@ repositories { dependencies { testImplementation platform('org.junit:junit-bom:5.9.1') testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation 'junit:junit:4.13.1' } test { diff --git a/oolab/gradlew b/oolab/gradlew deleted file mode 100644 index 1b6c787..0000000 --- a/oolab/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# 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 -# -# https://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. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# 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 -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -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"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -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 - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -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. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - 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. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/oolab/gradlew.bat b/oolab/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/oolab/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@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 Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@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="-Xmx64m" "-Xms64m" - -@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 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. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -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. - -goto fail - -: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 %* - -: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/oolab/src/main/java/agh/ics/oop/World.java b/oolab/src/main/java/agh/ics/oop/World.java index 248ec9d..95a8f9a 100644 --- a/oolab/src/main/java/agh/ics/oop/World.java +++ b/oolab/src/main/java/agh/ics/oop/World.java @@ -1,6 +1,8 @@ package agh.ics.oop; +import agh.ics.oop.model.MapDirection; import agh.ics.oop.model.MoveDirection; +import agh.ics.oop.model.Vector2d; import java.util.Objects; @@ -25,8 +27,22 @@ public static void run(MoveDirection[] directions) { } } public static void main(String[] args) { - System.out.println("System zaczął działanie"); + /*System.out.println("System zaczął działanie"); run(OptionsParser.Parser(args)); System.out.println("System skończył działanie"); + + Vector2d position1 = new Vector2d(1,2); + System.out.println(position1); + Vector2d position2 = new Vector2d(-2,1); + System.out.println(position2); + System.out.println(position1.add(position2));*/ + + MapDirection direction = MapDirection.EAST; + System.out.println("Aktualny kierunek: " + direction); + System.out.println("Następny kierunek: " + direction.next()); + System.out.println("Poprzedni kierunek: " + direction.previous()); + System.out.println("Jednostkowy wektor: " + direction.toUnitVector()); + + } } diff --git a/oolab/src/main/java/agh/ics/oop/model/MapDirection.java b/oolab/src/main/java/agh/ics/oop/model/MapDirection.java new file mode 100644 index 0000000..5bf5d12 --- /dev/null +++ b/oolab/src/main/java/agh/ics/oop/model/MapDirection.java @@ -0,0 +1,41 @@ +package agh.ics.oop.model; + +public enum MapDirection { + NORTH, SOUTH, EAST, WEST; + + @Override + public String toString() { + return switch (this) { + case NORTH -> "Północ"; + case EAST -> "Wschód"; + case SOUTH -> "Południe"; + case WEST -> "Zachód"; + }; + } + public MapDirection next() { + return switch (this) { + case NORTH -> EAST; + case EAST -> SOUTH; + case SOUTH -> WEST; + case WEST -> NORTH; + }; + } + + public MapDirection previous() { + return switch (this) { + case NORTH -> WEST; + case EAST -> NORTH; + case SOUTH -> EAST; + case WEST -> SOUTH; + }; + } + + public Vector2d toUnitVector() { + return switch (this) { + case NORTH -> new Vector2d(0, 1); + case EAST -> new Vector2d(1,0); + case SOUTH -> new Vector2d(0, -1); + case WEST -> new Vector2d(-1,0); + }; + } +} diff --git a/oolab/src/main/java/agh/ics/oop/model/Vector2d.java b/oolab/src/main/java/agh/ics/oop/model/Vector2d.java new file mode 100644 index 0000000..1e880e9 --- /dev/null +++ b/oolab/src/main/java/agh/ics/oop/model/Vector2d.java @@ -0,0 +1,90 @@ +package agh.ics.oop.model; + + +import java.util.Objects; + +public class Vector2d { + private final int x; + private final int y; + + public Vector2d(int x, int y) { + this.x = x; + this.y = y; + } + + public int getX() { + return x; + } + + public int getY(){ + return y; + } + + public String toString() { + return "(" + x + "," + y + ")"; + } + + public boolean precedes(Vector2d other) { + if (other.getX() > x && other.getY() > y) { + return true; + } + else { + return false; + } + } + + public boolean follows(Vector2d other) { + if (other.getX() <= x && other.getY() <= y) { + return true; + } + else { + return false; + } + } + + public Vector2d add(Vector2d other) { + int new_x = other.getX() + x; + int new_y = other.getY() + y; + + return new Vector2d(new_x, new_y); + } + + public Vector2d subtract(Vector2d other) { + int new_x = x - other.getX(); + int new_y = y - other.getY(); + + return new Vector2d(new_x, new_y); + } + + public Vector2d upperRight(Vector2d other) { + return new Vector2d(Math.max(this.getX(), other.getX()), Math.max(this.getY(), other.getY())); + } + + public Vector2d lowerLeft(Vector2d other) { + return new Vector2d(Math.min(this.getX(), other.getX()), Math.min(this.getY(), other.getY())); + } + + public Vector2d opposite() { + int x = getX(); + int y = getY(); + + return new Vector2d(y, x); + } + + @Override + public boolean equals(Object other) { + if (this == other) return true; + if (other == null || getClass() != other.getClass()) return false; + Vector2d vector2d = (Vector2d) other; + return x == vector2d.x && y == vector2d.y; + } + + @Override + public int hashCode() { + return Objects.hash(x, y); + } + + + + +} diff --git a/oolab/src/test/java/agh/ics/oop/model/MapDirectionTest.java b/oolab/src/test/java/agh/ics/oop/model/MapDirectionTest.java new file mode 100644 index 0000000..3daa75c --- /dev/null +++ b/oolab/src/test/java/agh/ics/oop/model/MapDirectionTest.java @@ -0,0 +1,22 @@ +package agh.ics.oop.model; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class MapDirectionTest { + @Test + public void next() { + assertEquals(MapDirection.EAST, MapDirection.NORTH.next()); + assertEquals(MapDirection.NORTH, MapDirection.WEST.next()); + assertEquals(MapDirection.WEST, MapDirection.SOUTH.next()); + assertEquals(MapDirection.SOUTH, MapDirection.EAST.next()); + } + + @Test + public void previous() { + assertEquals(MapDirection.WEST, MapDirection.NORTH.previous()); + assertEquals(MapDirection.SOUTH, MapDirection.WEST.previous()); + assertEquals(MapDirection.EAST, MapDirection.SOUTH.previous()); + assertEquals(MapDirection.NORTH, MapDirection.EAST.previous()); + } +} diff --git a/oolab/src/test/java/agh/ics/oop/model/OptionsParserTest.java b/oolab/src/test/java/agh/ics/oop/model/OptionsParserTest.java new file mode 100644 index 0000000..7506c54 --- /dev/null +++ b/oolab/src/test/java/agh/ics/oop/model/OptionsParserTest.java @@ -0,0 +1,20 @@ +package agh.ics.oop.model; +import agh.ics.oop.OptionsParser; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +public class OptionsParserTest { + @Test + public void testParseValidDirections() { + String[] args = {"f", "b", "l", "r"}; + MoveDirection[] result = OptionsParser.Parser(args); + + assertArrayEquals(new MoveDirection[]{MoveDirection.FORWARD, MoveDirection.BACKWARDS, MoveDirection.LEFT, MoveDirection.RIGHT}, result); + + String[] args1 = {"f", "r", "k", "r"}; + MoveDirection[] result1 = OptionsParser.Parser(args1); + + assertArrayEquals(new MoveDirection[]{MoveDirection.FORWARD, MoveDirection.RIGHT, null, MoveDirection.RIGHT}, result1); + } +} diff --git a/oolab/src/test/java/agh/ics/oop/model/Vector2dTest.java b/oolab/src/test/java/agh/ics/oop/model/Vector2dTest.java new file mode 100644 index 0000000..8d558e4 --- /dev/null +++ b/oolab/src/test/java/agh/ics/oop/model/Vector2dTest.java @@ -0,0 +1,100 @@ +package agh.ics.oop.model; + +import agh.ics.oop.model.Vector2d; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +public class Vector2dTest { + @Test + public void add() { + Vector2d v1 = new Vector2d(1,1); + Vector2d v2 = new Vector2d(0,0); + Vector2d v3 = new Vector2d(5,4); + Vector2d v4 = new Vector2d(3,1); + + assertEquals(new Vector2d(1,1), v1.add(v2)); + assertEquals(new Vector2d(8,5), v3.add(v4)); + } + @Test + public void subtract() { + Vector2d v1 = new Vector2d(1,1); + Vector2d v2 = new Vector2d(0,0); + Vector2d v3 = new Vector2d(5,4); + Vector2d v4 = new Vector2d(3,1); + + assertEquals(new Vector2d(1,1), v1.subtract(v2)); + assertEquals(new Vector2d(2,3), v3.subtract(v4)); + } + @Test + public void opposite(){ + Vector2d v1 = new Vector2d(5,3); + + assertEquals(new Vector2d(3,5), v1.opposite()); + } + @Test + public void testToString(){ + Vector2d v1 = new Vector2d(5,3); + + assertEquals("(5,3)", v1.toString()); + } + + @Test + public void precedes(){ + Vector2d v1 = new Vector2d(0,0); + Vector2d v2 = new Vector2d(1,1); + Vector2d v3 = new Vector2d(2,5); + Vector2d v4 = new Vector2d(0,0); + + assertTrue(v1.precedes(v2)); + assertFalse(v3.precedes(v4)); + } + + @Test + public void follows(){ + Vector2d v1 = new Vector2d(0,0); + Vector2d v2 = new Vector2d(1,1); + Vector2d v3 = new Vector2d(2,5); + Vector2d v4 = new Vector2d(2,4); + Vector2d v5 = new Vector2d(0,0); + + assertFalse(v1.follows(v2)); + assertTrue(v3.follows(v4)); + assertTrue(v5.follows(v5)); + } + @Test + public void testEquals() { + Vector2d v1 = new Vector2d(3, 7); + Vector2d v2 = new Vector2d(3, 7); + Vector2d v3 = new Vector2d(3, 7); + Vector2d v4 = new Vector2d(3, 7); + Vector2d v5 = new Vector2d(5, 8); + + assertTrue(v1.equals(v1)); + assertTrue(v2.equals(v3)); + assertFalse(v4.equals(v5)); + } + + @Test + public void testUpperRight() { + // Arrange + Vector2d v1 = new Vector2d(3, 7); + Vector2d v2 = new Vector2d(5, 4); + Vector2d v3 = new Vector2d(-2, 10); + + assertEquals(new Vector2d(5, 7), v1.upperRight(v2)); + assertEquals(new Vector2d(5, 10), v2.upperRight(v3)); + assertEquals(new Vector2d(3, 10), v3.upperRight(v1)); + } + + @Test + public void testLowerLeft() { + Vector2d v1 = new Vector2d(3, 7); + Vector2d v2 = new Vector2d(5, 4); + Vector2d v3 = new Vector2d(-2, 10); + + assertEquals(new Vector2d(3, 4), v1.lowerLeft(v2)); + assertEquals(new Vector2d(-2, 4), v2.lowerLeft(v3)); + assertEquals(new Vector2d(-2, 7), v3.lowerLeft(v1)); + } +}