From 9928ee5ed7b32bd70cdc5450a110d3e61772b479 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 4 Nov 2022 12:27:50 +0100 Subject: [PATCH] Finish Project --- .idea/.gitignore | 3 ++ .idea/libraries/junit_jupiter.xml | 17 +++++++ .idea/markdown.xml | 9 ++++ .idea/misc.xml | 4 ++ .idea/modules.xml | 8 ++++ .idea/oop_crashkurs.iml | 13 ++++++ .idea/vcs.xml | 6 +++ SimpleArrayMap/.idea/.gitignore | 0 SimpleArrayMap/.idea/SimpleArrayMap.iml | 12 +++++ .../.idea/libraries/junit_jupiter.xml | 17 +++++++ SimpleArrayMap/.idea/markdown.xml | 9 ++++ SimpleArrayMap/.idea/misc.xml | 6 +++ SimpleArrayMap/.idea/modules.xml | 8 ++++ SimpleArrayMap/.idea/vcs.xml | 6 +++ SimpleArrayMap/.idea/workspace.xml | 44 +++++++++++++++++++ .../src/solution/SimpleMapTest.java | 3 +- SimpleArrayMap/src/testat/ASimpleMapTest.java | 13 +++--- SimpleArrayMap/src/testat/SimpleArrayMap.java | 4 ++ .../src/solution/SimpleLinkedList.java | 1 + 19 files changed, 176 insertions(+), 7 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/libraries/junit_jupiter.xml create mode 100644 .idea/markdown.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/oop_crashkurs.iml create mode 100644 .idea/vcs.xml create mode 100644 SimpleArrayMap/.idea/.gitignore create mode 100644 SimpleArrayMap/.idea/SimpleArrayMap.iml create mode 100644 SimpleArrayMap/.idea/libraries/junit_jupiter.xml create mode 100644 SimpleArrayMap/.idea/markdown.xml create mode 100644 SimpleArrayMap/.idea/misc.xml create mode 100644 SimpleArrayMap/.idea/modules.xml create mode 100644 SimpleArrayMap/.idea/vcs.xml create mode 100644 SimpleArrayMap/.idea/workspace.xml create mode 100644 SimpleArrayMap/src/testat/SimpleArrayMap.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/libraries/junit_jupiter.xml b/.idea/libraries/junit_jupiter.xml new file mode 100644 index 0000000..68918cd --- /dev/null +++ b/.idea/libraries/junit_jupiter.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/markdown.xml b/.idea/markdown.xml new file mode 100644 index 0000000..1e34094 --- /dev/null +++ b/.idea/markdown.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..aa34541 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..bc66fbe --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/oop_crashkurs.iml b/.idea/oop_crashkurs.iml new file mode 100644 index 0000000..d53d554 --- /dev/null +++ b/.idea/oop_crashkurs.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SimpleArrayMap/.idea/.gitignore b/SimpleArrayMap/.idea/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/SimpleArrayMap/.idea/SimpleArrayMap.iml b/SimpleArrayMap/.idea/SimpleArrayMap.iml new file mode 100644 index 0000000..547dd47 --- /dev/null +++ b/SimpleArrayMap/.idea/SimpleArrayMap.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/SimpleArrayMap/.idea/libraries/junit_jupiter.xml b/SimpleArrayMap/.idea/libraries/junit_jupiter.xml new file mode 100644 index 0000000..68918cd --- /dev/null +++ b/SimpleArrayMap/.idea/libraries/junit_jupiter.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SimpleArrayMap/.idea/markdown.xml b/SimpleArrayMap/.idea/markdown.xml new file mode 100644 index 0000000..1e34094 --- /dev/null +++ b/SimpleArrayMap/.idea/markdown.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/SimpleArrayMap/.idea/misc.xml b/SimpleArrayMap/.idea/misc.xml new file mode 100644 index 0000000..31602d7 --- /dev/null +++ b/SimpleArrayMap/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SimpleArrayMap/.idea/modules.xml b/SimpleArrayMap/.idea/modules.xml new file mode 100644 index 0000000..a8a2e0c --- /dev/null +++ b/SimpleArrayMap/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/SimpleArrayMap/.idea/vcs.xml b/SimpleArrayMap/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/SimpleArrayMap/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SimpleArrayMap/.idea/workspace.xml b/SimpleArrayMap/.idea/workspace.xml new file mode 100644 index 0000000..939d35c --- /dev/null +++ b/SimpleArrayMap/.idea/workspace.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1664472523385 + + + + \ No newline at end of file diff --git a/SimpleArrayMap/src/solution/SimpleMapTest.java b/SimpleArrayMap/src/solution/SimpleMapTest.java index 89064a0..be2bc00 100644 --- a/SimpleArrayMap/src/solution/SimpleMapTest.java +++ b/SimpleArrayMap/src/solution/SimpleMapTest.java @@ -2,12 +2,13 @@ package solution; import testat.ASimpleMapTest; import testat.ISimpleMap; +import solution.SimpleArrayMap; public class SimpleMapTest extends ASimpleMapTest{ @Override protected ISimpleMap getInstance() { - return new SimpleArrayMap<>(5); + return new SimpleArrayMap(5); } } diff --git a/SimpleArrayMap/src/testat/ASimpleMapTest.java b/SimpleArrayMap/src/testat/ASimpleMapTest.java index f22d71d..fee25a4 100644 --- a/SimpleArrayMap/src/testat/ASimpleMapTest.java +++ b/SimpleArrayMap/src/testat/ASimpleMapTest.java @@ -1,13 +1,14 @@ package testat; -import static org.junit.Assert.assertEquals; - -import java.util.function.Consumer; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.function.Consumer; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import testat.ISimpleMap; + public abstract class ASimpleMapTest { ISimpleMap map; @@ -60,7 +61,7 @@ public abstract class ASimpleMapTest { void testadd4() { add3(); map.put("4", "Vier"); - map.put("5", "Fünf"); + map.put("5", "F�nf"); map.remove("3"); map.put("6", "Sechs"); @@ -71,7 +72,7 @@ public abstract class ASimpleMapTest { actual = map.get("4"); assertEquals("Vier", actual); actual = map.get("5"); - assertEquals("Fünf", actual); + assertEquals("F�nf", actual); actual = map.get("6"); assertEquals("Sechs", actual); } diff --git a/SimpleArrayMap/src/testat/SimpleArrayMap.java b/SimpleArrayMap/src/testat/SimpleArrayMap.java new file mode 100644 index 0000000..2427905 --- /dev/null +++ b/SimpleArrayMap/src/testat/SimpleArrayMap.java @@ -0,0 +1,4 @@ +package src.testat; + +public class SimpleArrayMap { +} diff --git a/SimpleLinkedList/src/solution/SimpleLinkedList.java b/SimpleLinkedList/src/solution/SimpleLinkedList.java index ea4bc75..8c4b8cc 100644 --- a/SimpleLinkedList/src/solution/SimpleLinkedList.java +++ b/SimpleLinkedList/src/solution/SimpleLinkedList.java @@ -9,6 +9,7 @@ public class SimpleLinkedList extends AbstractSimpleList { firstNode = null; size = 0; } + @Override public int size() {