Bug 123205 – Adding mock class to test RTCDataChannelHandler

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Thiago de Barros Lacerda]

Now RTCPeerConnectionHandler-datachannel LayouTest can run properly.
Also updated the expected file, removing the reliable property check (which was removed in the spec)

[Thiago de Barros Lacerda]

Created attachment 214955 [details]
Patch

[Eric Carlson]

Comment on attachment 214955 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=214955&action=review

> Source/WebCore/ChangeLog:11
> +        No new tests needed.

I would say "Existing tests updated" instead.

> Source/WebCore/ChangeLog:16
> +        * platform/mock/RTCDataChannelHandlerMock.cpp: Copied from Source/WebCore/platform/mock/RTCNotifiersMock.cpp.
> +        * platform/mock/RTCDataChannelHandlerMock.h: Copied from Source/WebCore/platform/mock/RTCNotifiersMock.h.

Are these "Copied from" comments correct?

> Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h:51
> +    String label() OVERRIDE { return m_label; }
> +    bool ordered() OVERRIDE { return m_ordered; }
> +    unsigned short maxRetransmitTime() OVERRIDE { return m_maxRetransmitTime; }
> +    unsigned short maxRetransmits() OVERRIDE { return m_maxRetransmits; }
> +    String protocol() OVERRIDE { return m_protocol; }
> +    bool negotiated() OVERRIDE { return m_negotiated; }
> +    unsigned short id() OVERRIDE { return m_id; }
> +    unsigned long bufferedAmount() OVERRIDE { return 0; }

These should all be virtual.

> Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h:66
> +    String m_label;
> +    bool m_ordered;
> +    unsigned short m_maxRetransmitTime;
> +    unsigned short m_maxRetransmits;
> +    String m_protocol;
> +    bool m_negotiated;
> +    unsigned short m_id;

Nit: it may be slightly more space efficient to have the "short" and "bool" members last.

[Thiago de Barros Lacerda]

