From f5a1f5654029c46f202e8cb6843fb9151d2789c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=BE=D1=80=D0=B5=D0=B2=D0=B0=20=D0=95=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0=20=D0=98=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BD=D0=B0?= <moreva.ei@edu.spbstu.ru>
Date: Wed, 24 Mar 2021 23:25:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=8A=D0=B5=D0=B4=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=B2=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => SimpleTests}/GlobalResourceTest.java             | 4 +++-
 .../InterruptionTest.java}                                | 8 +++++---
 .../{ => SimpleTests}/LocalResourceTest.java              | 4 +++-
 src/main/java/Main.java                                   | 7 ++++---
 4 files changed, 15 insertions(+), 8 deletions(-)
 rename src/main/java/EventGenerators/{ => SimpleTests}/GlobalResourceTest.java (96%)
 rename src/main/java/EventGenerators/{CustomGenerator.java => SimpleTests/InterruptionTest.java} (81%)
 rename src/main/java/EventGenerators/{ => SimpleTests}/LocalResourceTest.java (93%)

diff --git a/src/main/java/EventGenerators/GlobalResourceTest.java b/src/main/java/EventGenerators/SimpleTests/GlobalResourceTest.java
similarity index 96%
rename from src/main/java/EventGenerators/GlobalResourceTest.java
rename to src/main/java/EventGenerators/SimpleTests/GlobalResourceTest.java
index dfea565..bd841ea 100644
--- a/src/main/java/EventGenerators/GlobalResourceTest.java
+++ b/src/main/java/EventGenerators/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/src/main/java/EventGenerators/CustomGenerator.java b/src/main/java/EventGenerators/SimpleTests/InterruptionTest.java
similarity index 81%
rename from src/main/java/EventGenerators/CustomGenerator.java
rename to src/main/java/EventGenerators/SimpleTests/InterruptionTest.java
index 8dbbbdd..e56aa47 100644
--- a/src/main/java/EventGenerators/CustomGenerator.java
+++ b/src/main/java/EventGenerators/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/src/main/java/EventGenerators/LocalResourceTest.java b/src/main/java/EventGenerators/SimpleTests/LocalResourceTest.java
similarity index 93%
rename from src/main/java/EventGenerators/LocalResourceTest.java
rename to src/main/java/EventGenerators/SimpleTests/LocalResourceTest.java
index d60fe03..910d969 100644
--- a/src/main/java/EventGenerators/LocalResourceTest.java
+++ b/src/main/java/EventGenerators/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
index bf6ac9f..15dbfed 100644
--- 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);