Changeset 160436 in webkit


Ignore:
Timestamp:
Dec 11, 2013 8:43:08 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Improving createOffer and createAnswer LayoutTests
​https://bugs.webkit.org/show_bug.cgi?id=125568

Patch by Thiago de Barros Lacerda <​thiago.lacerda@openbossa.org> on 2013-12-11
Reviewed by Philippe Normand.

The constraints parameter should be optional in both. Also adding tests to check if we already have a local SDP
when creating an answer.

Source/WebCore:

Existing tests were updated.

  • platform/mock/RTCPeerConnectionHandlerMock.cpp:

(WebCore::RTCPeerConnectionHandlerMock::createOffer):

LayoutTests:

  • fast/mediastream/RTCPeerConnection-createAnswer-expected.txt:
  • fast/mediastream/RTCPeerConnection-createAnswer.html:
  • fast/mediastream/RTCPeerConnection-createOffer-expected.txt:
  • fast/mediastream/RTCPeerConnection-createOffer.html:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r160431 r160436  
     12013-12-11  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        Improving createOffer and createAnswer LayoutTests
     4        https://bugs.webkit.org/show_bug.cgi?id=125568
     5
     6        Reviewed by Philippe Normand.
     7
     8        The constraints parameter should be optional in both. Also adding tests to check if we already have a local SDP
     9        when creating an answer.
     10
     11        * fast/mediastream/RTCPeerConnection-createAnswer-expected.txt:
     12        * fast/mediastream/RTCPeerConnection-createAnswer.html:
     13        * fast/mediastream/RTCPeerConnection-createOffer-expected.txt:
     14        * fast/mediastream/RTCPeerConnection-createOffer.html:
     15
    1162013-12-11  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
    217

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt

    r127906 r160436  
    44
    55
    6 PASS createOffer request failed.
    7 PASS pc.setRemoteDescription(sessionDescription, requestSucceeded2, requestFailed2); did not throw exception.
    8 PASS setRemoteDescription request succeeded.
     6PASS pc.createAnswer(requestSucceeded1, requestFailed1); did not throw exception.
     7PASS createAnswer request succeeded.
     8PASS pc.setRemoteDescription(sessionDescription, setDescriptionSucceeded, setDescriptionFailed); did not throw exception.
     9PASS setRemoteDescription succeeded.
     10PASS pc.createAnswer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}}); did not throw exception.
     11PASS createAnswer request failed.
    912PASS pc.createAnswer(requestSucceeded3, requestFailed3); did not throw exception.
    1013PASS createAnswer request succeeded.
     14PASS sessionDescription.type is "answer"
     15PASS pc.createAnswer(requestSucceeded4, requestFailed3, {mandatory:{"succeed":true}}); did not throw exception.
     16PASS createAnswer request succeeded.
     17PASS sessionDescription.type is "answer"
    1118PASS successfullyParsed is true
    1219

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer.html

    r158991 r160436  
    1010            var pc = null;
    1111
     12            function requestSucceeded4(sd)
     13            {
     14                testPassed('createAnswer request succeeded.');
     15
     16                sessionDescription = sd;
     17                shouldBe('sessionDescription.type', '"answer"');
     18
     19                finishJSTest();
     20            }
     21
    1222            function requestFailed3(reason)
    1323            {
    … …  
    1727            }
    1828
    19             function requestSucceeded3()
     29            function requestSucceeded3(sd)
    2030            {
    2131                testPassed('createAnswer request succeeded.');
     32
     33                sessionDescription = sd;
     34                shouldBe('sessionDescription.type', '"answer"');
     35
     36                shouldNotThrow('pc.createAnswer(requestSucceeded4, requestFailed3, {mandatory:{"succeed":true}});');
     37            }
     38
     39            function requestFailed2(reason)
     40            {
     41                testPassed('createAnswer request failed.');
     42
     43                shouldNotThrow('pc.createAnswer(requestSucceeded3, requestFailed3);');
     44            }
     45
     46            function requestSucceeded2()
     47            {
     48                testFailed('createAnswer request succeeded.');
    2249
    2350                finishJSTest();
    2451            }
    2552
    26             function requestFailed2(reason)
     53            function requestFailed1(reason)
    2754            {
    28                 testFailed('setRemoteDescription request failed.');
     55                testFailed('createAnswer request failed.');
    2956
    3057                finishJSTest();
    3158            }
    3259
    33             function requestSucceeded2()
     60            function requestSucceeded1()
    3461            {
    35                 testPassed('setRemoteDescription request succeeded.');
     62                testPassed('createAnswer request succeeded.');
    3663
    37                 shouldNotThrow('pc.createAnswer(requestSucceeded3, requestFailed3);');
     64                sessionDescription = new RTCSessionDescription({type:"offer", sdp:"remote"});
     65                shouldNotThrow('pc.setRemoteDescription(sessionDescription, setDescriptionSucceeded, setDescriptionFailed);');
    3866            }
    3967
    40             function requestFailed1()
     68            function setDescriptionFailed()
    4169            {
    42                 testPassed('createOffer request failed.');
     70                testFailed('setRemoteDescription failed.');
    4371
    44                 sessionDescription = new RTCSessionDescription({type:"answer", sdp:"remote"});
    45                 shouldNotThrow('pc.setRemoteDescription(sessionDescription, requestSucceeded2, requestFailed2);');
    46             }
    47 
    48             function requestSucceeded1(sd)
    49             {
    50                 testFailed('createOffer request succeeded.');
    5172                finishJSTest();
    5273            }
    5374
     75            function setDescriptionSucceeded()
     76            {
     77                testPassed('setRemoteDescription succeeded.');
     78                shouldNotThrow('pc.createAnswer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}});');
     79            }
     80
    5481            pc = new webkitRTCPeerConnection({iceServers:[]});
    55             pc.createOffer(requestSucceeded1, requestFailed1);
     82            shouldNotThrow('pc.createAnswer(requestSucceeded1, requestFailed1);');
    5683
    5784            window.jsTestIsAsync = true;

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt

    r127906 r160436  
    44
    55
    6 PASS requestSucceeded was called.
     6PASS pc.createOffer(requestSucceeded1, requestFailed1, {mandatory:{"succeed":true}}); did not throw exception.
     7PASS createOffer request succeeded.
    78PASS sessionDescription.type is "offer"
    8 PASS requestFailed was called.
     9PASS pc.createOffer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}}); did not throw exception.
     10PASS createOffer request failed.
    911PASS errorReason is "TEST_ERROR"
     12PASS pc.createOffer(requestSucceeded3, requestFailed1); did not throw exception.
     13PASS createOffer request succeeded.
     14PASS sessionDescription.type is "offer"
    1015PASS successfullyParsed is true
    1116

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html

    r158991 r160436  
    1010            var pc = null;
    1111
     12            function requestSucceeded3(sd)
     13            {
     14                testPassed('createOffer request succeeded.');
     15
     16                sessionDescription = sd;
     17                shouldBe('sessionDescription.type', '"offer"');
     18                finishJSTest();
     19            }
     20
    1221            function requestFailed2(reason)
    1322            {
    14                 testPassed('requestFailed was called.');
     23                testPassed('createOffer request failed.');
    1524
    1625                errorReason = reason;
    1726                shouldBe('errorReason', '"TEST_ERROR"');
    1827
    19                 finishJSTest();
     28                shouldNotThrow('pc.createOffer(requestSucceeded3, requestFailed1);');
    2029            }
    2130
    2231            function requestSucceeded2(sd)
    2332            {
    24                 testFailed('requestSucceeded was called.');
     33                testFailed('createOffer request succeeded.');
    2534                finishJSTest();
    2635            }
    … …  
    2837            function requestFailed1()
    2938            {
    30                 testFailed('requestFailed was called.');
     39                testFailed('createOffer request failed.');
    3140                finishJSTest();
    3241            }
    … …  
    3443            function requestSucceeded1(sd)
    3544            {
    36                 testPassed('requestSucceeded was called.');
     45                testPassed('createOffer request succeeded.');
    3746
    3847                sessionDescription = sd;
    3948                shouldBe('sessionDescription.type', '"offer"');
    4049
    41                 pc.createOffer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}});
     50                shouldNotThrow('pc.createOffer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}});');
    4251            }
    4352
    4453            pc = new webkitRTCPeerConnection({iceServers:[]});
    45             pc.createOffer(requestSucceeded1, requestFailed1, {mandatory:{"succeed":true}});
     54            shouldNotThrow('pc.createOffer(requestSucceeded1, requestFailed1, {mandatory:{"succeed":true}});');
    4655
    4756            window.jsTestIsAsync = true;

  • trunk/Source/WebCore/ChangeLog

    r160432 r160436  
     12013-12-11  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        Improving createOffer and createAnswer LayoutTests
     4        https://bugs.webkit.org/show_bug.cgi?id=125568
     5
     6        Reviewed by Philippe Normand.
     7
     8        The constraints parameter should be optional in both. Also adding tests to check if we already have a local SDP
     9        when creating an answer.
     10
     11        Existing tests were updated.
     12
     13        * platform/mock/RTCPeerConnectionHandlerMock.cpp:
     14        (WebCore::RTCPeerConnectionHandlerMock::createOffer):
     15
    1162013-12-11  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
    217

  • trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp

    r160181 r160436  
    6767    String succeedValue;
    6868    RefPtr<SessionRequestNotifier> notifier;
    69     if (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "true")
     69    if (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "false")
     70        notifier = adoptRef(new SessionRequestNotifier(request, 0));
     71    else
    7072        notifier = adoptRef(new SessionRequestNotifier(request, RTCSessionDescriptionDescriptor::create("offer", "local")));
    71     else
    72         notifier = adoptRef(new SessionRequestNotifier(request, 0));
    7373
    7474    m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
    … …  
    8080    // We can only create an answer if we have already had an offer and the remote session description is stored.
    8181    String succeedValue;
    82     if (!m_remoteSessionDescription.get() || (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "false"))
     82    if (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "false")
    8383        notifier = adoptRef(new SessionRequestNotifier(request, 0));
    8484    else
Note: See TracChangeset for help on using the changeset viewer.