(In reply to comment #2)
> (From update of attachment 214955 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=214955&action=review
> 
> > Source/WebCore/ChangeLog:11
> > +        No new tests needed.
> 
> I would say "Existing tests updated" instead.
> 
> > Source/WebCore/ChangeLog:16
> > +        * platform/mock/RTCDataChannelHandlerMock.cpp: Copied from Source/WebCore/platform/mock/RTCNotifiersMock.cpp.
> > +        * platform/mock/RTCDataChannelHandlerMock.h: Copied from Source/WebCore/platform/mock/RTCNotifiersMock.h.
> 
> Are these "Copied from" comments correct?

Git thinks that I copied them, maybe because of its similarity check. But I didn't not copy. Should I remove them?
> 
> > Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h:51
> > +    String label() OVERRIDE { return m_label; }
> > +    bool ordered() OVERRIDE { return m_ordered; }
> > +    unsigned short maxRetransmitTime() OVERRIDE { return m_maxRetransmitTime; }
> > +    unsigned short maxRetransmits() OVERRIDE { return m_maxRetransmits; }
> > +    String protocol() OVERRIDE { return m_protocol; }
> > +    bool negotiated() OVERRIDE { return m_negotiated; }
> > +    unsigned short id() OVERRIDE { return m_id; }
> > +    unsigned long bufferedAmount() OVERRIDE { return 0; }
> 
> These should all be virtual.

Why? The class is final, so no class can use it as superclass and override its methods.

> 
> > Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h:66
> > +    String m_label;
> > +    bool m_ordered;
> > +    unsigned short m_maxRetransmitTime;
> > +    unsigned short m_maxRetransmits;
> > +    String m_protocol;
> > +    bool m_negotiated;
> > +    unsigned short m_id;
> 
> Nit: it may be slightly more space efficient to have the "short" and "bool" members last.

OK

[Eric Carlson]

(In reply to comment #3)
> (In reply to comment #2)
> > (From update of attachment 214955 [details] [details])
> > View in context: https://bugs.webkit.org/attachment.cgi?id=214955&action=review
> > 
> > > Source/WebCore/ChangeLog:11
> > > +        No new tests needed.
> > 
> > I would say "Existing tests updated" instead.
> > 
> > > Source/WebCore/ChangeLog:16
> > > +        * platform/mock/RTCDataChannelHandlerMock.cpp: Copied from Source/WebCore/platform/mock/RTCNotifiersMock.cpp.
> > > +        * platform/mock/RTCDataChannelHandlerMock.h: Copied from Source/WebCore/platform/mock/RTCNotifiersMock.h.
> > 
> > Are these "Copied from" comments correct?
> 
> Git thinks that I copied them, maybe because of its similarity check. But I didn't not copy. Should I remove them?
> > 

  I would remove the comments because they are incorrect.

> > > Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h:51
> > > +    String label() OVERRIDE { return m_label; }
> > > +    bool ordered() OVERRIDE { return m_ordered; }
> > > +    unsigned short maxRetransmitTime() OVERRIDE { return m_maxRetransmitTime; }
> > > +    unsigned short maxRetransmits() OVERRIDE { return m_maxRetransmits; }
> > > +    String protocol() OVERRIDE { return m_protocol; }
> > > +    bool negotiated() OVERRIDE { return m_negotiated; }
> > > +    unsigned short id() OVERRIDE { return m_id; }
> > > +    unsigned long bufferedAmount() OVERRIDE { return 0; }
> > 
> > These should all be virtual.
> 
> Why? The class is final, so no class can use it as superclass and override its methods.
> 

  Oops :-O

[Thiago de Barros Lacerda]

(In reply to comment #4)
> (In reply to comment #3)
> > (In reply to comment #2)
> > > (From update of attachment 214955 [details] [details] [details])
> > > View in context: https://bugs.webkit.org/attachment.cgi?id=214955&action=review
> > > 
> > > > Source/WebCore/ChangeLog:11
> > > > +        No new tests needed.
> > > 
> > > I would say "Existing tests updated" instead.
> > > 
> > > > Source/WebCore/ChangeLog:16
> > > > +        * platform/mock/RTCDataChannelHandlerMock.cpp: Copied from Source/WebCore/platform/mock/RTCNotifiersMock.cpp.
> > > > +        * platform/mock/RTCDataChannelHandlerMock.h: Copied from Source/WebCore/platform/mock/RTCNotifiersMock.h.
> > > 
> > > Are these "Copied from" comments correct?
> > 
> > Git thinks that I copied them, maybe because of its similarity check. But I didn't not copy. Should I remove them?
> > > 
> 
>   I would remove the comments because they are incorrect.
> 
> > > > Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h:51
> > > > +    String label() OVERRIDE { return m_label; }
> > > > +    bool ordered() OVERRIDE { return m_ordered; }
> > > > +    unsigned short maxRetransmitTime() OVERRIDE { return m_maxRetransmitTime; }
> > > > +    unsigned short maxRetransmits() OVERRIDE { return m_maxRetransmits; }
> > > > +    String protocol() OVERRIDE { return m_protocol; }
> > > > +    bool negotiated() OVERRIDE { return m_negotiated; }
> > > > +    unsigned short id() OVERRIDE { return m_id; }
> > > > +    unsigned long bufferedAmount() OVERRIDE { return 0; }
> > > 
> > > These should all be virtual.
> > 
> > Why? The class is final, so no class can use it as superclass and override its methods.
> > 
> 
>   Oops :-O

By looking at the webkit source, I could notice that they put the virtual keyword anyway, maybe is it a style? Should I add virtual?

[Eric Carlson]

(In reply to comment #5)
> By looking at the webkit source, I could notice that they put the virtual keyword anyway, maybe is it a style? Should I add virtual?

I think so. It is slightly pedantic, but I think it makes it more obvious and it what is typically done in WebKit.

[Thiago de Barros Lacerda]

(In reply to comment #6)
> (In reply to comment #5)
> > By looking at the webkit source, I could notice that they put the virtual keyword anyway, maybe is it a style? Should I add virtual?
> 
> I think so. It is slightly pedantic, but I think it makes it more obvious and it what is typically done in WebKit.

np :)

[Thiago de Barros Lacerda]

Created attachment 214998 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 214998 [details]
Patch

Clearing flags on attachment: 214998

Committed r157892: <http://trac.webkit.org/changeset/157892>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.