<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160436] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160436">160436</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-11 08:43:08 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateAnswerexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateAnswerhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateOfferexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateOfferhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp">trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160435 => 160436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-11 16:40:43 UTC (rev 160435)
+++ trunk/LayoutTests/ChangeLog 2013-12-11 16:43:08 UTC (rev 160436)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-11 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ Improving createOffer and createAnswer LayoutTests
+ https://bugs.webkit.org/show_bug.cgi?id=125568
+
+ 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.
+
+ * fast/mediastream/RTCPeerConnection-createAnswer-expected.txt:
+ * fast/mediastream/RTCPeerConnection-createAnswer.html:
+ * fast/mediastream/RTCPeerConnection-createOffer-expected.txt:
+ * fast/mediastream/RTCPeerConnection-createOffer.html:
+
</ins><span class="cx"> 2013-12-11 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateAnswerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt (160435 => 160436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt 2013-12-11 16:40:43 UTC (rev 160435)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt 2013-12-11 16:43:08 UTC (rev 160436)
</span><span class="lines">@@ -3,11 +3,18 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS createOffer request failed.
-PASS pc.setRemoteDescription(sessionDescription, requestSucceeded2, requestFailed2); did not throw exception.
-PASS setRemoteDescription request succeeded.
</del><ins>+PASS pc.createAnswer(requestSucceeded1, requestFailed1); did not throw exception.
+PASS createAnswer request succeeded.
+PASS pc.setRemoteDescription(sessionDescription, setDescriptionSucceeded, setDescriptionFailed); did not throw exception.
+PASS setRemoteDescription succeeded.
+PASS pc.createAnswer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}}); did not throw exception.
+PASS createAnswer request failed.
</ins><span class="cx"> PASS pc.createAnswer(requestSucceeded3, requestFailed3); did not throw exception.
</span><span class="cx"> PASS createAnswer request succeeded.
</span><ins>+PASS sessionDescription.type is "answer"
+PASS pc.createAnswer(requestSucceeded4, requestFailed3, {mandatory:{"succeed":true}}); did not throw exception.
+PASS createAnswer request succeeded.
+PASS sessionDescription.type is "answer"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateAnswerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer.html (160435 => 160436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer.html 2013-12-11 16:40:43 UTC (rev 160435)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer.html 2013-12-11 16:43:08 UTC (rev 160436)
</span><span class="lines">@@ -9,6 +9,16 @@
</span><span class="cx">
</span><span class="cx"> var pc = null;
</span><span class="cx">
</span><ins>+ function requestSucceeded4(sd)
+ {
+ testPassed('createAnswer request succeeded.');
+
+ sessionDescription = sd;
+ shouldBe('sessionDescription.type', '"answer"');
+
+ finishJSTest();
+ }
+
</ins><span class="cx"> function requestFailed3(reason)
</span><span class="cx"> {
</span><span class="cx"> testFailed('createAnswer request failed.');
</span><span class="lines">@@ -16,43 +26,60 @@
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function requestSucceeded3()
</del><ins>+ function requestSucceeded3(sd)
</ins><span class="cx"> {
</span><span class="cx"> testPassed('createAnswer request succeeded.');
</span><span class="cx">
</span><del>- finishJSTest();
</del><ins>+ sessionDescription = sd;
+ shouldBe('sessionDescription.type', '"answer"');
+
+ shouldNotThrow('pc.createAnswer(requestSucceeded4, requestFailed3, {mandatory:{"succeed":true}});');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function requestFailed2(reason)
</span><span class="cx"> {
</span><del>- testFailed('setRemoteDescription request failed.');
</del><ins>+ testPassed('createAnswer request failed.');
</ins><span class="cx">
</span><del>- finishJSTest();
</del><ins>+ shouldNotThrow('pc.createAnswer(requestSucceeded3, requestFailed3);');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function requestSucceeded2()
</span><span class="cx"> {
</span><del>- testPassed('setRemoteDescription request succeeded.');
</del><ins>+ testFailed('createAnswer request succeeded.');
</ins><span class="cx">
</span><del>- shouldNotThrow('pc.createAnswer(requestSucceeded3, requestFailed3);');
</del><ins>+ finishJSTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function requestFailed1()
</del><ins>+ function requestFailed1(reason)
</ins><span class="cx"> {
</span><del>- testPassed('createOffer request failed.');
</del><ins>+ testFailed('createAnswer request failed.');
</ins><span class="cx">
</span><del>- sessionDescription = new RTCSessionDescription({type:"answer", sdp:"remote"});
- shouldNotThrow('pc.setRemoteDescription(sessionDescription, requestSucceeded2, requestFailed2);');
</del><ins>+ finishJSTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function requestSucceeded1(sd)
</del><ins>+ function requestSucceeded1()
</ins><span class="cx"> {
</span><del>- testFailed('createOffer request succeeded.');
</del><ins>+ testPassed('createAnswer request succeeded.');
+
+ sessionDescription = new RTCSessionDescription({type:"offer", sdp:"remote"});
+ shouldNotThrow('pc.setRemoteDescription(sessionDescription, setDescriptionSucceeded, setDescriptionFailed);');
+ }
+
+ function setDescriptionFailed()
+ {
+ testFailed('setRemoteDescription failed.');
+
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function setDescriptionSucceeded()
+ {
+ testPassed('setRemoteDescription succeeded.');
+ shouldNotThrow('pc.createAnswer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}});');
+ }
+
</ins><span class="cx"> pc = new webkitRTCPeerConnection({iceServers:[]});
</span><del>- pc.createOffer(requestSucceeded1, requestFailed1);
</del><ins>+ shouldNotThrow('pc.createAnswer(requestSucceeded1, requestFailed1);');
</ins><span class="cx">
</span><span class="cx"> window.jsTestIsAsync = true;
</span><span class="cx"> window.successfullyParsed = true;
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateOfferexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt (160435 => 160436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt 2013-12-11 16:40:43 UTC (rev 160435)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt 2013-12-11 16:43:08 UTC (rev 160436)
</span><span class="lines">@@ -3,10 +3,15 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS requestSucceeded was called.
</del><ins>+PASS pc.createOffer(requestSucceeded1, requestFailed1, {mandatory:{"succeed":true}}); did not throw exception.
+PASS createOffer request succeeded.
</ins><span class="cx"> PASS sessionDescription.type is "offer"
</span><del>-PASS requestFailed was called.
</del><ins>+PASS pc.createOffer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}}); did not throw exception.
+PASS createOffer request failed.
</ins><span class="cx"> PASS errorReason is "TEST_ERROR"
</span><ins>+PASS pc.createOffer(requestSucceeded3, requestFailed1); did not throw exception.
+PASS createOffer request succeeded.
+PASS sessionDescription.type is "offer"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateOfferhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html (160435 => 160436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html 2013-12-11 16:40:43 UTC (rev 160435)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html 2013-12-11 16:43:08 UTC (rev 160436)
</span><span class="lines">@@ -9,40 +9,49 @@
</span><span class="cx">
</span><span class="cx"> var pc = null;
</span><span class="cx">
</span><ins>+ function requestSucceeded3(sd)
+ {
+ testPassed('createOffer request succeeded.');
+
+ sessionDescription = sd;
+ shouldBe('sessionDescription.type', '"offer"');
+ finishJSTest();
+ }
+
</ins><span class="cx"> function requestFailed2(reason)
</span><span class="cx"> {
</span><del>- testPassed('requestFailed was called.');
</del><ins>+ testPassed('createOffer request failed.');
</ins><span class="cx">
</span><span class="cx"> errorReason = reason;
</span><span class="cx"> shouldBe('errorReason', '"TEST_ERROR"');
</span><span class="cx">
</span><del>- finishJSTest();
</del><ins>+ shouldNotThrow('pc.createOffer(requestSucceeded3, requestFailed1);');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function requestSucceeded2(sd)
</span><span class="cx"> {
</span><del>- testFailed('requestSucceeded was called.');
</del><ins>+ testFailed('createOffer request succeeded.');
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function requestFailed1()
</span><span class="cx"> {
</span><del>- testFailed('requestFailed was called.');
</del><ins>+ testFailed('createOffer request failed.');
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function requestSucceeded1(sd)
</span><span class="cx"> {
</span><del>- testPassed('requestSucceeded was called.');
</del><ins>+ testPassed('createOffer request succeeded.');
</ins><span class="cx">
</span><span class="cx"> sessionDescription = sd;
</span><span class="cx"> shouldBe('sessionDescription.type', '"offer"');
</span><span class="cx">
</span><del>- pc.createOffer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}});
</del><ins>+ shouldNotThrow('pc.createOffer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}});');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pc = new webkitRTCPeerConnection({iceServers:[]});
</span><del>- pc.createOffer(requestSucceeded1, requestFailed1, {mandatory:{"succeed":true}});
</del><ins>+ shouldNotThrow('pc.createOffer(requestSucceeded1, requestFailed1, {mandatory:{"succeed":true}});');
</ins><span class="cx">
</span><span class="cx"> window.jsTestIsAsync = true;
</span><span class="cx"> window.successfullyParsed = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160435 => 160436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-11 16:40:43 UTC (rev 160435)
+++ trunk/Source/WebCore/ChangeLog 2013-12-11 16:43:08 UTC (rev 160436)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-11 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ Improving createOffer and createAnswer LayoutTests
+ https://bugs.webkit.org/show_bug.cgi?id=125568
+
+ 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.
+
+ Existing tests were updated.
+
+ * platform/mock/RTCPeerConnectionHandlerMock.cpp:
+ (WebCore::RTCPeerConnectionHandlerMock::createOffer):
+
</ins><span class="cx"> 2013-12-11 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Fix build with CONTEXT_MENUS flag set OFF
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp (160435 => 160436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2013-12-11 16:40:43 UTC (rev 160435)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2013-12-11 16:43:08 UTC (rev 160436)
</span><span class="lines">@@ -66,10 +66,10 @@
</span><span class="cx"> {
</span><span class="cx"> String succeedValue;
</span><span class="cx"> RefPtr<SessionRequestNotifier> notifier;
</span><del>- if (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "true")
</del><ins>+ if (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "false")
+ notifier = adoptRef(new SessionRequestNotifier(request, 0));
+ else
</ins><span class="cx"> notifier = adoptRef(new SessionRequestNotifier(request, RTCSessionDescriptionDescriptor::create("offer", "local")));
</span><del>- else
- notifier = adoptRef(new SessionRequestNotifier(request, 0));
</del><span class="cx">
</span><span class="cx"> m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
</span><span class="cx"> }
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> RefPtr<SessionRequestNotifier> notifier;
</span><span class="cx"> // We can only create an answer if we have already had an offer and the remote session description is stored.
</span><span class="cx"> String succeedValue;
</span><del>- if (!m_remoteSessionDescription.get() || (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "false"))
</del><ins>+ if (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "false")
</ins><span class="cx"> notifier = adoptRef(new SessionRequestNotifier(request, 0));
</span><span class="cx"> else
</span><span class="cx"> notifier = adoptRef(new SessionRequestNotifier(request, RTCSessionDescriptionDescriptor::create("answer", "local")));
</span></span></pre>
</div>
</div>
</body>
</html>