[openmeetings] branch master updated: [OPENMEETINGS-2701] tests should be fixed

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 6b7ba12  [OPENMEETINGS-2701] tests should be fixed
6b7ba12 is described below

commit 6b7ba125ecc79c5e4621586a83cf6f706d136f05
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sun Nov 14 22:09:00 2021 +0700

    [OPENMEETINGS-2701] tests should be fixed
---
 .../test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java | 4 +++-
 .../org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java  | 2 --
 .../java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java  | 2 --
 .../java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java | 2 --
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
 
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
index e405d55..999cfb9 100644
--- 
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
+++ 
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
@@ -56,6 +56,7 @@ import org.kurento.client.internal.client.RomManager;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockedStatic;
+import org.mockito.Mockito;
 import org.mockito.Spy;
 import org.mockito.internal.configuration.injection.scanner.MockScanner;
 import org.mockito.invocation.InvocationOnMock;
@@ -91,7 +92,8 @@ public class BaseMockedTest {
        protected final static JSONObject MSG_BASE = new JSONObject();
 
        @BeforeEach
-       public void setup() {
+       public void baseSetup() {
+               Mockito.reset();
                
lenient().doReturn(kServerManager).when(client).getServerManager();
                lenient().doReturn(new 
TransactionImpl(romManager)).when(client).beginTransaction();
                handler.init();
diff --git 
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
 
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
index 377d48b..ea4ee48 100644
--- 
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
+++ 
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
@@ -68,10 +68,8 @@ class TestRecordingFlowMocked extends BaseMockedTest {
        //This variable hold a reference to the UID of the StreamDesc that will 
be created
        private String streamDescUID;
 
-       @Override
        @BeforeEach
        public void setup() {
-               super.setup();
                User u = new User();
                u.setId(USER_ID);
                u.setFirstname("firstname");
diff --git 
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
 
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
index d120f9b..b7e1510 100644
--- 
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
+++ 
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
@@ -57,10 +57,8 @@ class TestRoomFlowMocked extends BaseMockedTest {
        @Mock
        private IApplication app;
 
-       @Override
        @BeforeEach
        public void setup() {
-               super.setup();
                
lenient().doReturn(mock(MediaPipeline.class)).when(client).createMediaPipeline(any(Transaction.class));
                User u = new User();
                u.setId(USER_ID);
diff --git 
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
 
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
index be0d630..70632b6 100644
--- 
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
+++ 
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
@@ -35,10 +35,8 @@ import org.kurento.client.Transaction;
 import com.github.openjson.JSONObject;
 
 class TestSetupFlowMocked extends BaseMockedTest {
-       @Override
        @BeforeEach
        public void setup() {
-               super.setup();
                doReturn(true).when(handler).isConnected();
                MSG_BASE.put(TAG_MODE, MODE_TEST);
        }