mirror of https://github.com/OpenVidu/openvidu.git
openvidu-server: commented tests removed
pabloFuente
parent
8b7e12949b
commit
42cf3b4841
|
|
@ -1,156 +0,0 @@
|
||||||
/*
|
|
||||||
* (C) Copyright 2017-2019 OpenVidu (https://openvidu.io/)
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package io.openvidu.server.test;
|
|
||||||
|
|
||||||
import static org.junit.Assert.fail;
|
|
||||||
|
|
||||||
import java.io.BufferedWriter;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.nio.file.Paths;
|
|
||||||
import java.util.concurrent.ArrayBlockingQueue;
|
|
||||||
import java.util.concurrent.BlockingQueue;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.kurento.client.internal.KmsProvider;
|
|
||||||
import org.kurento.client.internal.NotEnoughResourcesException;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.context.ConfigurableApplicationContext;
|
|
||||||
|
|
||||||
import com.google.common.base.StandardSystemProperty;
|
|
||||||
|
|
||||||
import io.openvidu.server.OpenViduServer;
|
|
||||||
import io.openvidu.server.core.Participant;
|
|
||||||
import io.openvidu.server.core.SessionManager;
|
|
||||||
import io.openvidu.server.core.Token;
|
|
||||||
import io.openvidu.server.kurento.core.KurentoSessionManager;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Integration server test, checks the autodiscovery of KMS URLs.
|
|
||||||
*
|
|
||||||
* @author Micael Gallego (micael.gallego@gmail.com)
|
|
||||||
* @since 6.2.1
|
|
||||||
*/
|
|
||||||
public class AutodiscoveryKmsUrlTest {
|
|
||||||
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(AutodiscoveryKmsUrlTest.class);
|
|
||||||
|
|
||||||
public static BlockingQueue<Boolean> queue = new ArrayBlockingQueue<>(10);
|
|
||||||
|
|
||||||
public static class TestKmsUrlProvider implements KmsProvider {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String reserveKms(String id, int loadPoints) throws NotEnoughResourcesException {
|
|
||||||
if (loadPoints == 50) {
|
|
||||||
log.debug("getKmsUrl called with 50");
|
|
||||||
queue.add(true);
|
|
||||||
} else {
|
|
||||||
log.error("getKmsUrl called with {} instead of 50", loadPoints);
|
|
||||||
queue.add(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
return "ws://fakeUrl";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String reserveKms(String id) throws NotEnoughResourcesException {
|
|
||||||
|
|
||||||
log.error("getKmsUrl called without load points");
|
|
||||||
queue.add(false);
|
|
||||||
|
|
||||||
return "ws://fakeUrl";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void releaseKms(String id) throws NotEnoughResourcesException {
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void test() throws IOException {
|
|
||||||
|
|
||||||
/*Path backup = null;
|
|
||||||
|
|
||||||
Path configFile = Paths.get(StandardSystemProperty.USER_HOME.value(), ".kurento",
|
|
||||||
"config.properties");
|
|
||||||
|
|
||||||
System.setProperty("kms.uris", "[\"autodiscovery\"]");
|
|
||||||
|
|
||||||
try {
|
|
||||||
|
|
||||||
if (Files.exists(configFile)) {
|
|
||||||
|
|
||||||
backup = configFile.getParent().resolve("config.properties.old");
|
|
||||||
|
|
||||||
Files.move(configFile, backup);
|
|
||||||
log.debug("Backed-up old config.properties");
|
|
||||||
}
|
|
||||||
|
|
||||||
Files.createDirectories(configFile.getParent());
|
|
||||||
|
|
||||||
try (BufferedWriter writer = Files.newBufferedWriter(configFile, StandardCharsets.UTF_8)) {
|
|
||||||
writer.write("kms.url.provider: " + TestKmsUrlProvider.class.getName() + "\r\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
String contents = new String(Files.readAllBytes(configFile));
|
|
||||||
log.debug("Config file contents:\n{}", contents);
|
|
||||||
|
|
||||||
ConfigurableApplicationContext app = OpenViduServer
|
|
||||||
.start(new String[] { "--server.port=7777" });
|
|
||||||
|
|
||||||
final SessionManager roomManager = app.getBean(KurentoSessionManager.class);
|
|
||||||
|
|
||||||
new Thread(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
Participant p = new Participant("privateId", "publicId", new Token("token"), "clientMetadata");
|
|
||||||
roomManager
|
|
||||||
.joinRoom(p, "sessionId", 1);
|
|
||||||
}
|
|
||||||
}).start();
|
|
||||||
|
|
||||||
try {
|
|
||||||
Boolean result = queue.poll(10, TimeUnit.SECONDS);
|
|
||||||
|
|
||||||
if (result == null) {
|
|
||||||
fail("Event in KmsUrlProvider not called");
|
|
||||||
} else {
|
|
||||||
if (!result) {
|
|
||||||
fail("Test failed");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
fail("KmsUrlProvider was not called");
|
|
||||||
}
|
|
||||||
|
|
||||||
} finally {
|
|
||||||
|
|
||||||
Files.delete(configFile);
|
|
||||||
|
|
||||||
if (backup != null) {
|
|
||||||
Files.move(backup, configFile);
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,201 +0,0 @@
|
||||||
/*
|
|
||||||
* (C) Copyright 2017-2019 OpenVidu (https://openvidu.io/)
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package io.openvidu.server.test;
|
|
||||||
|
|
||||||
import static org.hamcrest.CoreMatchers.equalTo;
|
|
||||||
import static org.hamcrest.CoreMatchers.is;
|
|
||||||
import static org.junit.Assert.assertThat;
|
|
||||||
import static org.junit.Assert.fail;
|
|
||||||
import static org.mockito.Matchers.any;
|
|
||||||
import static org.mockito.Mockito.doAnswer;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.concurrent.Callable;
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
import java.util.concurrent.ExecutorCompletionService;
|
|
||||||
import java.util.concurrent.ExecutorService;
|
|
||||||
import java.util.concurrent.Executors;
|
|
||||||
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.kurento.jsonrpc.Transaction;
|
|
||||||
import org.kurento.jsonrpc.client.JsonRpcClientLocal;
|
|
||||||
import org.kurento.jsonrpc.message.Request;
|
|
||||||
import org.mockito.Matchers;
|
|
||||||
import org.mockito.Mock;
|
|
||||||
import org.mockito.invocation.InvocationOnMock;
|
|
||||||
import org.mockito.runners.MockitoJUnitRunner;
|
|
||||||
import org.mockito.stubbing.Answer;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
|
|
||||||
import io.openvidu.client.OpenViduClient;
|
|
||||||
import io.openvidu.client.ServerJsonRpcHandler;
|
|
||||||
import io.openvidu.client.internal.Notification;
|
|
||||||
import io.openvidu.client.internal.ParticipantJoinedInfo;
|
|
||||||
import io.openvidu.client.internal.ProtocolElements;
|
|
||||||
import io.openvidu.client.internal.Notification.Method;
|
|
||||||
import io.openvidu.server.core.Participant;
|
|
||||||
import io.openvidu.server.core.Token;
|
|
||||||
import io.openvidu.server.kurento.core.KurentoSessionEventsHandler;
|
|
||||||
import io.openvidu.server.rpc.RpcConnection;
|
|
||||||
import io.openvidu.server.rpc.RpcHandler;
|
|
||||||
import io.openvidu.server.rpc.RpcNotificationService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Integration tests for the room server protocol.
|
|
||||||
*
|
|
||||||
* @author Radu Tom Vlad (rvlad@naevatec.com)
|
|
||||||
* @since 6.3.1
|
|
||||||
*/
|
|
||||||
@RunWith(MockitoJUnitRunner.class)
|
|
||||||
public class RoomProtocolTest {
|
|
||||||
|
|
||||||
private Integer transactionId = 0;
|
|
||||||
|
|
||||||
private final Logger log = LoggerFactory.getLogger(RoomProtocolTest.class);
|
|
||||||
|
|
||||||
private RpcNotificationService notificationService;
|
|
||||||
|
|
||||||
@Mock
|
|
||||||
private RpcHandler userControl;
|
|
||||||
|
|
||||||
private KurentoSessionEventsHandler sessionHandler;
|
|
||||||
|
|
||||||
private JsonRpcClientLocal localClient0;
|
|
||||||
private OpenViduClient client0;
|
|
||||||
private ServerJsonRpcHandler serverHandler0;
|
|
||||||
|
|
||||||
private JsonRpcClientLocal localClient1;
|
|
||||||
private OpenViduClient client1;
|
|
||||||
private ServerJsonRpcHandler serverHandler1;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void init() {
|
|
||||||
/*notificationService = new RpcNotificationService();
|
|
||||||
sessionHandler = new KurentoSessionHandler();*/
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void joinRoom() throws IOException, InterruptedException, ExecutionException {
|
|
||||||
/*final Map<String, List<String>> expectedEmptyPeersList = new HashMap<String, List<String>>();
|
|
||||||
|
|
||||||
final Map<String, List<String>> expectedPeersList = new HashMap<String, List<String>>();
|
|
||||||
List<String> user0Streams = new ArrayList<String>();
|
|
||||||
user0Streams.add("user0_CAMERA");
|
|
||||||
expectedPeersList.put("user0", user0Streams);
|
|
||||||
|
|
||||||
final Set<Participant> existingParticipants = new HashSet<Participant>();
|
|
||||||
|
|
||||||
doAnswer(new Answer<Void>() {
|
|
||||||
@Override
|
|
||||||
public Void answer(InvocationOnMock invocation) throws Throwable {
|
|
||||||
Request<?> argsRequest = invocation.getArgumentAt(1, Request.class);
|
|
||||||
Request<JsonObject> request = new Request<JsonObject>(argsRequest.getSessionId(),
|
|
||||||
argsRequest.getId(), argsRequest.getMethod(), (JsonObject) argsRequest.getParams());
|
|
||||||
|
|
||||||
String roomName = RpcHandler.getStringParam(request,
|
|
||||||
ProtocolElements.JOINROOM_ROOM_PARAM);
|
|
||||||
String userName = RpcHandler.getStringParam(request,
|
|
||||||
ProtocolElements.JOINROOM_USER_PARAM);
|
|
||||||
|
|
||||||
log.debug("joinRoom -> {} to {}", userName, roomName);
|
|
||||||
|
|
||||||
sessionHandler.onParticipantJoined(null, transactionId++, existingParticipants, null);
|
|
||||||
|
|
||||||
if (userName.equalsIgnoreCase("user0")) {
|
|
||||||
existingParticipants.add(new Participant("privateId", "user0", new Token("token"), "clientMetadata"));
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}).when(userControl).joinRoom(any(RpcConnection.class), Matchers.<Request<JsonObject>> any());
|
|
||||||
|
|
||||||
// controls the join order
|
|
||||||
final CountDownLatch joinCdl = new CountDownLatch(1);
|
|
||||||
|
|
||||||
ExecutorService threadPool = Executors.newCachedThreadPool();
|
|
||||||
ExecutorCompletionService<Void> exec = new ExecutorCompletionService<>(threadPool);
|
|
||||||
|
|
||||||
exec.submit(new Callable<Void>() {
|
|
||||||
@Override
|
|
||||||
public Void call() throws Exception {
|
|
||||||
String thname = Thread.currentThread().getName();
|
|
||||||
Thread.currentThread().setName("user0");
|
|
||||||
|
|
||||||
localClient0 = new JsonRpcClientLocal(userControl);
|
|
||||||
localClient0.setSessionId("session0");
|
|
||||||
serverHandler0 = new ServerJsonRpcHandler();
|
|
||||||
client0 = new OpenViduClient(localClient0, serverHandler0);
|
|
||||||
try {
|
|
||||||
Map<String, List<String>> emptyPeersList = client0.joinRoom("room", "user0", null);
|
|
||||||
assertThat(emptyPeersList.entrySet(), equalTo(expectedEmptyPeersList.entrySet()));
|
|
||||||
} catch (IOException e) {
|
|
||||||
log.error("Unable to join room", e);
|
|
||||||
fail("Unable to join room: " + e.getMessage());
|
|
||||||
} finally {
|
|
||||||
joinCdl.countDown();
|
|
||||||
}
|
|
||||||
Thread.currentThread().setName(thname);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
exec.submit(new Callable<Void>() {
|
|
||||||
@Override
|
|
||||||
public Void call() throws Exception {
|
|
||||||
String thname = Thread.currentThread().getName();
|
|
||||||
Thread.currentThread().setName("user1");
|
|
||||||
|
|
||||||
localClient1 = new JsonRpcClientLocal(userControl);
|
|
||||||
localClient1.setSessionId("session1");
|
|
||||||
serverHandler1 = new ServerJsonRpcHandler();
|
|
||||||
client1 = new OpenViduClient(localClient1, serverHandler1);
|
|
||||||
joinCdl.await();
|
|
||||||
try {
|
|
||||||
Map<String, List<String>> peersList = client1.joinRoom("room", "user1", null);
|
|
||||||
assertThat(peersList, is(expectedPeersList));
|
|
||||||
} catch (IOException e) {
|
|
||||||
log.error("Unable to join room", e);
|
|
||||||
fail("Unable to join room: " + e.getMessage());
|
|
||||||
}
|
|
||||||
Thread.currentThread().setName(thname);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
exec.take().get();
|
|
||||||
exec.take().get();
|
|
||||||
|
|
||||||
threadPool.shutdown();
|
|
||||||
|
|
||||||
Notification notif = serverHandler0.getNotification();
|
|
||||||
assertThat(notif.getMethod(), is(Method.PARTICIPANTJOINED_METHOD));
|
|
||||||
ParticipantJoinedInfo joinedNotif = (ParticipantJoinedInfo) notif;
|
|
||||||
assertThat(joinedNotif.getId(), is("user1"));*/
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue