diff --git a/.gitignore b/.gitignore index c2e8de74cd57..fc114d179c3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,123 @@ -Java.iml -.idea/* + +# Created by https://www.gitignore.io/api/java,maven,intellij+all + +### Intellij+all ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/modules.xml +# .idea/*.iml +# .idea/modules + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij+all Patch ### +# Ignores the whole .idea folder and all .iml files +# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 + +.idea/ + +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + *.iml +modules.xml +.idea/misc.xml +*.ipr + +### Java ### +# 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* + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar + + +# End of https://www.gitignore.io/api/java,maven,intellij+all diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000000..a1f598934ce9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + com + algorithms + 1.0-SNAPSHOT + + + 1.8 + + + 5.3.1 + + + + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + + + \ No newline at end of file diff --git a/src/main/java/com/conversions/AnyBaseToDecimal.java b/src/main/java/com/algorithms/conversions/AnyBaseToDecimal.java similarity index 96% rename from src/main/java/com/conversions/AnyBaseToDecimal.java rename to src/main/java/com/algorithms/conversions/AnyBaseToDecimal.java index 4267e662d456..d75d7a2c6c4b 100644 --- a/src/main/java/com/conversions/AnyBaseToDecimal.java +++ b/src/main/java/com/algorithms/conversions/AnyBaseToDecimal.java @@ -1,4 +1,4 @@ -package src.main.java.com.conversions; +package com.algorithms.conversions; public class AnyBaseToDecimal { /** diff --git a/src/main/java/com/conversions/DecimalToAnyBase.java b/src/main/java/com/algorithms/conversions/DecimalToAnyBase.java similarity index 96% rename from src/main/java/com/conversions/DecimalToAnyBase.java rename to src/main/java/com/algorithms/conversions/DecimalToAnyBase.java index ae675f234bd2..5e3ecdc6d799 100644 --- a/src/main/java/com/conversions/DecimalToAnyBase.java +++ b/src/main/java/com/algorithms/conversions/DecimalToAnyBase.java @@ -1,4 +1,4 @@ -package src.main.java.com.conversions; +package com.algorithms.conversions; import java.util.ArrayList; diff --git a/src/main/java/com/search/BinarySearch.java b/src/main/java/com/algorithms/search/BinarySearch.java similarity index 97% rename from src/main/java/com/search/BinarySearch.java rename to src/main/java/com/algorithms/search/BinarySearch.java index 20f74337607d..832fdf7144a9 100644 --- a/src/main/java/com/search/BinarySearch.java +++ b/src/main/java/com/algorithms/search/BinarySearch.java @@ -1,4 +1,4 @@ -package src.main.java.com.search; +package com.algorithms.search; /** * Binary search is an algorithm which finds the position of a target value within a sorted array diff --git a/src/main/java/com/sorts/BubbleSort.java b/src/main/java/com/algorithms/sorts/BubbleSort.java similarity index 94% rename from src/main/java/com/sorts/BubbleSort.java rename to src/main/java/com/algorithms/sorts/BubbleSort.java index 817935516acb..9a1f314f1e9e 100644 --- a/src/main/java/com/sorts/BubbleSort.java +++ b/src/main/java/com/algorithms/sorts/BubbleSort.java @@ -1,4 +1,4 @@ -package src.main.java.com.sorts; +package com.algorithms.sorts; public class BubbleSort { /** diff --git a/src/main/java/com/sorts/HeapSort.java b/src/main/java/com/algorithms/sorts/HeapSort.java similarity index 95% rename from src/main/java/com/sorts/HeapSort.java rename to src/main/java/com/algorithms/sorts/HeapSort.java index a1cefd091891..c2aea8c2431a 100644 --- a/src/main/java/com/sorts/HeapSort.java +++ b/src/main/java/com/algorithms/sorts/HeapSort.java @@ -1,11 +1,11 @@ -package src.main.java.com.sorts; +package com.algorithms.sorts; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static src.main.java.com.sorts.SortUtils.less; -import static src.main.java.com.sorts.SortUtils.swap; +import static com.algorithms.sorts.SortUtils.less; +import static com.algorithms.sorts.SortUtils.swap; public class HeapSort { diff --git a/src/main/java/com/sorts/InsertionSort.java b/src/main/java/com/algorithms/sorts/InsertionSort.java similarity index 94% rename from src/main/java/com/sorts/InsertionSort.java rename to src/main/java/com/algorithms/sorts/InsertionSort.java index e7deb8970149..3d53d4ee90d2 100644 --- a/src/main/java/com/sorts/InsertionSort.java +++ b/src/main/java/com/algorithms/sorts/InsertionSort.java @@ -1,4 +1,4 @@ -package src.main.java.com.sorts; +package com.algorithms.sorts; public class InsertionSort { diff --git a/src/main/java/com/sorts/MergeSort.java b/src/main/java/com/algorithms/sorts/MergeSort.java similarity index 98% rename from src/main/java/com/sorts/MergeSort.java rename to src/main/java/com/algorithms/sorts/MergeSort.java index 3582a08b24c1..a9e915bdf1aa 100644 --- a/src/main/java/com/sorts/MergeSort.java +++ b/src/main/java/com/algorithms/sorts/MergeSort.java @@ -1,4 +1,4 @@ -package src.main.java.com.sorts; +package com.algorithms.sorts; public class MergeSort { diff --git a/src/main/java/com/sorts/QuickSort.java b/src/main/java/com/algorithms/sorts/QuickSort.java similarity index 91% rename from src/main/java/com/sorts/QuickSort.java rename to src/main/java/com/algorithms/sorts/QuickSort.java index 31d6a0fbc4a4..471f2d6fbce8 100644 --- a/src/main/java/com/sorts/QuickSort.java +++ b/src/main/java/com/algorithms/sorts/QuickSort.java @@ -1,7 +1,7 @@ -package src.main.java.com.sorts; +package com.algorithms.sorts; -import static src.main.java.com.sorts.SortUtils.less; -import static src.main.java.com.sorts.SortUtils.swap; +import static com.algorithms.sorts.SortUtils.less; +import static com.algorithms.sorts.SortUtils.swap; public class QuickSort { diff --git a/src/main/java/com/sorts/SelectionSort.java b/src/main/java/com/algorithms/sorts/SelectionSort.java similarity index 81% rename from src/main/java/com/sorts/SelectionSort.java rename to src/main/java/com/algorithms/sorts/SelectionSort.java index 1038bec34c58..ac80d843a168 100644 --- a/src/main/java/com/sorts/SelectionSort.java +++ b/src/main/java/com/algorithms/sorts/SelectionSort.java @@ -1,7 +1,7 @@ -package src.main.java.com.sorts; +package com.algorithms.sorts; -import static src.main.java.com.sorts.SortUtils.less; -import static src.main.java.com.sorts.SortUtils.swap; +import static com.algorithms.sorts.SortUtils.less; +import static com.algorithms.sorts.SortUtils.swap; public class SelectionSort { diff --git a/src/main/java/com/sorts/ShellSort.java b/src/main/java/com/algorithms/sorts/ShellSort.java similarity index 78% rename from src/main/java/com/sorts/ShellSort.java rename to src/main/java/com/algorithms/sorts/ShellSort.java index d300cfc00349..a4919055f0b6 100644 --- a/src/main/java/com/sorts/ShellSort.java +++ b/src/main/java/com/algorithms/sorts/ShellSort.java @@ -1,7 +1,7 @@ -package src.main.java.com.sorts; +package com.algorithms.sorts; -import static src.main.java.com.sorts.SortUtils.less; -import static src.main.java.com.sorts.SortUtils.swap; +import static com.algorithms.sorts.SortUtils.less; +import static com.algorithms.sorts.SortUtils.swap; public class ShellSort { diff --git a/src/main/java/com/sorts/SortUtils.java b/src/main/java/com/algorithms/sorts/SortUtils.java similarity index 97% rename from src/main/java/com/sorts/SortUtils.java rename to src/main/java/com/algorithms/sorts/SortUtils.java index 26fc683e724a..a3c86817da9d 100644 --- a/src/main/java/com/sorts/SortUtils.java +++ b/src/main/java/com/algorithms/sorts/SortUtils.java @@ -1,4 +1,4 @@ -package src.main.java.com.sorts; +package com.algorithms.sorts; final class SortUtils { diff --git a/src/test/java/com/algorithms/conversions/AnyBaseToDecimalTest.java b/src/test/java/com/algorithms/conversions/AnyBaseToDecimalTest.java new file mode 100644 index 000000000000..c36fb1d2fe22 --- /dev/null +++ b/src/test/java/com/algorithms/conversions/AnyBaseToDecimalTest.java @@ -0,0 +1,39 @@ +package com.algorithms.conversions; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class AnyBaseToDecimalTest { + + @Test + void testAnyBaseToDecimal() { + AnyBaseToDecimal anyBaseToDecimal = new AnyBaseToDecimal(); + assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("2", 2)); + assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("3", 2)); + assertEquals("3", anyBaseToDecimal.convertToDecimal("11", 2)); + assertEquals("4", anyBaseToDecimal.convertToDecimal("100", 2)); + assertEquals("5", anyBaseToDecimal.convertToDecimal("101", 2)); + assertEquals("10", anyBaseToDecimal.convertToDecimal("1010", 2)); + assertEquals("1024", anyBaseToDecimal.convertToDecimal("10000000000", 2)); + + assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("8", 8)); + assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("9", 8)); + assertEquals("7", anyBaseToDecimal.convertToDecimal("7", 8)); + assertEquals("8", anyBaseToDecimal.convertToDecimal("10", 8)); + assertEquals("9", anyBaseToDecimal.convertToDecimal("11", 8)); + assertEquals("10", anyBaseToDecimal.convertToDecimal("12", 8)); + assertEquals("1024", anyBaseToDecimal.convertToDecimal("2000", 8)); + + assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("A", 10)); + assertEquals("10", anyBaseToDecimal.convertToDecimal("10", 10)); + assertEquals("1024", anyBaseToDecimal.convertToDecimal("1024", 10)); + + assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("G", 16)); + assertEquals("16", anyBaseToDecimal.convertToDecimal("10", 16)); + assertEquals("17", anyBaseToDecimal.convertToDecimal("11", 16)); + assertEquals("100", anyBaseToDecimal.convertToDecimal("64", 16)); + assertEquals("225", anyBaseToDecimal.convertToDecimal("E1", 16)); + assertEquals("1024", anyBaseToDecimal.convertToDecimal("400", 16)); + } +} diff --git a/src/test/java/com/algorithms/conversions/DecimalToAnyBaseTest.java b/src/test/java/com/algorithms/conversions/DecimalToAnyBaseTest.java new file mode 100644 index 000000000000..04ecb662306b --- /dev/null +++ b/src/test/java/com/algorithms/conversions/DecimalToAnyBaseTest.java @@ -0,0 +1,15 @@ +package com.algorithms.conversions; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class DecimalToAnyBaseTest { + + @Test + void testDecimalToAnyBase() { + DecimalToAnyBase decimalToAnyBase = new DecimalToAnyBase(); + assertEquals("100", decimalToAnyBase.convertToAnyBase(4, 2)); + assertEquals("11", decimalToAnyBase.convertToAnyBase(4, 3)); + } +} diff --git a/src/test/java/com/algorithms/search/BinarySearchTest.java b/src/test/java/com/algorithms/search/BinarySearchTest.java new file mode 100644 index 000000000000..67af6fa5da1b --- /dev/null +++ b/src/test/java/com/algorithms/search/BinarySearchTest.java @@ -0,0 +1,24 @@ +package com.algorithms.search; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class BinarySearchTest { + + @Test + void testBinarySearch() { + BinarySearch binarySearch = new BinarySearch(); + + Integer[] arr1 = {1, 2, 3, 4, 5}; + assertEquals(2, binarySearch.findIndex(arr1, 3)); + assertEquals(0, binarySearch.findIndex(arr1, 1)); + assertEquals(-1, binarySearch.findIndex(arr1, 8)); + assertEquals(-1, binarySearch.findIndex(arr1, -2)); + + String[] arr2 = {"A", "B", "C", "D"}; + assertEquals(2, binarySearch.findIndex(arr2, "C")); + assertEquals(1, binarySearch.findIndex(arr2, "B")); + assertEquals(-1, binarySearch.findIndex(arr2, "F")); + } +} diff --git a/src/test/java/com/algorithms/sorts/BubbleSortTest.java b/src/test/java/com/algorithms/sorts/BubbleSortTest.java new file mode 100644 index 000000000000..42582957708b --- /dev/null +++ b/src/test/java/com/algorithms/sorts/BubbleSortTest.java @@ -0,0 +1,22 @@ +package com.algorithms.sorts; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +class BubbleSortTest { + + @Test + void bubbleSortTest() { + BubbleSort bubbleSort = new BubbleSort(); + + Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; + Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + assertArrayEquals(sortedInt, bubbleSort.sort(unsortedInt)); + + Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; + Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; + assertArrayEquals(sortedChar, bubbleSort.sort(unsortedChar)); + } + +} diff --git a/src/test/java/com/algorithms/sorts/HeapSortTest.java b/src/test/java/com/algorithms/sorts/HeapSortTest.java new file mode 100644 index 000000000000..a71efde60a4d --- /dev/null +++ b/src/test/java/com/algorithms/sorts/HeapSortTest.java @@ -0,0 +1,21 @@ +package com.algorithms.sorts; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +class HeapSortTest { + + @Test + void heapSortTest() { + HeapSort heapSort = new HeapSort(); + + Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; + Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + assertArrayEquals(sortedInt, heapSort.sort(unsortedInt)); + + Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; + Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; + assertArrayEquals(sortedChar, heapSort.sort(unsortedChar)); + } +} diff --git a/src/test/java/com/algorithms/sorts/InsertionSortTest.java b/src/test/java/com/algorithms/sorts/InsertionSortTest.java new file mode 100644 index 000000000000..86d14aa7fc82 --- /dev/null +++ b/src/test/java/com/algorithms/sorts/InsertionSortTest.java @@ -0,0 +1,33 @@ +package com.algorithms.sorts; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +class InsertionSortTest { + + @Test + void insertionSortTest() { + InsertionSort insertionSort = new InsertionSort(); + + Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; + Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + assertArrayEquals(sortedInt, insertionSort.sort(unsortedInt)); + + unsortedInt = new Integer[]{5, 4, 3, 2, 1, 0}; + sortedInt = new Integer[]{0, 1, 2, 3, 4, 5}; + assertArrayEquals(sortedInt, insertionSort.sort(unsortedInt)); + + unsortedInt = new Integer[]{-1, -2, -3, -4, -5}; + sortedInt = new Integer[]{-5, -4, -3, -2, -1}; + assertArrayEquals(sortedInt, insertionSort.sort(unsortedInt)); + + unsortedInt = new Integer[]{-1, -5, -10, -990, 990, 1010}; + sortedInt = new Integer[]{-990, -10, -5, -1, 990, 1010}; + assertArrayEquals(sortedInt, insertionSort.sort(unsortedInt)); + + Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; + Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; + assertArrayEquals(sortedChar, insertionSort.sort(unsortedChar)); + } +} diff --git a/src/test/java/com/algorithms/sorts/MergeSortTest.java b/src/test/java/com/algorithms/sorts/MergeSortTest.java new file mode 100644 index 000000000000..74d76868d9e2 --- /dev/null +++ b/src/test/java/com/algorithms/sorts/MergeSortTest.java @@ -0,0 +1,33 @@ +package com.algorithms.sorts; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +class MergeSortTest { + + @Test + void mergeSortTest() { + MergeSort mergeSort = new MergeSort(); + + Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; + Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + assertArrayEquals(sortedInt, mergeSort.sort(unsortedInt)); + + unsortedInt = new Integer[]{5, 4, 3, 2, 1, 0}; + sortedInt = new Integer[]{0, 1, 2, 3, 4, 5}; + assertArrayEquals(sortedInt, mergeSort.sort(unsortedInt)); + + unsortedInt = new Integer[]{-1, -2, -3, -4, -5}; + sortedInt = new Integer[]{-5, -4, -3, -2, -1}; + assertArrayEquals(sortedInt, mergeSort.sort(unsortedInt)); + + unsortedInt = new Integer[]{-1, -5, -10, -990, 990, 1010}; + sortedInt = new Integer[]{-990, -10, -5, -1, 990, 1010}; + assertArrayEquals(sortedInt, mergeSort.sort(unsortedInt)); + + Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; + Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; + assertArrayEquals(sortedChar, mergeSort.sort(unsortedChar)); + } +} diff --git a/src/test/java/com/algorithms/sorts/QuickSortTest.java b/src/test/java/com/algorithms/sorts/QuickSortTest.java new file mode 100644 index 000000000000..1535cbc0e1f2 --- /dev/null +++ b/src/test/java/com/algorithms/sorts/QuickSortTest.java @@ -0,0 +1,21 @@ +package com.algorithms.sorts; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +class QuickSortTest { + + @Test + void quickSortTest() { + QuickSort quickSort = new QuickSort(); + + Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; + Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + assertArrayEquals(sortedInt, quickSort.sort(unsortedInt)); + + Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; + Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; + assertArrayEquals(sortedChar, quickSort.sort(unsortedChar)); + } +} diff --git a/src/test/java/com/algorithms/sorts/SelectionSortTest.java b/src/test/java/com/algorithms/sorts/SelectionSortTest.java new file mode 100644 index 000000000000..439b14cf6c5c --- /dev/null +++ b/src/test/java/com/algorithms/sorts/SelectionSortTest.java @@ -0,0 +1,21 @@ +package com.algorithms.sorts; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +class SelectionSortTest { + + @Test + void selectionSortTest() { + SelectionSort selectionSort = new SelectionSort(); + + Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; + Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + assertArrayEquals(sortedInt, selectionSort.sort(unsortedInt)); + + Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; + Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; + assertArrayEquals(sortedChar, selectionSort.sort(unsortedChar)); + } +} diff --git a/src/test/java/com/sorts/ShellSortTest.java b/src/test/java/com/algorithms/sorts/ShellSortTest.java similarity index 53% rename from src/test/java/com/sorts/ShellSortTest.java rename to src/test/java/com/algorithms/sorts/ShellSortTest.java index a473de6908d6..352911e2b9c0 100644 --- a/src/test/java/com/sorts/ShellSortTest.java +++ b/src/test/java/com/algorithms/sorts/ShellSortTest.java @@ -1,21 +1,21 @@ -package src.test.java.com.sorts; +package com.algorithms.sorts; -import org.junit.Assert; -import org.junit.Test; -import src.main.java.com.sorts.ShellSort; +import org.junit.jupiter.api.Test; -public class ShellSortTest { +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +class ShellSortTest { @Test - public void shellSortTest() { + void shellSortTest() { ShellSort shellSort = new ShellSort(); Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - Assert.assertArrayEquals(sortedInt, shellSort.sort(unsortedInt)); + assertArrayEquals(sortedInt, shellSort.sort(unsortedInt)); Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; - Assert.assertArrayEquals(sortedChar, shellSort.sort(unsortedChar)); + assertArrayEquals(sortedChar, shellSort.sort(unsortedChar)); } } diff --git a/src/test/java/com/conversions/AnyBaseToDecimalTest.java b/src/test/java/com/conversions/AnyBaseToDecimalTest.java deleted file mode 100644 index 2659234ba7b6..000000000000 --- a/src/test/java/com/conversions/AnyBaseToDecimalTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package src.test.java.com.conversions; - -import org.junit.Assert; -import org.junit.Test; -import src.main.java.com.conversions.AnyBaseToDecimal; - -public class AnyBaseToDecimalTest { - - @Test - public void testAnyBaseToDecimal() { - AnyBaseToDecimal anyBaseToDecimal = new AnyBaseToDecimal(); - Assert.assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("2", 2)); - Assert.assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("3", 2)); - Assert.assertEquals("3", anyBaseToDecimal.convertToDecimal("11", 2)); - Assert.assertEquals("4", anyBaseToDecimal.convertToDecimal("100", 2)); - Assert.assertEquals("5", anyBaseToDecimal.convertToDecimal("101", 2)); - Assert.assertEquals("10", anyBaseToDecimal.convertToDecimal("1010", 2)); - Assert.assertEquals("1024", anyBaseToDecimal.convertToDecimal("10000000000", 2)); - - Assert.assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("8", 8)); - Assert.assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("9", 8)); - Assert.assertEquals("7", anyBaseToDecimal.convertToDecimal("7", 8)); - Assert.assertEquals("8", anyBaseToDecimal.convertToDecimal("10", 8)); - Assert.assertEquals("9", anyBaseToDecimal.convertToDecimal("11", 8)); - Assert.assertEquals("10", anyBaseToDecimal.convertToDecimal("12", 8)); - Assert.assertEquals("1024", anyBaseToDecimal.convertToDecimal("2000", 8)); - - Assert.assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("A", 10)); - Assert.assertEquals("10", anyBaseToDecimal.convertToDecimal("10", 10)); - Assert.assertEquals("1024", anyBaseToDecimal.convertToDecimal("1024", 10)); - - Assert.assertEquals("Invalid Number", anyBaseToDecimal.convertToDecimal("G", 16)); - Assert.assertEquals("16", anyBaseToDecimal.convertToDecimal("10", 16)); - Assert.assertEquals("17", anyBaseToDecimal.convertToDecimal("11", 16)); - Assert.assertEquals("100", anyBaseToDecimal.convertToDecimal("64", 16)); - Assert.assertEquals("225", anyBaseToDecimal.convertToDecimal("E1", 16)); - Assert.assertEquals("1024", anyBaseToDecimal.convertToDecimal("400", 16)); - } -} diff --git a/src/test/java/com/conversions/DecimalToAnyBaseTest.java b/src/test/java/com/conversions/DecimalToAnyBaseTest.java deleted file mode 100644 index f6166a6d79bd..000000000000 --- a/src/test/java/com/conversions/DecimalToAnyBaseTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package src.test.java.com.conversions; - -import src.main.java.com.conversions.DecimalToAnyBase; -import org.junit.Test; - -import static junit.framework.Assert.assertEquals; - -public class DecimalToAnyBaseTest { - - @Test - public void testDecimalToAnyBase() { - DecimalToAnyBase decimalToAnyBase = new DecimalToAnyBase(); - assertEquals("Incorrect Conversion", "100", decimalToAnyBase.convertToAnyBase(4, 2)); - assertEquals("Incorrect Conversion", "11", decimalToAnyBase.convertToAnyBase(4, 3)); - } -} diff --git a/src/test/java/com/search/BinarySearchTest.java b/src/test/java/com/search/BinarySearchTest.java deleted file mode 100644 index 83b2b9788b48..000000000000 --- a/src/test/java/com/search/BinarySearchTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package src.test.java.com.search; - -import org.junit.Assert; -import org.junit.Test; -import src.main.java.com.search.BinarySearch; - -public class BinarySearchTest { - - @Test - public void testBinarySearch() { - BinarySearch binarySearch = new BinarySearch(); - - Integer[] arr1 = {1,2,3,4,5}; - Assert.assertEquals("Incorrect index", 2, binarySearch.findIndex(arr1,3)); - Assert.assertEquals("Incorrect index", 0, binarySearch.findIndex(arr1,1)); - Assert.assertEquals("Incorrect index", -1, binarySearch.findIndex(arr1,8)); - Assert.assertEquals("Incorrect index", -1, binarySearch.findIndex(arr1,-2)); - - String[] arr2 = {"A", "B", "C", "D"}; - Assert.assertEquals("Incorrect index", 2, binarySearch.findIndex(arr2,"C")); - Assert.assertEquals("Incorrect index", 1, binarySearch.findIndex(arr2,"B")); - Assert.assertEquals("Incorrect index", -1, binarySearch.findIndex(arr2,"F")); - } -} diff --git a/src/test/java/com/sorts/BubbleSortTest.java b/src/test/java/com/sorts/BubbleSortTest.java deleted file mode 100644 index e58d086a57a3..000000000000 --- a/src/test/java/com/sorts/BubbleSortTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package src.test.java.com.sorts; - - -import org.junit.Assert; -import org.junit.Test; -import src.main.java.com.sorts.BubbleSort; - -public class BubbleSortTest { - - @Test - public void bubbleSortTest() { - BubbleSort bubbleSort = new BubbleSort(); - - Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; - Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - Assert.assertArrayEquals(sortedInt, bubbleSort.sort(unsortedInt)); - - Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; - Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; - Assert.assertArrayEquals(sortedChar, bubbleSort.sort(unsortedChar)); - - } - -} diff --git a/src/test/java/com/sorts/HeapSortTest.java b/src/test/java/com/sorts/HeapSortTest.java deleted file mode 100644 index 9d7cd936b5f2..000000000000 --- a/src/test/java/com/sorts/HeapSortTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package src.test.java.com.sorts; - - -import org.junit.Assert; -import org.junit.Test; -import src.main.java.com.sorts.HeapSort; - -public class HeapSortTest { - - @Test - public void heapSortTest() { - HeapSort heapSort = new HeapSort(); - - Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; - Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - Assert.assertArrayEquals(sortedInt, heapSort.sort(unsortedInt)); - - Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; - Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; - Assert.assertArrayEquals(sortedChar, heapSort.sort(unsortedChar)); - } -} diff --git a/src/test/java/com/sorts/InsertionSortTest.java b/src/test/java/com/sorts/InsertionSortTest.java deleted file mode 100644 index 1dcc6fef23c6..000000000000 --- a/src/test/java/com/sorts/InsertionSortTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package src.test.java.com.sorts; - - -import org.junit.Assert; -import org.junit.Test; -import src.main.java.com.sorts.InsertionSort; - -public class InsertionSortTest { - - @Test - public void insertionSortTest() { - InsertionSort insertionSort = new InsertionSort(); - - Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; - Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - Assert.assertArrayEquals(sortedInt, insertionSort.sort(unsortedInt)); - - unsortedInt = new Integer[]{5,4,3,2,1,0}; - sortedInt = new Integer[]{0, 1, 2, 3, 4, 5}; - Assert.assertArrayEquals(sortedInt, insertionSort.sort(unsortedInt)); - - unsortedInt = new Integer[]{-1,-2,-3,-4,-5}; - sortedInt = new Integer[]{-5,-4,-3,-2,-1}; - Assert.assertArrayEquals(sortedInt, insertionSort.sort(unsortedInt)); - - unsortedInt = new Integer[]{-1,-5,-10,-990,990,1010}; - sortedInt = new Integer[]{-990,-10,-5,-1,990,1010}; - Assert.assertArrayEquals(sortedInt, insertionSort.sort(unsortedInt)); - - Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; - Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; - Assert.assertArrayEquals(sortedChar, insertionSort.sort(unsortedChar)); - } -} diff --git a/src/test/java/com/sorts/MergeSortTest.java b/src/test/java/com/sorts/MergeSortTest.java deleted file mode 100644 index 258515237476..000000000000 --- a/src/test/java/com/sorts/MergeSortTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package src.test.java.com.sorts; - - -import org.junit.Assert; -import org.junit.Test; -import src.main.java.com.sorts.MergeSort; - -public class MergeSortTest { - - @Test - public void mergeSortTest() { - MergeSort mergeSort = new MergeSort(); - - Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; - Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - Assert.assertArrayEquals(sortedInt, mergeSort.sort(unsortedInt)); - - unsortedInt = new Integer[]{5, 4, 3, 2, 1, 0}; - sortedInt = new Integer[]{0, 1, 2, 3, 4, 5}; - Assert.assertArrayEquals(sortedInt, mergeSort.sort(unsortedInt)); - - unsortedInt = new Integer[]{-1, -2, -3, -4, -5}; - sortedInt = new Integer[]{-5, -4, -3, -2, -1}; - Assert.assertArrayEquals(sortedInt, mergeSort.sort(unsortedInt)); - - unsortedInt = new Integer[]{-1, -5, -10, -990, 990, 1010}; - sortedInt = new Integer[]{-990, -10, -5, -1, 990, 1010}; - Assert.assertArrayEquals(sortedInt, mergeSort.sort(unsortedInt)); - - Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; - Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; - Assert.assertArrayEquals(sortedChar, mergeSort.sort(unsortedChar)); - } -} diff --git a/src/test/java/com/sorts/QuickSortTest.java b/src/test/java/com/sorts/QuickSortTest.java deleted file mode 100644 index 00154c1f0232..000000000000 --- a/src/test/java/com/sorts/QuickSortTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package src.test.java.com.sorts; - - -import org.junit.Assert; -import org.junit.Test; -import src.main.java.com.sorts.QuickSort; - -public class QuickSortTest { - - @Test - public void quickSortTest() { - QuickSort quickSort = new QuickSort(); - - Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; - Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - Assert.assertArrayEquals(sortedInt, quickSort.sort(unsortedInt)); - - Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; - Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; - Assert.assertArrayEquals(sortedChar, quickSort.sort(unsortedChar)); - } -} diff --git a/src/test/java/com/sorts/SelectionSortTest.java b/src/test/java/com/sorts/SelectionSortTest.java deleted file mode 100644 index cb9411c75f71..000000000000 --- a/src/test/java/com/sorts/SelectionSortTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package src.test.java.com.sorts; - -import org.junit.Assert; -import org.junit.Test; -import src.main.java.com.sorts.SelectionSort; - -public class SelectionSortTest { - - @Test - public void selectionSortTest() { - SelectionSort selectionSort = new SelectionSort(); - - Integer[] unsortedInt = new Integer[]{0, 5, 9, 2, 1, 3, 4, 8, 6, 7}; - Integer[] sortedInt = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - Assert.assertArrayEquals(sortedInt, selectionSort.sort(unsortedInt)); - - Character[] unsortedChar = new Character[]{'f', 'h', 'c', 'a', 'b', 'd', 'g', 'e'}; - Character[] sortedChar = new Character[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}; - Assert.assertArrayEquals(sortedChar, selectionSort.sort(unsortedChar)); - } -}