ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: remove KmsManager getter only used in test

pull/567/head
pabloFuente 2020-11-20 11:53:23 +01:00
parent 3b8d025f13
commit b1d57232cb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
View File

@ -295,7 +295,7 @@ public abstract class KmsManager {
kmsReconnectionLocks.get(kms.getId()).unlock(); kmsReconnectionLocks.get(kms.getId()).unlock();
} }
} }
}, () -> new Long(dynamicReconnectLoopSeconds(ITERATION.getAndIncrement()) * 1000)); }, () -> Long.valueOf(dynamicReconnectLoopSeconds(ITERATION.getAndIncrement()) * 1000));
kurentoReconnectTimer.updateTimer(); kurentoReconnectTimer.updateTimer();
} }
@ -353,10 +353,6 @@ public abstract class KmsManager {
public abstract List<Kms> initializeKurentoClients(List<KmsProperties> kmsProperties, boolean disconnectUponFailure) public abstract List<Kms> initializeKurentoClients(List<KmsProperties> kmsProperties, boolean disconnectUponFailure)
throws Exception; throws Exception;
public LoadManager getLoadManager() {
return this.loadManager;
}
@PostConstruct @PostConstruct
protected abstract void postConstructInitKurentoClients(); protected abstract void postConstructInitKurentoClients();

4
openvidu-server/src/test/java/io/openvidu/server/test/integration/config/IntegrationTestConfiguration.java
View File

@ -14,6 +14,7 @@ import org.kurento.client.KurentoClient;
import org.kurento.client.MediaPipeline; import org.kurento.client.MediaPipeline;
import org.kurento.client.ServerManager; import org.kurento.client.ServerManager;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.powermock.reflect.Whitebox;
import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -37,7 +38,8 @@ public class IntegrationTestConfiguration {
List<Kms> successfullyConnectedKmss = new ArrayList<>(); List<Kms> successfullyConnectedKmss = new ArrayList<>();
List<KmsProperties> kmsProperties = invocation.getArgument(0); List<KmsProperties> kmsProperties = invocation.getArgument(0);
for (KmsProperties kmsProp : kmsProperties) { for (KmsProperties kmsProp : kmsProperties) {
Kms kms = new Kms(kmsProp, spy.getLoadManager()); Kms kms = new Kms(kmsProp, Whitebox.getInternalState(spy, "loadManager"),
Whitebox.getInternalState(spy, "quarantineKiller"));
KurentoClient kClient = mock(KurentoClient.class); KurentoClient kClient = mock(KurentoClient.class);
doAnswer(i -> { doAnswer(i -> {