Unexport RTC State, Type and Policy structures

Modify RTCSdpType to protect newRTCSdpType Modify RTCPriorityType to protect methods Modify RTCSctpTransportState to protect methods Modify RTCRtcpMuxPolicy to protect methods Modify RTCPeerConnectionState to protect methods Modify RTCIceTransportPolicy to protect methods Modify RTCIceGatheringState to protect methods Modify RTCIceCredentialType to protect methods Modify RTCIceConnectionState to protect methods Modify RTCDtlsTransportState to protect methods Modify RTCDataChannelState to protect methods Modify RTCBundlePolicy to protect methods Relates to #83
pion · Sep 14, 2018 · ffbf0aa · ffbf0aa
1 parent 9a1a1f9
commit ffbf0aa
Show file tree

Hide file tree

Showing 26 changed files with 71 additions and 70 deletions.
diff --git a/rtcbundlepolicy.go b/rtcbundlepolicy.go
@@ -31,9 +31,7 @@ const (
 	rtcBundlePolicyMaxBundleStr = "max-bundle"
 )
 
-// NewRTCBundlePolicy defines a procedure for creating a new RTCBundlePolicy
-// from a raw string naming the bundle policy.
-func NewRTCBundlePolicy(raw string) RTCBundlePolicy {
+func newRTCBundlePolicy(raw string) RTCBundlePolicy {
 	switch raw {
 	case rtcBundlePolicyBalancedStr:
 		return RTCBundlePolicyBalanced

diff --git a/rtcbundlepolicy_test.go b/rtcbundlepolicy_test.go
@@ -19,8 +19,8 @@ func TestNewRTCBundlePolicy(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			NewRTCBundlePolicy(testCase.policyString),
 			testCase.expectedPolicy,
+			newRTCBundlePolicy(testCase.policyString),
 			"testCase: %d %v", i, testCase,
 		)
 	}
@@ -39,8 +39,8 @@ func TestRTCBundlePolicy_String(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			testCase.policy.String(),
 			testCase.expectedString,
+			testCase.policy.String(),
 			"testCase: %d %v", i, testCase,
 		)
 	}

diff --git a/rtcdatachannelstate.go b/rtcdatachannelstate.go
@@ -30,9 +30,7 @@ const (
 	rtcDataChannelStateClosedStr     = "closed"
 )
 
-// NewRTCDataChannelState defines a procedure for creating a new
-// RTCDataChannelState from a raw string naming the data chanenel state.
-func NewRTCDataChannelState(raw string) RTCDataChannelState {
+func newRTCDataChannelState(raw string) RTCDataChannelState {
 	switch raw {
 	case rtcDataChannelStateConnectingStr:
 		return RTCDataChannelStateConnecting

diff --git a/rtcdatachannelstate_test.go b/rtcdatachannelstate_test.go
@@ -20,8 +20,8 @@ func TestNewRTCDataChannelState(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			NewRTCDataChannelState(testCase.stateString),
 			testCase.expectedState,
+			newRTCDataChannelState(testCase.stateString),
 			"testCase: %d %v", i, testCase,
 		)
 	}
@@ -41,8 +41,8 @@ func TestRTCDataChannelState_String(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			testCase.state.String(),
 			testCase.expectedString,
+			testCase.state.String(),
 			"testCase: %d %v", i, testCase,
 		)
 	}

diff --git a/rtcdtlstransportstate.go b/rtcdtlstransportstate.go
@@ -36,9 +36,7 @@ const (
 	rtcDtlsTransportStateFailedStr     = "failed"
 )
 
-// NewRTCDtlsTransportState defines a procedure for creating a new
-// RTCDtlsTransportState from a raw string naming the transport state.
-func NewRTCDtlsTransportState(raw string) RTCDtlsTransportState {
+func newRTCDtlsTransportState(raw string) RTCDtlsTransportState {
 	switch raw {
 	case rtcDtlsTransportStateNewStr:
 		return RTCDtlsTransportStateNew

diff --git a/rtcdtlstransportstate_test.go b/rtcdtlstransportstate_test.go
@@ -21,8 +21,8 @@ func TestNewRTCDtlsTransportState(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			NewRTCDtlsTransportState(testCase.stateString),
 			testCase.expectedState,
+			newRTCDtlsTransportState(testCase.stateString),
 			"testCase: %d %v", i, testCase,
 		)
 	}
@@ -43,8 +43,8 @@ func TestRTCDtlsTransportState_String(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			testCase.state.String(),
 			testCase.expectedString,
+			testCase.state.String(),
 			"testCase: %d %v", i, testCase,
 		)
 	}

diff --git a/rtciceconnectionstate.go b/rtciceconnectionstate.go
@@ -50,9 +50,7 @@ const (
 	rtcIceConnectionStateClosedStr       = "closed"
 )
 
-// NewRTCIceConnectionState defines a procedure for creating a new
-// RTCIceConnectionState from a raw string naming the signaling state.
-func NewRTCIceConnectionState(raw string) RTCIceConnectionState {
+func newRTCIceConnectionState(raw string) RTCIceConnectionState {
 	switch raw {
 	case rtcIceConnectionStateNewStr:
 		return RTCIceConnectionStateNew

diff --git a/rtciceconnectionstate_test.go b/rtciceconnectionstate_test.go
@@ -23,8 +23,8 @@ func TestNewRTCIceConnectionState(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			NewRTCIceConnectionState(testCase.stateString),
 			testCase.expectedState,
+			newRTCIceConnectionState(testCase.stateString),
 			"testCase: %d %v", i, testCase,
 		)
 	}
@@ -47,8 +47,8 @@ func TestRTCIceConnectionState_String(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			testCase.state.String(),
 			testCase.expectedString,
+			testCase.state.String(),
 			"testCase: %d %v", i, testCase,
 		)
 	}

diff --git a/rtcicecredentialtype.go b/rtcicecredentialtype.go
@@ -20,9 +20,7 @@ const (
 	rtcIceCredentialTypeOauthStr    = "oauth"
 )
 
-// NewRTCIceCredentialType defines a procedure for creating a new
-// RTCIceCredentialType from a raw string naming the ice credential type.
-func NewRTCIceCredentialType(raw string) RTCIceCredentialType {
+func newRTCIceCredentialType(raw string) RTCIceCredentialType {
 	switch raw {
 	case rtcIceCredentialTypePasswordStr:
 		return RTCIceCredentialTypePassword

diff --git a/rtcicecredentialtype_test.go b/rtcicecredentialtype_test.go
@@ -18,8 +18,8 @@ func TestNewRTCIceCredentialType(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			NewRTCIceCredentialType(testCase.credentialTypeString),
 			testCase.expectedCredentialType,
+			newRTCIceCredentialType(testCase.credentialTypeString),
 			"testCase: %d %v", i, testCase,
 		)
 	}
@@ -37,8 +37,8 @@ func TestRTCIceCredentialType_String(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			testCase.credentialType.String(),
 			testCase.expectedString,
+			testCase.credentialType.String(),
 			"testCase: %d %v", i, testCase,
 		)
 	}

diff --git a/rtcicegatheringstate.go b/rtcicegatheringstate.go
@@ -25,9 +25,7 @@ const (
 	rtcIceGatheringStateCompleteStr  = "complete"
 )
 
-// NewRTCIceGatheringState defines a procedure for creating a new
-// RTCIceGatheringState from a raw string naming the gathering state.
-func NewRTCIceGatheringState(raw string) RTCIceGatheringState {
+func newRTCIceGatheringState(raw string) RTCIceGatheringState {
 	switch raw {
 	case rtcIceGatheringStateNewStr:
 		return RTCIceGatheringStateNew

diff --git a/rtcicegatheringstate_test.go b/rtcicegatheringstate_test.go
@@ -19,8 +19,8 @@ func TestNewRTCIceGatheringState(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			NewRTCIceGatheringState(testCase.stateString),
 			testCase.expectedState,
+			newRTCIceGatheringState(testCase.stateString),
 			"testCase: %d %v", i, testCase,
 		)
 	}
@@ -39,8 +39,8 @@ func TestRTCIceGatheringState_String(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			testCase.state.String(),
 			testCase.expectedString,
+			testCase.state.String(),
 			"testCase: %d %v", i, testCase,
 		)
 	}

diff --git a/rtcicetransportpolicy.go b/rtcicetransportpolicy.go
@@ -19,9 +19,7 @@ const (
 	rtcIceTransportPolicyAllStr   = "all"
 )
 
-// NewRTCIceTransportPolicy defines a procedure for creating a new
-// RTCIceTransportPolicy from a raw string naming the ice transport policy.
-func NewRTCIceTransportPolicy(raw string) RTCIceTransportPolicy {
+func newRTCIceTransportPolicy(raw string) RTCIceTransportPolicy {
 	switch raw {
 	case rtcIceTransportPolicyRelayStr:
 		return RTCIceTransportPolicyRelay

diff --git a/rtcicetransportpolicy_test.go b/rtcicetransportpolicy_test.go
@@ -18,8 +18,8 @@ func TestNewRTCIceTransportPolicy(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			NewRTCIceTransportPolicy(testCase.policyString),
 			testCase.expectedPolicy,
+			newRTCIceTransportPolicy(testCase.policyString),
 			"testCase: %d %v", i, testCase,
 		)
 	}
@@ -37,8 +37,8 @@ func TestRTCIceTransportPolicy_String(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			testCase.policy.String(),
 			testCase.expectedString,
+			testCase.policy.String(),
 			"testCase: %d %v", i, testCase,
 		)
 	}

diff --git a/rtcpeerconnectionstate.go b/rtcpeerconnectionstate.go
@@ -44,9 +44,7 @@ const (
 	rtcPeerConnectionStateClosedStr       = "closed"
 )
 
-// NewRTCPeerConnectionState defines a procedure for creating a new
-// RTCPeerConnectionState from a raw string naming the peer connection state.
-func NewRTCPeerConnectionState(raw string) RTCPeerConnectionState {
+func newRTCPeerConnectionState(raw string) RTCPeerConnectionState {
 	switch raw {
 	case rtcPeerConnectionStateNewStr:
 		return RTCPeerConnectionStateNew

diff --git a/rtcpeerconnectionstate_test.go b/rtcpeerconnectionstate_test.go
@@ -22,8 +22,8 @@ func TestNewRTCPeerConnectionState(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			NewRTCPeerConnectionState(testCase.stateString),
 			testCase.expectedState,
+			newRTCPeerConnectionState(testCase.stateString),
 			"testCase: %d %v", i, testCase,
 		)
 	}
@@ -45,8 +45,8 @@ func TestRTCPeerConnectionState_String(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			testCase.state.String(),
 			testCase.expectedString,
+			testCase.state.String(),
 			"testCase: %d %v", i, testCase,
 		)
 	}

diff --git a/rtcprioritytype.go b/rtcprioritytype.go
@@ -25,9 +25,7 @@ const (
 	rtcPriorityTypeHighStr    = "high"
 )
 
-// NewRTCPriorityType defines a procedure for creating a new RTCPriorityType
-// from a raw string naming the priority type.
-func NewRTCPriorityType(raw string) RTCPriorityType {
+func newRTCPriorityTypeFromString(raw string) RTCPriorityType {
 	switch raw {
 	case rtcPriorityTypeVeryLowStr:
 		return RTCPriorityTypeVeryLow
@@ -42,6 +40,21 @@ func NewRTCPriorityType(raw string) RTCPriorityType {
 	}
 }
 
+func newRTCPriorityTypeFromUint16(raw uint16) RTCPriorityType {
+	switch {
+	case raw <= 128:
+		return RTCPriorityTypeVeryLow
+	case 129 <= raw && raw <= 256:
+		return RTCPriorityTypeLow
+	case 257 <= raw && raw <= 512:
+		return RTCPriorityTypeMedium
+	case 513 <= raw:
+		return RTCPriorityTypeHigh
+	default:
+		return RTCPriorityType(Unknown)
+	}
+}
+
 func (p RTCPriorityType) String() string {
 	switch p {
 	case RTCPriorityTypeVeryLow:

diff --git a/rtcprioritytype_test.go b/rtcprioritytype_test.go
@@ -9,19 +9,31 @@ import (
 func TestNewRTCPriorityType(t *testing.T) {
 	testCases := []struct {
 		priorityString   string
+		priorityUint16   uint16
 		expectedPriority RTCPriorityType
 	}{
-		{"unknown", RTCPriorityType(Unknown)},
-		{"very-low", RTCPriorityTypeVeryLow},
-		{"low", RTCPriorityTypeLow},
-		{"medium", RTCPriorityTypeMedium},
-		{"high", RTCPriorityTypeHigh},
+		{"unknown", 0, RTCPriorityType(Unknown)},
+		{"very-low", 100, RTCPriorityTypeVeryLow},
+		{"low", 200, RTCPriorityTypeLow},
+		{"medium", 300, RTCPriorityTypeMedium},
+		{"high", 1000, RTCPriorityTypeHigh},
 	}
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			NewRTCPriorityType(testCase.priorityString),
 			testCase.expectedPriority,
+			newRTCPriorityTypeFromString(testCase.priorityString),
+			"testCase: %d %v", i, testCase,
+		)
+
+		// There is no uint that produces generate RTCPriorityType(Unknown).
+		if i == 0 {
+			continue
+		}
+
+		assert.Equal(t,
+			testCase.expectedPriority,
+			newRTCPriorityTypeFromUint16(testCase.priorityUint16),
 			"testCase: %d %v", i, testCase,
 		)
 	}
@@ -41,8 +53,8 @@ func TestRTCPriorityType_String(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			testCase.priority.String(),
 			testCase.expectedString,
+			testCase.priority.String(),
 			"testCase: %d %v", i, testCase,
 		)
 	}

diff --git a/rtcrtcpmuxpolicy.go b/rtcrtcpmuxpolicy.go
@@ -23,9 +23,7 @@ const (
 	rtcRtcpMuxPolicyRequireStr   = "require"
 )
 
-// NewRTCRtcpMuxPolicy defines a procedure for creating a new RTCRtcpMuxPolicy
-// from a raw string naming the rtcp multiplexing policy.
-func NewRTCRtcpMuxPolicy(raw string) RTCRtcpMuxPolicy {
+func newRTCRtcpMuxPolicy(raw string) RTCRtcpMuxPolicy {
 	switch raw {
 	case rtcRtcpMuxPolicyNegotiateStr:
 		return RTCRtcpMuxPolicyNegotiate

diff --git a/rtcrtcpmuxpolicy_test.go b/rtcrtcpmuxpolicy_test.go
@@ -18,8 +18,8 @@ func TestNewRTCRtcpMuxPolicy(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			NewRTCRtcpMuxPolicy(testCase.policyString),
 			testCase.expectedPolicy,
+			newRTCRtcpMuxPolicy(testCase.policyString),
 			"testCase: %d %v", i, testCase,
 		)
 	}
@@ -37,8 +37,8 @@ func TestRTCRtcpMuxPolicy_String(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			testCase.policy.String(),
 			testCase.expectedString,
+			testCase.policy.String(),
 			"testCase: %d %v", i, testCase,
 		)
 	}

diff --git a/rtcsctptransportstate.go b/rtcsctptransportstate.go
@@ -27,9 +27,7 @@ const (
 	rtcSctpTransportStateClosedStr     = "closed"
 )
 
-// NewRTCSctpTransportState defines a procedure for creating a new
-// RTCSctpTransportState from a raw string naming the transport state.
-func NewRTCSctpTransportState(raw string) RTCSctpTransportState {
+func newRTCSctpTransportState(raw string) RTCSctpTransportState {
 	switch raw {
 	case rtcSctpTransportStateConnectingStr:
 		return RTCSctpTransportStateConnecting

diff --git a/rtcsctptransportstate_test.go b/rtcsctptransportstate_test.go
@@ -19,8 +19,8 @@ func TestNewRTCSctpTransportState(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			NewRTCSctpTransportState(testCase.transportStateString),
 			testCase.expectedTransportState,
+			newRTCSctpTransportState(testCase.transportStateString),
 			"testCase: %d %v", i, testCase,
 		)
 	}
@@ -39,8 +39,8 @@ func TestRTCSctpTransportState_String(t *testing.T) {
 
 	for i, testCase := range testCases {
 		assert.Equal(t,
-			testCase.transportState.String(),
 			testCase.expectedString,
+			testCase.transportState.String(),
 			"testCase: %d %v", i, testCase,
 		)
 	}