diff --git a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Array1DCustom.java b/src/main/java/eu/ztsh/training/hackerrank/datastructures/array_1d/CustomSolution.java
similarity index 90%
rename from src/main/java/eu/ztsh/training/hackerrank/datastructures/Array1DCustom.java
rename to src/main/java/eu/ztsh/training/hackerrank/datastructures/array_1d/CustomSolution.java
index 7109a1b..22ac17d 100644
--- a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Array1DCustom.java
+++ b/src/main/java/eu/ztsh/training/hackerrank/datastructures/array_1d/CustomSolution.java
@@ -1,4 +1,4 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.array_1d;
import java.util.Arrays;
import java.util.Scanner;
@@ -8,7 +8,7 @@ import java.util.stream.Stream;
/**
* Custom modern class for 1D Array task.
*/
-public class Array1DCustom {
+public class CustomSolution {
public static void main(String[] args) {
var scan = new Scanner(System.in);
diff --git a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Array1D.java b/src/main/java/eu/ztsh/training/hackerrank/datastructures/array_1d/Solution.java
similarity index 89%
rename from src/main/java/eu/ztsh/training/hackerrank/datastructures/Array1D.java
rename to src/main/java/eu/ztsh/training/hackerrank/datastructures/array_1d/Solution.java
index 00978a7..7db6a4b 100644
--- a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Array1D.java
+++ b/src/main/java/eu/ztsh/training/hackerrank/datastructures/array_1d/Solution.java
@@ -1,4 +1,4 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.array_1d;
import java.util.Scanner;
@@ -7,7 +7,7 @@ import java.util.Scanner;
* Task spec: Java 8 + partially locked editor
* source: https://www.hackerrank.com/challenges/java-1d-array-introduction/problem
*/
-public class Array1D {
+public class Solution {
public static void main(String[] args) {
Scanner scan = new Scanner(System.in);
diff --git a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Array1DPart2.java b/src/main/java/eu/ztsh/training/hackerrank/datastructures/array_1d_pt2/Solution.java
similarity index 95%
rename from src/main/java/eu/ztsh/training/hackerrank/datastructures/Array1DPart2.java
rename to src/main/java/eu/ztsh/training/hackerrank/datastructures/array_1d_pt2/Solution.java
index 0378eb7..7cc86ab 100644
--- a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Array1DPart2.java
+++ b/src/main/java/eu/ztsh/training/hackerrank/datastructures/array_1d_pt2/Solution.java
@@ -1,9 +1,9 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.array_1d_pt2;
import java.util.Arrays;
import java.util.Scanner;
-public class Array1DPart2 {
+public class Solution {
public static boolean canWin(int leap, int[] game) {
return move(0, leap, game, new int[]{});
diff --git a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Array2D.java b/src/main/java/eu/ztsh/training/hackerrank/datastructures/array_2d/Solution.java
similarity index 95%
rename from src/main/java/eu/ztsh/training/hackerrank/datastructures/Array2D.java
rename to src/main/java/eu/ztsh/training/hackerrank/datastructures/array_2d/Solution.java
index 2f14ea8..b3c6274 100644
--- a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Array2D.java
+++ b/src/main/java/eu/ztsh/training/hackerrank/datastructures/array_2d/Solution.java
@@ -1,4 +1,4 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.array_2d;
import java.io.BufferedReader;
import java.io.IOException;
@@ -14,7 +14,7 @@ import java.util.stream.Stream;
* Java 2D Array task.
* source: https://www.hackerrank.com/challenges/java-2d-array/problem
*/
-public class Array2D {
+public class Solution {
public static void main(String[] args) throws IOException {
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in));
diff --git a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Comparator.java b/src/main/java/eu/ztsh/training/hackerrank/datastructures/comparator/Solution.java
similarity index 86%
rename from src/main/java/eu/ztsh/training/hackerrank/datastructures/Comparator.java
rename to src/main/java/eu/ztsh/training/hackerrank/datastructures/comparator/Solution.java
index ca2f723..77b6000 100644
--- a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Comparator.java
+++ b/src/main/java/eu/ztsh/training/hackerrank/datastructures/comparator/Solution.java
@@ -1,12 +1,14 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.comparator;
import java.util.Arrays;
+import java.util.Comparator;
import java.util.Scanner;
/**
* source: Java Comparator
*/
-class Checker implements java.util.Comparator {
+
+class Checker implements Comparator {
@Override
public int compare(Player o1, Player o2) {
@@ -17,7 +19,7 @@ class Checker implements java.util.Comparator {
}
// Hackerrank code below (slightly modified)
-public class Comparator {
+public class Solution {
public static void main(String[] args) {
Scanner scan = new Scanner(System.in);
diff --git a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Deque.java b/src/main/java/eu/ztsh/training/hackerrank/datastructures/dequeue/Solution.java
similarity index 88%
rename from src/main/java/eu/ztsh/training/hackerrank/datastructures/Deque.java
rename to src/main/java/eu/ztsh/training/hackerrank/datastructures/dequeue/Solution.java
index 67f8f48..2dc02f8 100644
--- a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Deque.java
+++ b/src/main/java/eu/ztsh/training/hackerrank/datastructures/dequeue/Solution.java
@@ -1,21 +1,23 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.dequeue;
import java.util.ArrayDeque;
+import java.util.Deque;
import java.util.Scanner;
import java.util.SortedMap;
import java.util.TreeMap;
+import java.util.TreeSet;
/**
* Java Dequeue task.
* source: https://www.hackerrank.com/challenges/java-dequeue/problem
*/
-public class Deque {
+public class Solution {
public static void main(String[] args) {
var in = new Scanner(System.in);
int n = in.nextInt();
int m = in.nextInt();
- final java.util.Deque deque = new ArrayDeque<>(m);
+ final Deque deque = new ArrayDeque<>(m);
var counter = new Counter();
for (int i = 0; i < m; i++) {
var content = in.nextInt();
diff --git a/src/main/java/eu/ztsh/training/hackerrank/datastructures/PriorityQueue.java b/src/main/java/eu/ztsh/training/hackerrank/datastructures/priority_queue/Solution.java
similarity index 86%
rename from src/main/java/eu/ztsh/training/hackerrank/datastructures/PriorityQueue.java
rename to src/main/java/eu/ztsh/training/hackerrank/datastructures/priority_queue/Solution.java
index 29e46fe..f636c45 100644
--- a/src/main/java/eu/ztsh/training/hackerrank/datastructures/PriorityQueue.java
+++ b/src/main/java/eu/ztsh/training/hackerrank/datastructures/priority_queue/Solution.java
@@ -1,9 +1,10 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.priority_queue;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
+import java.util.PriorityQueue;
import java.util.Scanner;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -11,7 +12,7 @@ import java.util.stream.Stream;
class Priorities {
List getStudents(List events) {
- var queue = new java.util.PriorityQueue<>(events.size(),
+ var queue = new PriorityQueue<>(events.size(),
Comparator.comparingDouble(Student::getCGPA)
.reversed() // CGPA is the only descending here
.thenComparing(Student::getName)
@@ -19,7 +20,8 @@ class Priorities {
events.forEach(event -> {
var line = event.split(" ");
switch (line[0]) {
- case "ENTER" -> queue.add(new Student(Integer.parseInt(line[3]), line[1], Double.parseDouble(line[2])));
+ case "ENTER" ->
+ queue.add(new Student(Integer.parseInt(line[3]), line[1], Double.parseDouble(line[2])));
case "SERVED" -> queue.poll();
default -> throw new IllegalArgumentException();
}
@@ -56,7 +58,7 @@ class Student {
}
// https://www.hackerrank.com/challenges/java-priority-queue/problem
-public class PriorityQueue {
+public class Solution {
public static void main(String[] args) {
int totalEvents = Integer.parseInt(scan.nextLine());
@@ -77,7 +79,6 @@ public class PriorityQueue {
}
}
}
-
private static Scanner scan = new Scanner(System.in);
private final static Priorities priorities = new Priorities();
diff --git a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Stack.java b/src/main/java/eu/ztsh/training/hackerrank/datastructures/stack/Solution.java
similarity index 85%
rename from src/main/java/eu/ztsh/training/hackerrank/datastructures/Stack.java
rename to src/main/java/eu/ztsh/training/hackerrank/datastructures/stack/Solution.java
index 6065193..00c8102 100644
--- a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Stack.java
+++ b/src/main/java/eu/ztsh/training/hackerrank/datastructures/stack/Solution.java
@@ -1,18 +1,19 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.stack;
import java.util.Map;
import java.util.Scanner;
+import java.util.Stack;
/**
* Java Stack task.
* source: https://www.hackerrank.com/challenges/java-stack
*/
-public class Stack {
+public class Solution {
public static void main(String[] args) {
var scanner = new Scanner(System.in);
while (scanner.hasNext()) {
- var stack = new java.util.Stack();
+ var stack = new Stack();
var line = scanner.next();
for (char input : line.toCharArray()) {
if (stack.empty()) {
diff --git a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Subarray.java b/src/main/java/eu/ztsh/training/hackerrank/datastructures/subarray/Solution.java
similarity index 92%
rename from src/main/java/eu/ztsh/training/hackerrank/datastructures/Subarray.java
rename to src/main/java/eu/ztsh/training/hackerrank/datastructures/subarray/Solution.java
index 4dea78b..8ce8d32 100644
--- a/src/main/java/eu/ztsh/training/hackerrank/datastructures/Subarray.java
+++ b/src/main/java/eu/ztsh/training/hackerrank/datastructures/subarray/Solution.java
@@ -1,4 +1,4 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.subarray;
import java.io.BufferedReader;
import java.io.IOException;
@@ -11,7 +11,7 @@ import java.util.stream.IntStream;
* Java Subarray task.
* source: https://www.hackerrank.com/challenges/java-negative-subarray/problem
*/
-public class Subarray {
+public class Solution {
public static void main(String[] args) throws IOException {
var reader = new BufferedReader(new InputStreamReader(System.in));
diff --git a/src/test/java/eu/ztsh/training/hackerrank/datastructures/Array1DTest.java b/src/test/java/eu/ztsh/training/hackerrank/datastructures/array_1d/SolutionTest.java
similarity index 72%
rename from src/test/java/eu/ztsh/training/hackerrank/datastructures/Array1DTest.java
rename to src/test/java/eu/ztsh/training/hackerrank/datastructures/array_1d/SolutionTest.java
index 1c57032..7c0b1aa 100644
--- a/src/test/java/eu/ztsh/training/hackerrank/datastructures/Array1DTest.java
+++ b/src/test/java/eu/ztsh/training/hackerrank/datastructures/array_1d/SolutionTest.java
@@ -1,7 +1,6 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.array_1d;
import java.util.List;
-
import eu.ztsh.training.hackerrank.HackerRankTest;
import eu.ztsh.training.hackerrank.SolutionClassDescription;
import org.junit.jupiter.api.DisplayName;
@@ -9,31 +8,27 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@DisplayName("HackerRank challenges: Java 1D Array")
-class Array1DTest {
+class SolutionTest {
@Nested
@DisplayName("Original Solution class")
- class OriginalArray1DTest extends AbstractArray1DTest {
-
+ class OriginalSolutionTest extends Array1DTest {
@Override
protected SolutionClassDescription getSolutionClassDescription() {
- return new SolutionClassDescription(Array1D.class);
+ return new SolutionClassDescription(Solution.class);
}
-
}
@Nested
@DisplayName("Custom Solution class")
- class CustomArray1DTest extends AbstractArray1DTest {
-
+ class CustomSolutionTest extends Array1DTest {
@Override
protected SolutionClassDescription getSolutionClassDescription() {
- return new SolutionClassDescription(Array1DCustom.class);
+ return new SolutionClassDescription(CustomSolution.class);
}
-
}
- abstract static class AbstractArray1DTest extends HackerRankTest {
+ abstract static class Array1DTest extends HackerRankTest {
@Test
public void testCase0() {
diff --git a/src/test/java/eu/ztsh/training/hackerrank/datastructures/Array1DPart2Test.java b/src/test/java/eu/ztsh/training/hackerrank/datastructures/array_1d_pt2/SolutionTest.java
similarity index 64%
rename from src/test/java/eu/ztsh/training/hackerrank/datastructures/Array1DPart2Test.java
rename to src/test/java/eu/ztsh/training/hackerrank/datastructures/array_1d_pt2/SolutionTest.java
index 79973a1..542511a 100644
--- a/src/test/java/eu/ztsh/training/hackerrank/datastructures/Array1DPart2Test.java
+++ b/src/test/java/eu/ztsh/training/hackerrank/datastructures/array_1d_pt2/SolutionTest.java
@@ -1,21 +1,19 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.array_1d_pt2;
+import java.util.List;
import eu.ztsh.training.hackerrank.HackerRankTest;
import eu.ztsh.training.hackerrank.SolutionClassDescription;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import java.util.List;
-
import static org.assertj.core.api.Assertions.assertThat;
-@DisplayName("HackerRank challenges: Array 1D, pt.2")
-class Array1DPart2Test extends HackerRankTest {
+class SolutionTest extends HackerRankTest {
@Override
protected SolutionClassDescription getSolutionClassDescription() {
- return new SolutionClassDescription(Array1DPart2.class);
+ return new SolutionClassDescription(Solution.class);
}
@Nested
@@ -53,31 +51,31 @@ class Array1DPart2Test extends HackerRankTest {
@Test
public void winningMoveTest() {
- assertThat(Array1DPart2.isWinningMove(0, 1, 2)).isFalse();
- assertThat(Array1DPart2.isWinningMove(1, 5, 6)).isTrue();
+ assertThat(Solution.isWinningMove(0, 1, 2)).isFalse();
+ assertThat(Solution.isWinningMove(1, 5, 6)).isTrue();
}
@Test
public void moveForwardTest() {
var game = new int[]{0, 0, 1};
- assertThat(Array1DPart2.canMoveForward(0, game)).isTrue();
- assertThat(Array1DPart2.canMoveForward(1, game)).isFalse();
+ assertThat(Solution.canMoveForward(0, game)).isTrue();
+ assertThat(Solution.canMoveForward(1, game)).isFalse();
}
@Test
public void moveBackwardTest() {
var game = new int[]{0, 1, 0, 0, 1};
- assertThat(Array1DPart2.canMoveBackward(0, game)).isFalse();
- assertThat(Array1DPart2.canMoveBackward(3, game)).isTrue();
- assertThat(Array1DPart2.canMoveBackward(2, game)).isFalse();
+ assertThat(Solution.canMoveBackward(0, game)).isFalse();
+ assertThat(Solution.canMoveBackward(3, game)).isTrue();
+ assertThat(Solution.canMoveBackward(2, game)).isFalse();
}
@Test
public void jumpTest() {
var game = new int[]{0, 0, 1, 1, 1, 0};
- assertThat(Array1DPart2.canJump(0, 3, game)).isFalse();
- assertThat(Array1DPart2.canJump(1, 3, game)).isFalse();
- assertThat(Array1DPart2.canJump(1, 4, game)).isTrue();
+ assertThat(Solution.canJump(0, 3, game)).isFalse();
+ assertThat(Solution.canJump(1, 3, game)).isFalse();
+ assertThat(Solution.canJump(1, 4, game)).isTrue();
}
}
diff --git a/src/test/java/eu/ztsh/training/hackerrank/datastructures/Array2DTest.java b/src/test/java/eu/ztsh/training/hackerrank/datastructures/array_2d/SolutionTest.java
similarity index 91%
rename from src/test/java/eu/ztsh/training/hackerrank/datastructures/Array2DTest.java
rename to src/test/java/eu/ztsh/training/hackerrank/datastructures/array_2d/SolutionTest.java
index 7022904..75f8030 100644
--- a/src/test/java/eu/ztsh/training/hackerrank/datastructures/Array2DTest.java
+++ b/src/test/java/eu/ztsh/training/hackerrank/datastructures/array_2d/SolutionTest.java
@@ -1,7 +1,6 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.array_2d;
import java.util.List;
-
import eu.ztsh.training.hackerrank.HackerRankTest;
import eu.ztsh.training.hackerrank.SolutionClassDescription;
import org.junit.jupiter.api.DisplayName;
@@ -10,7 +9,7 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@DisplayName("HackerRank challenges: Java 2D Array")
-class Array2DTest extends HackerRankTest {
+class SolutionTest extends HackerRankTest {
@Test
public void dummyInitTest() {
@@ -62,9 +61,10 @@ class Array2DTest extends HackerRankTest {
);
}
+
@Override
protected SolutionClassDescription getSolutionClassDescription() {
- return new SolutionClassDescription(Array2D.class);
+ return new SolutionClassDescription(Solution.class);
}
}
\ No newline at end of file
diff --git a/src/test/java/eu/ztsh/training/hackerrank/datastructures/ComparatorTest.java b/src/test/java/eu/ztsh/training/hackerrank/datastructures/comparator/SolutionTest.java
similarity index 84%
rename from src/test/java/eu/ztsh/training/hackerrank/datastructures/ComparatorTest.java
rename to src/test/java/eu/ztsh/training/hackerrank/datastructures/comparator/SolutionTest.java
index 43bce32..00390fa 100644
--- a/src/test/java/eu/ztsh/training/hackerrank/datastructures/ComparatorTest.java
+++ b/src/test/java/eu/ztsh/training/hackerrank/datastructures/comparator/SolutionTest.java
@@ -1,4 +1,4 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.comparator;
import eu.ztsh.training.hackerrank.HackerRankTest;
import eu.ztsh.training.hackerrank.SolutionClassDescription;
@@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test;
import java.util.List;
@DisplayName("HackerRank challenges: Java Comparator")
-class ComparatorTest extends HackerRankTest {
+class SolutionTest extends HackerRankTest {
@Test
public void testCase0() {
@@ -33,7 +33,7 @@ class ComparatorTest extends HackerRankTest {
@Override
protected SolutionClassDescription getSolutionClassDescription() {
- return new SolutionClassDescription(Comparator.class);
+ return new SolutionClassDescription(Solution.class);
}
}
\ No newline at end of file
diff --git a/src/test/java/eu/ztsh/training/hackerrank/datastructures/DequeTest.java b/src/test/java/eu/ztsh/training/hackerrank/datastructures/dequeue/SolutionTest.java
similarity index 83%
rename from src/test/java/eu/ztsh/training/hackerrank/datastructures/DequeTest.java
rename to src/test/java/eu/ztsh/training/hackerrank/datastructures/dequeue/SolutionTest.java
index 10097ec..ae89c05 100644
--- a/src/test/java/eu/ztsh/training/hackerrank/datastructures/DequeTest.java
+++ b/src/test/java/eu/ztsh/training/hackerrank/datastructures/dequeue/SolutionTest.java
@@ -1,14 +1,13 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.dequeue;
import java.util.List;
-
import eu.ztsh.training.hackerrank.HackerRankTest;
import eu.ztsh.training.hackerrank.SolutionClassDescription;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
@DisplayName("HackerRank challenges: Java Dequeue")
-class DequeTest extends HackerRankTest {
+class SolutionTest extends HackerRankTest {
@Test
public void testCase0() {
@@ -34,7 +33,7 @@ class DequeTest extends HackerRankTest {
@Override
protected SolutionClassDescription getSolutionClassDescription() {
- return new SolutionClassDescription(Deque.class);
+ return new SolutionClassDescription(Solution.class);
}
}
\ No newline at end of file
diff --git a/src/test/java/eu/ztsh/training/hackerrank/datastructures/PriorityQueueTest.java b/src/test/java/eu/ztsh/training/hackerrank/datastructures/priority_queue/SolutionTest.java
similarity index 87%
rename from src/test/java/eu/ztsh/training/hackerrank/datastructures/PriorityQueueTest.java
rename to src/test/java/eu/ztsh/training/hackerrank/datastructures/priority_queue/SolutionTest.java
index 689b8b0..5110d10 100644
--- a/src/test/java/eu/ztsh/training/hackerrank/datastructures/PriorityQueueTest.java
+++ b/src/test/java/eu/ztsh/training/hackerrank/datastructures/priority_queue/SolutionTest.java
@@ -1,15 +1,14 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.priority_queue;
+import java.util.List;
import eu.ztsh.training.hackerrank.HackerRankTest;
import eu.ztsh.training.hackerrank.SolutionClassDescription;
import eu.ztsh.training.hackerrank.SolutionClassDescription.FieldModifier;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
-import java.util.List;
-
@DisplayName("HackerRank challenges: Java Priority Queue")
-class PriorityQueueTest extends HackerRankTest {
+class SolutionTest extends HackerRankTest {
@Test
public void testCase0() {
@@ -37,9 +36,10 @@ class PriorityQueueTest extends HackerRankTest {
simpleAssert(input, expected);
}
+
@Override
protected SolutionClassDescription getSolutionClassDescription() {
- return new SolutionClassDescription(PriorityQueue.class,
+ return new SolutionClassDescription(Solution.class,
"scan",
new FieldModifier[]{FieldModifier.PRIVATE, FieldModifier.STATIC});
}
diff --git a/src/test/java/eu/ztsh/training/hackerrank/datastructures/StackTest.java b/src/test/java/eu/ztsh/training/hackerrank/datastructures/stack/SolutionTest.java
similarity index 91%
rename from src/test/java/eu/ztsh/training/hackerrank/datastructures/StackTest.java
rename to src/test/java/eu/ztsh/training/hackerrank/datastructures/stack/SolutionTest.java
index ef0a80c..0ecec40 100644
--- a/src/test/java/eu/ztsh/training/hackerrank/datastructures/StackTest.java
+++ b/src/test/java/eu/ztsh/training/hackerrank/datastructures/stack/SolutionTest.java
@@ -1,14 +1,13 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.stack;
+import java.util.List;
import eu.ztsh.training.hackerrank.HackerRankTest;
import eu.ztsh.training.hackerrank.SolutionClassDescription;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
-import java.util.List;
-
@DisplayName("HackerRank challenges: Java Stack")
-class StackTest extends HackerRankTest {
+class SolutionTest extends HackerRankTest {
@Test
public void testCase0() {
@@ -62,7 +61,7 @@ class StackTest extends HackerRankTest {
@Override
protected SolutionClassDescription getSolutionClassDescription() {
- return new SolutionClassDescription(Stack.class);
+ return new SolutionClassDescription(Solution.class);
}
}
diff --git a/src/test/java/eu/ztsh/training/hackerrank/datastructures/SubarrayTest.java b/src/test/java/eu/ztsh/training/hackerrank/datastructures/subarray/SolutionTest.java
similarity index 69%
rename from src/test/java/eu/ztsh/training/hackerrank/datastructures/SubarrayTest.java
rename to src/test/java/eu/ztsh/training/hackerrank/datastructures/subarray/SolutionTest.java
index 6932a20..59cc9f8 100644
--- a/src/test/java/eu/ztsh/training/hackerrank/datastructures/SubarrayTest.java
+++ b/src/test/java/eu/ztsh/training/hackerrank/datastructures/subarray/SolutionTest.java
@@ -1,14 +1,15 @@
-package eu.ztsh.training.hackerrank.datastructures;
+package eu.ztsh.training.hackerrank.datastructures.subarray;
+import java.util.List;
import eu.ztsh.training.hackerrank.HackerRankTest;
import eu.ztsh.training.hackerrank.SolutionClassDescription;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
-import java.util.List;
+import static org.assertj.core.api.Assertions.assertThat;
@DisplayName("HackerRank challenges: Java Subarray")
-class SubarrayTest extends HackerRankTest {
+class SolutionTest extends HackerRankTest {
@Test
public void testCase0() {
@@ -18,9 +19,10 @@ class SubarrayTest extends HackerRankTest {
);
}
+
@Override
protected SolutionClassDescription getSolutionClassDescription() {
- return new SolutionClassDescription(Subarray.class);
+ return new SolutionClassDescription(Solution.class);
}
}
\ No newline at end of file