From d90d77bb3315c2919360a1be7a31bc7e5b6c6931 Mon Sep 17 00:00:00 2001
From: Martin Thomson <martin.thomson@gmail.com>
Date: Mon, 28 Sep 2015 11:25:04 -0700
Subject: [PATCH] Bug 1155923 - Updating webplatform-tests, r=jib

--HG--
extra : transplant_source : %9E%968%DC%AD%1F%DF%DB%3A%9C%1A%0F%E1%85%CFa%09oW%F0
---
 .../meta/webrtc/promises-call.html.ini        |   5 -
 .../rtcpeerconnection-idl.html.ini            | 145 +++++++++++++++++-
 .../tests/webrtc/datachannel-emptystring.html |   5 -
 .../tests/webrtc/no-media-call.html           |   6 -
 .../tests/webrtc/promises-call.html           |   5 -
 .../rtcpeerconnection-idl.html                |  43 +++---
 .../web-platform/tests/webrtc/simplecall.html |   5 +-
 7 files changed, 168 insertions(+), 46 deletions(-)
 delete mode 100644 testing/web-platform/meta/webrtc/promises-call.html.ini

diff --git a/testing/web-platform/meta/webrtc/promises-call.html.ini b/testing/web-platform/meta/webrtc/promises-call.html.ini
deleted file mode 100644
index 4337d37c515d..000000000000
--- a/testing/web-platform/meta/webrtc/promises-call.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[promises-call.html]
-  type: testharness
-  [Can set up a basic WebRTC call with only data using promises.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html.ini b/testing/web-platform/meta/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html.ini
index 8e2c152b4dbc..f2f381b203f2 100644
--- a/testing/web-platform/meta/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html.ini
+++ b/testing/web-platform/meta/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html.ini
@@ -1,6 +1,149 @@
 [rtcpeerconnection-idl.html]
   type: testharness
-  expected: ERROR
+  [RTCPeerConnection interface: operation createOffer(RTCOfferOptions)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation setLocalDescription(RTCSessionDescription)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation setRemoteDescription(RTCSessionDescription)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation addIceCandidate(RTCIceCandidate)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute canTrickleIceCandidates]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute onicegatheringstatechange]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation createOffer(RTCSessionDescriptionCallback,RTCPeerConnectionErrorCallback,RTCOfferOptions)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation setLocalDescription(RTCSessionDescription,VoidFunction,RTCPeerConnectionErrorCallback)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation createAnswer(RTCSessionDescriptionCallback,RTCPeerConnectionErrorCallback)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation setRemoteDescription(RTCSessionDescription,VoidFunction,RTCPeerConnectionErrorCallback)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation addIceCandidate(RTCIceCandidate,VoidFunction,RTCPeerConnectionErrorCallback)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation addTrack(MediaStreamTrack,MediaStream)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute ontrack]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation getStats(MediaStreamTrack,RTCStatsCallback,RTCPeerConnectionErrorCallback)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation getIdentityAssertion()]
+    expected: FAIL
+
+  [RTCPeerConnection interface: calling setLocalDescription(RTCSessionDescription) on pc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCPeerConnection interface: calling setRemoteDescription(RTCSessionDescription) on pc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCPeerConnection interface: calling addIceCandidate(RTCIceCandidate) on pc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCPeerConnection interface: calling setLocalDescription(RTCSessionDescription,VoidFunction,RTCPeerConnectionErrorCallback) on pc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCPeerConnection interface: calling setRemoteDescription(RTCSessionDescription,VoidFunction,RTCPeerConnectionErrorCallback) on pc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCPeerConnection interface: calling addIceCandidate(RTCIceCandidate,VoidFunction,RTCPeerConnectionErrorCallback) on pc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation createAnswer(RTCAnswerOptions)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute currentLocalDescription]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute pendingLocalDescription]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute currentRemoteDescription]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute pendingRemoteDescription]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation setConfiguration(RTCConfiguration)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute dtmf]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation getStats(MediaStreamTrack)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "currentLocalDescription" with the proper type (4)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "pendingLocalDescription" with the proper type (5)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "currentRemoteDescription" with the proper type (8)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "pendingRemoteDescription" with the proper type (9)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "signalingState" with the proper type (11)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "iceGatheringState" with the proper type (12)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "iceConnectionState" with the proper type (13)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "canTrickleIceCandidates" with the proper type (14)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "setConfiguration" with the proper type (16)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: calling setConfiguration(RTCConfiguration) on pc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "onnegotiationneeded" with the proper type (18)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "onicecandidate" with the proper type (19)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "onsignalingstatechange" with the proper type (20)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "oniceconnectionstatechange" with the proper type (21)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "onicegatheringstatechange" with the proper type (22)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "ontrack" with the proper type (34)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "ondatachannel" with the proper type (36)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "dtmf" with the proper type (37)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: pc must inherit property "peerIdentity" with the proper type (41)]
+    expected: FAIL
+
   [RTCPeerConnection interface: existence and properties of interface object]
     expected: FAIL
 
diff --git a/testing/web-platform/tests/webrtc/datachannel-emptystring.html b/testing/web-platform/tests/webrtc/datachannel-emptystring.html
index 057b0eaee82b..9cd32a3bca13 100644
--- a/testing/web-platform/tests/webrtc/datachannel-emptystring.html
+++ b/testing/web-platform/tests/webrtc/datachannel-emptystring.html
@@ -17,11 +17,6 @@ and ensures that an empty string sent by one is received by the second.
   <!-- These files are in place when executing on W3C. -->
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="/common/vendor-prefix.js"
-          data-prefixed-objects=
-              '[{"ancestors":["window"], "name":"RTCPeerConnection"}]'
-    >
-  </script>
   <script type="text/javascript">
   var test = async_test('Can send empty strings across a WebRTC data channel.');
 
diff --git a/testing/web-platform/tests/webrtc/no-media-call.html b/testing/web-platform/tests/webrtc/no-media-call.html
index f3eeeb8a99aa..5059ba6dbc46 100644
--- a/testing/web-platform/tests/webrtc/no-media-call.html
+++ b/testing/web-platform/tests/webrtc/no-media-call.html
@@ -17,12 +17,6 @@ This test uses the legacy callback API with no media, and thus does not require
   <!-- These files are in place when executing on W3C. -->
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="/common/vendor-prefix.js"
-          data-prefixed-objects=
-              '[{"ancestors":["window"], "name":"RTCPeerConnection"},
-                {"ancestors":["window"], "name":"RTCSessionDescription"}]'
-    >
-  </script>
   <script type="text/javascript">
   var test = async_test('Can set up a basic WebRTC call with no data.');
 
diff --git a/testing/web-platform/tests/webrtc/promises-call.html b/testing/web-platform/tests/webrtc/promises-call.html
index fc7fb03cd7e5..d83508a38ae4 100644
--- a/testing/web-platform/tests/webrtc/promises-call.html
+++ b/testing/web-platform/tests/webrtc/promises-call.html
@@ -17,11 +17,6 @@ This test uses data only, and thus does not require fake media devices.
   <!-- These files are in place when executing on W3C. -->
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="/common/vendor-prefix.js"
-          data-prefixed-objects=
-              '[{"ancestors":["window"], "name":"RTCPeerConnection"}]'
-    >
-  </script>
   <script type="text/javascript">
   var test = async_test('Can set up a basic WebRTC call with only data using promises.');
 
diff --git a/testing/web-platform/tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html b/testing/web-platform/tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html
index 286d8b1fd0e0..0d4ff6063304 100644
--- a/testing/web-platform/tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html
+++ b/testing/web-platform/tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html
@@ -14,32 +14,33 @@
 <div id='log'></div>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
-<script src="/common/vendor-prefix.js"
-          data-prefixed-objects=
-              '[{"ancestors":["window"], "name":"RTCPeerConnection"},
-                {"ancestors":["window"], "name":"RTCSessionDescription"},
-                {"ancestors":["window"], "name":"RTCIceCandidate"}]'>
-</script>
 <script src=/resources/WebIDLParser.js></script>
 <script src=/resources/idlharness.js></script>
 
-<!-- The IDL is copied from the 06 March 2015 editors' draft. -->
+<!-- The IDL is copied from the 22 September 2015 editors' draft. -->
 <script type="text/plain">
