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

Revert "openvidu-test-e2e: fix restApiProTest" 

This reverts commit 10ad16464c.
pull/669/head
pabloFuente 2021-11-12 18:09:52 +01:00
parent a281c5b2f9
commit c6687efe0e
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-client/src/main/java/io/openvidu/client/OpenViduException.java
View File

@ -41,7 +41,7 @@ public class OpenViduException extends JsonRpcErrorException {
USER_UNAUTHORIZED_ERROR_CODE(401), ROLE_NOT_FOUND_ERROR_CODE(402), SESSIONID_CANNOT_BE_CREATED_ERROR_CODE(403),
TOKEN_CANNOT_BE_CREATED_ERROR_CODE(404), EXISTING_FILTER_ALREADY_APPLIED_ERROR_CODE(405),
FILTER_NOT_APPLIED_ERROR_CODE(406), FILTER_EVENT_LISTENER_NOT_FOUND_ERROR_CODE(407), PUBLISHER_ENDPOINT_NOT_FOUND_ERROR_CODE(408),
FILTER_NOT_APPLIED_ERROR_CODE(406), FILTER_EVENT_LISTENER_NOT_FOUND(407),
USER_METADATA_FORMAT_INVALID_ERROR_CODE(500),

12
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
View File

@ -750,17 +750,11 @@ public class KurentoSessionManager extends SessionManager {
KurentoParticipant kParticipant = (KurentoParticipant) participant;
log.debug("Request [ICE_CANDIDATE] endpoint={} candidate={} " + "sdpMLineIdx={} sdpMid={} ({})",
endpointName, candidate, sdpMLineIndex, sdpMid, participant.getParticipantPublicId());
if (kParticipant.isPublisherEndpointDefined()) {
kParticipant.addIceCandidate(endpointName, new IceCandidate(candidate, sdpMid, sdpMLineIndex));
sessionEventsHandler.onRecvIceCandidate(participant, transactionId, null);
} else {
throw new OpenViduException(Code.PUBLISHER_ENDPOINT_NOT_FOUND_ERROR_CODE,
"Request to onIceCandidate for connection " + endpointName
+ " gone wrong. There is no publisher endpoint available");
}
} catch (OpenViduException e) {
log.error("PARTICIPANT {}: Error receiving ICE " + "candidate (epName={}, candidate={}): {}",
participant.getParticipantPublicId(), endpointName, candidate, e.getMessage());
log.error("PARTICIPANT {}: Error receiving ICE " + "candidate (epName={}, candidate={})",
participant.getParticipantPublicId(), endpointName, candidate, e);
sessionEventsHandler.onRecvIceCandidate(participant, transactionId, e);
}
}
@ -1380,7 +1374,7 @@ public class KurentoSessionManager extends SessionManager {
} catch (Exception e) {
log.error("Request to addFilterEventListener to stream {} gone wrong. Error: {}", streamId,
e.getMessage());
throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND_ERROR_CODE,
throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND,
"Request to addFilterEventListener to stream " + streamId + " gone wrong: " + e.getMessage());
}
}

2
openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/PublisherEndpoint.java
View File

@ -158,7 +158,7 @@ public class PublisherEndpoint extends MediaEndpoint {
String streamId = this.getStreamId();
log.error("Request to removeFilterEventListener to stream {} gone wrong: Filter {} has no listener added",
streamId, eventType);
throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND_ERROR_CODE,
throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND,
"Request to removeFilterEventListener to stream " + streamId + " gone wrong: Filter " + eventType
+ " has no listener added");
}

2
openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduEventManager.java
View File

@ -121,8 +121,6 @@ public class OpenViduEventManager {
this.pollingThread.interrupt();
}
this.isInterrupted.set(false);
this.pollingThread = new Thread(() -> {
while (!this.isInterrupted.get()) {
this.getEventsFromBrowser();

4
openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestappUser.java
View File

@ -1,6 +1,10 @@
package io.openvidu.test.e2e;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.support.ui.ExpectedCondition;
import org.openqa.selenium.support.ui.WebDriverWait;
import io.openvidu.test.browsers.BrowserUser;