Объединение тестов в пакет

KateMoreva · Mar 24, 2021 · f5a1f56 · f5a1f56
1 parent 2b445b8
commit f5a1f56
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/...a/EventGenerators/GlobalResourceTest.java → ...ators/SimpleTests/GlobalResourceTest.java b/...a/EventGenerators/GlobalResourceTest.java → ...ators/SimpleTests/GlobalResourceTest.java
@@ -1,4 +1,6 @@
-package EventGenerators;
+package EventGenerators.SimpleTests;
+
+import EventGenerators.EventGenerator;
 
 import java.util.function.Consumer;
 import java.util.stream.Stream;

diff --git a/...java/EventGenerators/CustomGenerator.java → ...erators/SimpleTests/InterruptionTest.java b/...java/EventGenerators/CustomGenerator.java → ...erators/SimpleTests/InterruptionTest.java
@@ -1,10 +1,12 @@
-package EventGenerators;
+package EventGenerators.SimpleTests;
+
+import EventGenerators.EventGenerator;
 
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-public class CustomGenerator extends EventGenerator {
-    public CustomGenerator(Consumer<OsEvent> eventConsumer) {
+public class InterruptionTest extends EventGenerator {
+    public InterruptionTest(Consumer<OsEvent> eventConsumer) {
         // Тест на обработку прерываний:
         // Ждём 1 секунду, пока выполнится начальная задача в ОС.
         // Затем объявляем задачу с приоритетом 5. Ждём 200 мс.

diff --git a/...va/EventGenerators/LocalResourceTest.java → ...rators/SimpleTests/LocalResourceTest.java b/...va/EventGenerators/LocalResourceTest.java → ...rators/SimpleTests/LocalResourceTest.java
@@ -1,4 +1,6 @@
-package EventGenerators;
+package EventGenerators.SimpleTests;
+
+import EventGenerators.EventGenerator;
 
 import java.util.function.Consumer;
 import java.util.stream.Stream;

diff --git a/src/main/java/Main.java b/src/main/java/Main.java
@@ -1,5 +1,6 @@
-import EventGenerators.GlobalResourceTest;
-import EventGenerators.LocalResourceTest;
+import EventGenerators.SimpleTests.GlobalResourceTest;
+import EventGenerators.SimpleTests.InterruptionTest;
+import EventGenerators.SimpleTests.LocalResourceTest;
 import OS.OrtOS;
 import Tasks.Task;
 import org.slf4j.Logger;
@@ -14,7 +15,7 @@ public class Main {
     public static void main(String[] args) {
         final OrtOS ortOs = new OrtOS();
 //        final Thread eventsGenerator = new InfinityEventGenerator(ortOs::interpretEvent);
-//        final Thread eventsGenerator = new CustomGenerator(ortOs::interpretEvent);
+//        final Thread eventsGenerator = new InterruptionTest(ortOs::interpretEvent);
 //        final Thread eventsGenerator = new LocalResourceTest(ortOs::interpretEvent);
         final Thread eventsGenerator = new GlobalResourceTest(ortOs::interpretEvent);
         final Task taskToStart = new Task(0, MAX_PRIORITY, ortOs);