-[ Constructor (RTCConfiguration configuration)]
+interface EventTarget {
+    // Only a dummy definition is needed here.
+};
+[ Constructor (optional RTCConfiguration configuration)]
 interface RTCPeerConnection : EventTarget  {
     Promise<RTCSessionDescription> createOffer (optional RTCOfferOptions options);
-    Promise<RTCSessionDescription> createAnswer ();
+    Promise<RTCSessionDescription> createAnswer (optional RTCAnswerOptions options);
     Promise<void>                  setLocalDescription (RTCSessionDescription description);
     readonly    attribute RTCSessionDescription? localDescription;
+    readonly    attribute RTCSessionDescription? currentLocalDescription;
+    readonly    attribute RTCSessionDescription? pendingLocalDescription;
     Promise<void>                  setRemoteDescription (RTCSessionDescription description);
     readonly    attribute RTCSessionDescription? remoteDescription;
-    readonly    attribute RTCSignalingState      signalingState;
-    void                           updateIce (RTCConfiguration configuration);
+    readonly    attribute RTCSessionDescription? currentRemoteDescription;
+    readonly    attribute RTCSessionDescription? pendingRemoteDescription;
     Promise<void>                  addIceCandidate (RTCIceCandidate candidate);
+    readonly    attribute RTCSignalingState      signalingState;
     readonly    attribute RTCIceGatheringState   iceGatheringState;
     readonly    attribute RTCIceConnectionState  iceConnectionState;
     readonly    attribute boolean?               canTrickleIceCandidates;
     RTCConfiguration               getConfiguration ();
+    void                           setConfiguration (RTCConfiguration configuration);
     void                           close ();
                 attribute EventHandler           onnegotiationneeded;
                 attribute EventHandler           onicecandidate;
@@ -54,6 +55,11 @@ partial interface RTCPeerConnection {
     void createAnswer (RTCSessionDescriptionCallback successCallback, RTCPeerConnectionErrorCallback failureCallback);
     void setRemoteDescription (RTCSessionDescription description, VoidFunction successCallback, RTCPeerConnectionErrorCallback failureCallback);
     void addIceCandidate (RTCIceCandidate candidate, VoidFunction successCallback, RTCPeerConnectionErrorCallback failureCallback);
+    void getStats (MediaStreamTrack? selector, RTCStatsCallback successCallback, RTCPeerConnectionErrorCallback failureCallback);
+};
+
+partial interface RTCPeerConnection {
+    static Promise<RTCCertificate> generateCertificate (AlgorithmIdentifier keygenAlgorithm);
 };
 
 partial interface RTCPeerConnection {
@@ -70,21 +76,18 @@ partial interface RTCPeerConnection {
 };
 
 partial interface RTCPeerConnection {
-    RTCDTMFSender createDTMFSender (MediaStreamTrack track);
+    readonly    attribute RTCDTMFSender? dtmf;
 };
 
 partial interface RTCPeerConnection {
-    void getStats (MediaStreamTrack? selector, RTCStatsCallback successCallback, RTCPeerConnectionErrorCallback failureCallback);
+    Promise<RTCStatsReport> getStats (optional MediaStreamTrack? selector);
 };
 
 partial interface RTCPeerConnection {
-    void setIdentityProvider (DOMString provider, optional DOMString protocol, optional DOMString username);
-    void getIdentityAssertion ();
-    readonly    attribute RTCIdentityAssertion? peerIdentity;
-                attribute EventHandler          onidentityresult;
-                attribute EventHandler          onpeeridentity;
-                attribute EventHandler          onidpassertionerror;
-                attribute EventHandler          onidpvalidationerror;
+    void               setIdentityProvider (DOMString provider, optional DOMString protocol, optional DOMString usernameHint);
+    Promise<DOMString> getIdentityAssertion ();
+    readonly    attribute Promise<RTCIdentityAssertion> peerIdentity;
+    readonly    attribute DOMString?                    idpLoginUrl;
 };
 
 </script>
diff --git a/testing/web-platform/tests/webrtc/simplecall.html b/testing/web-platform/tests/webrtc/simplecall.html
index 77583f9a5098..698586894091 100644
--- a/testing/web-platform/tests/webrtc/simplecall.html
+++ b/testing/web-platform/tests/webrtc/simplecall.html
@@ -24,10 +24,7 @@ instance --use-fake-device-for-media-stream for Chrome.
   <script src="/resources/testharnessreport.js"></script>
   <script src="/common/vendor-prefix.js"
           data-prefixed-objects=
-              '[{"ancestors":["navigator"], "name":"getUserMedia"},
-                {"ancestors":["window"], "name":"RTCPeerConnection"},
-                {"ancestors":["window"], "name":"RTCSessionDescription"},
-                {"ancestors":["window"], "name":"RTCIceCandidate"}]'
+              '[{"ancestors":["navigator"], "name":"getUserMedia"}]'
           data-prefixed-prototypes=
                '[{"ancestors":["HTMLMediaElement"],"name":"srcObject"}]'>
   </script>