diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4cccf7d4609696f685cde456c9a30741ae864252..2c599a8120826bd2c529433865a969b29708473f 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -13,13 +13,18 @@ <component name="FileTemplateManagerImpl"> <option name="RECENT_TEMPLATES"> <list> - <option value="JUnit5 Test Class" /> <option value="Interface" /> <option value="Class" /> + <option value="JUnit5 Test Class" /> </list> </option> </component> <component name="Git.Settings"> + <option name="RECENT_BRANCH_BY_REPOSITORY"> + <map> + <entry key="$PROJECT_DIR$" value="main" /> + </map> + </option> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> </component> <component name="GitLabMergeRequestFiltersHistory">{ @@ -45,9 +50,6 @@ "associatedIndex": 5 }</component> <component name="ProjectId" id="2cggNoXvjri5cZ9W4t6fo74z0NY" /> - <component name="ProjectLevelVcsManager" settingsEditedManually="true"> - <ConfirmationsSetting value="2" id="Add" /> - </component> <component name="ProjectViewState"> <option name="hideEmptyMiddlePackages" value="true" /> <option name="showLibraryContents" value="true" /> @@ -113,45 +115,40 @@ <workItem from="1709034872041" duration="1465000" /> <workItem from="1709036348601" duration="309000" /> </task> - <task id="LOCAL-00001" summary="created complex class"> + <task id="LOCAL−00001" summary="Created Vector2D class and test"> <option name="closed" value="true" /> - <created>1708954060982</created> - <option name="number" value="00001" /> - <option name="presentableId" value="LOCAL-00001" /> - <option name="project" value="LOCAL" /> - <updated>1708954060982</updated> + <created>1708952994163</created> + <option name="number" value="LOCAL−00001" /> + <option name="presentableId" value="LOCAL−00001" /> + <updated>1708952994163</updated> </task> - <task id="LOCAL-00002" summary="edited methods in Vector2D"> + <task id="LOCAL−00002" summary="created methods for Vector2D"> <option name="closed" value="true" /> - <created>1708954310912</created> - <option name="number" value="00002" /> - <option name="presentableId" value="LOCAL-00002" /> - <option name="project" value="LOCAL" /> - <updated>1708954310912</updated> + <created>1708953067389</created> + <option name="number" value="LOCAL−00002" /> + <option name="presentableId" value="LOCAL−00002" /> + <updated>1708953067389</updated> </task> - <task id="LOCAL-00003" summary="Added sqrt in Complex"> + <task id="LOCAL−00003" summary="Created Matrix2x2 class and test"> <option name="closed" value="true" /> - <created>1708955293012</created> - <option name="number" value="00003" /> - <option name="presentableId" value="LOCAL-00003" /> - <option name="project" value="LOCAL" /> - <updated>1708955293012</updated> + <created>1708953126746</created> + <option name="number" value="LOCAL−00003" /> + <option name="presentableId" value="LOCAL−00003" /> + <updated>1708953126746</updated> </task> - <task id="LOCAL-00004" summary="Vector added scale Method"> + <task id="LOCAL−00004" summary="Created multiply method for Matrix2x2"> <option name="closed" value="true" /> - <created>1708958859835</created> - <option name="number" value="00004" /> - <option name="presentableId" value="LOCAL-00004" /> - <option name="project" value="LOCAL" /> - <updated>1708958859835</updated> + <created>1708953168253</created> + <option name="number" value="LOCAL−00004" /> + <option name="presentableId" value="LOCAL−00004" /> + <updated>1708953168253</updated> </task> - <task id="LOCAL-00005" summary="Added Transform2D interface"> + <task id="LOCAL−00005" summary="Created positive tests for Vector2D add()"> <option name="closed" value="true" /> - <created>1708959017483</created> - <option name="number" value="00005" /> - <option name="presentableId" value="LOCAL-00005" /> - <option name="project" value="LOCAL" /> - <updated>1708959017483</updated> + <created>1709037382911</created> + <option name="number" value="LOCAL−00005" /> + <option name="presentableId" value="LOCAL−00005" /> + <updated>1709037382911</updated> </task> <task id="LOCAL-00006" summary="Added AffineTransform2D"> <option name="closed" value="true" /> @@ -199,17 +196,6 @@ <component name="TypeScriptGeneratedFilesManager"> <option name="version" value="3" /> </component> - <component name="Vcs.Log.Tabs.Properties"> - <option name="TAB_STATES"> - <map> - <entry key="MAIN"> - <value> - <State /> - </value> - </entry> - </map> - </option> - </component> <component name="VcsManagerConfiguration"> <MESSAGE value="created complex class" /> <MESSAGE value="edited methods in Vector2D" /> diff --git a/src/test/java/edu/ntnu/idatt2003/Vector2DTest.java b/src/test/java/edu/ntnu/idatt2003/Vector2DTest.java index 87a68477098c8c1fcc8dd3de544183fdc622ba1f..b7e1355f5066b58fd7fb045d31b97ba36124327d 100644 --- a/src/test/java/edu/ntnu/idatt2003/Vector2DTest.java +++ b/src/test/java/edu/ntnu/idatt2003/Vector2DTest.java @@ -2,6 +2,113 @@ package edu.ntnu.idatt2003; import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + class Vector2DTest { + @Nested + @DisplayName("Positive tests for Vector2D, returns correct values") + public class MethodsReturnsCorrectValues { + + @Nested + @DisplayName("Positive tests for add, returns correct values") + public class AddReturnsCorrectValues { + @Test + @DisplayName("Add returns correct values, test 1") + void addReturnsCorrectValues1() { + Vector2D vector1 = new Vector2D(5, 2); + Vector2D vector2 = new Vector2D(4, 1); + Vector2D vector3 = vector1.add(vector2); + assertEquals(9, vector3.getX0()); + assertEquals(3, vector3.getX1()); + } + + @Test + @DisplayName("Add returns correct values, test 2") + void addReturnsCorrectValues2() { + Vector2D vector1 = new Vector2D(-1, 2); + Vector2D vector2 = new Vector2D(3, -4); + Vector2D vector3 = vector1.add(vector2); + assertEquals(2, vector3.getX0()); + assertEquals(-2, vector3.getX1()); + } + + @Test + @DisplayName("Add returns correct values, test 3") + void addReturnsCorrectValues3() { + Vector2D vector1 = new Vector2D(0, 0); + Vector2D vector2 = new Vector2D(0, 0); + Vector2D vector3 = vector1.add(vector2); + assertEquals(0, vector3.getX0()); + assertEquals(0, vector3.getX1()); + } + } + + @Nested + @DisplayName("Positive tests for subtract, returns correct values") + public class SubtractReturnsCorrectValues { + @Test + @DisplayName("Subtract returns correct values, test 1") + void subtractReturnsCorrectValues1() { + Vector2D vector1 = new Vector2D(5, 2); + Vector2D vector2 = new Vector2D(4, 1); + Vector2D vector3 = vector1.subtract(vector2); + assertEquals(1, vector3.getX0()); + assertEquals(1, vector3.getX1()); + } + + @Test + @DisplayName("Subtract returns correct values, test 2") + void subtractReturnsCorrectValues2() { + Vector2D vector1 = new Vector2D(-1, -2); + Vector2D vector2 = new Vector2D(-3, 4); + Vector2D vector3 = vector1.subtract(vector2); + assertEquals(2, vector3.getX0()); + assertEquals(-6, vector3.getX1()); + } + + @Test + @DisplayName("Subtract returns correct values, test 3") + void subtractReturnsCorrectValues3() { + Vector2D vector1 = new Vector2D(0, 0); + Vector2D vector2 = new Vector2D(3, 0); + Vector2D vector3 = vector1.subtract(vector2); + assertEquals(-3, vector3.getX0()); + assertEquals(0, vector3.getX1()); + } + } + + @Nested + @DisplayName("Positive tests for scale, returns correct values") + public class ScaleReturnsCorrectValues { + @Test + @DisplayName("Scale returns correct values, test 1") + void scaleReturnsCorrectValues1() { + Vector2D vector1 = new Vector2D(5, 2); + Vector2D vector2 = vector1.scale(3); + assertEquals(15, vector2.getX0()); + assertEquals(6, vector2.getX1()); + } + + @Test + @DisplayName("Scale returns correct values, test 2") + void scaleReturnsCorrectValues2() { + Vector2D vector1 = new Vector2D(-1, -2); + Vector2D vector2 = vector1.scale(4); + assertEquals(-4, vector2.getX0()); + assertEquals(-8, vector2.getX1()); + } + + @Test + @DisplayName("Scale returns correct values, test 3") + void scaleReturnsCorrectValues3() { + Vector2D vector1 = new Vector2D(0, 0); + Vector2D vector2 = vector1.scale(3); + assertEquals(0, vector2.getX0()); + assertEquals(0, vector2.getX1()); + } + } + } } \ No newline at end of file