Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Простые тесты. #1

Merged
merged 3 commits into from
Mar 25, 2021
Merged

Простые тесты. #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b445b8
Добавлены новые тесты.
KateMoreva Mar 24, 2021
f5a1f56
Объединение тестов в пакет
KateMoreva Mar 24, 2021
37fa7ca
Тесты вынесены в отдельный блок
KateMoreva Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Объединение тестов в пакет
  • Loading branch information
@KateMoreva
KateMoreva committed Mar 24, 2021
commit f5a1f5654029c46f202e8cb6843fb9151d2789c3
4 changes: 3 additions & 1 deletion ...a/EventGenerators/GlobalResourceTest.java → ...ators/SimpleTests/GlobalResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package EventGenerators;
package EventGenerators.SimpleTests;

import EventGenerators.EventGenerator;

import java.util.function.Consumer;
import java.util.stream.Stream;
Expand Down
8 changes: 5 additions & 3 deletions ...java/EventGenerators/CustomGenerator.java → ...erators/SimpleTests/InterruptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 мс.
Expand Down
4 changes: 3 additions & 1 deletion ...va/EventGenerators/LocalResourceTest.java → ...rators/SimpleTests/LocalResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package EventGenerators;
package EventGenerators.SimpleTests;

import EventGenerators.EventGenerator;

import java.util.function.Consumer;
import java.util.stream.Stream;
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);
Expand Down