From b380dbf231624a77738b143f58a4cfa4a65b4905 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Mon, 19 Sep 2022 17:05:55 +0300 Subject: [PATCH] http://git.mfd.msk/mfd/clearing/issues/6 --- refactoring tests for running in maven --- .../company/service/ClearingMemberCategoryServiceTest.java | 7 ++++++- .../clearing/company/service/CompanyInfoServiceTest.java | 7 ++++++- .../spcex/clearing/company/service/CompanyServiceTest.java | 5 +++++ .../clearing/company/service/CompanySymbolServiceTest.java | 7 ++++++- .../spcex/clearing/company/service/ContactServiceTest.java | 7 ++++++- 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java index 21bfc4717..6fb3d09e9 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java @@ -175,13 +175,18 @@ class ClearingMemberCategoryServiceTest { String listenerID = iMap.addEntryListener((EntryRemovedListener) entryEvent -> { System.out.println("Checking If removed.."); + try { + waiter.wait(100); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } synchronized (waiter) { waiter.notify(); } }, false); synchronized (waiter) { - waiter.wait(1000); + waiter.wait(100); } //ASSERT diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java index 20e96420e..83c3e92e7 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java @@ -135,13 +135,18 @@ class CompanyInfoServiceTest { String listenerID = iMap.addEntryListener((EntryUpdatedListener) entryEvent -> { System.out.println("Checking If removed.."); + try { + waiter.wait(100); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } synchronized (waiter) { waiter.notify(); } }, false); synchronized (waiter) { - waiter.wait(1000); + waiter.wait(100); } //ASSERT diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java index f9b714d8a..f9b9f73aa 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java @@ -99,6 +99,11 @@ class CompanyServiceTest { String listenerID = iMap.addEntryListener((EntryRemovedListener) entryEvent -> { System.out.println("Checking If removed.."); + try { + waiter.wait(100); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } synchronized (waiter) { waiter.notify(); } diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java index bdee7706b..15654ba28 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java @@ -109,13 +109,18 @@ class CompanySymbolServiceTest { String listenerID = iMap.addEntryListener((EntryUpdatedListener) entryEvent -> { System.out.println("Checking If removed.."); + try { + waiter.wait(100); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } synchronized (waiter) { waiter.notify(); } }, false); synchronized (waiter) { - waiter.wait(1000); + waiter.wait(100); } //ASSERT diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java index 4d1e3b397..bc7d93160 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java @@ -107,13 +107,18 @@ class ContactServiceTest { String listenerID = iMap.addEntryListener((EntryUpdatedListener) entryEvent -> { System.out.println("Checking If removed.."); + try { + waiter.wait(100); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } synchronized (waiter) { waiter.notify(); } }, false); synchronized (waiter) { - waiter.wait(1000); + waiter.wait(100); } //ASSERT