summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJakub Adam <jakub.adam@ktknet.cz>2014-04-22 14:26:49 +0200
committerOlivier CrĂȘte <olivier.crete@collabora.com>2014-10-09 17:57:33 -0400
commit3cd69d66c849df4541cf0974c8429623dc103cbb (patch)
tree957aab1472c1ec9c90d443309fcb82ff51c742cd /tests
parent2cb3e163f153434b6e386d1fe80efcc6e70eb738 (diff)
downloadfarstream-3cd69d66c849df4541cf0974c8429623dc103cbb.tar.gz
Add ICE-TCP candidates
Also to the nice transmitter
Diffstat (limited to 'tests')
-rw-r--r--tests/check/transmitter/nice.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/tests/check/transmitter/nice.c b/tests/check/transmitter/nice.c
index a085996e..4b5c67e9 100644
--- a/tests/check/transmitter/nice.c
+++ b/tests/check/transmitter/nice.c
@@ -65,9 +65,8 @@ _new_local_candidate (FsStreamTransmitter *st, FsCandidate *candidate,
ts_fail_if (candidate == NULL, "Passed NULL candidate");
ts_fail_unless (candidate->ip != NULL, "Null IP in candidate");
- ts_fail_if (candidate->port == 0, "Candidate has port 0");
- ts_fail_unless (candidate->proto == FS_NETWORK_PROTOCOL_UDP,
- "Protocol is not UDP");
+ ts_fail_if (candidate->port == 0 &&
+ candidate->proto != FS_NETWORK_PROTOCOL_TCP_ACTIVE);
ts_fail_if (candidate->foundation == NULL,
"Candidate doenst have a foundation");
ts_fail_if (candidate->component_id == 0, "Component id is 0");
@@ -125,6 +124,8 @@ set_the_candidates (gpointer user_data)
next = g_list_next (item);
+ if (cand->proto != FS_NETWORK_PROTOCOL_UDP)
+ continue;
if (cand->type != FS_CANDIDATE_TYPE_HOST)
continue;
if (cand->component_id != 1)
@@ -702,18 +703,6 @@ GST_START_TEST (test_nicetransmitter_invalid_arguments)
error->domain == FS_ERROR &&
error->code == FS_ERROR_INVALID_ARGUMENTS);
g_clear_error (&error);
-
- /* invalid proto */
- g_value_take_boxed (&params[0].value, g_list_append (NULL,
- fs_candidate_new (NULL, 0, FS_CANDIDATE_TYPE_HOST,
- FS_NETWORK_PROTOCOL_TCP, "127.0.0.1", 0)));
-
- st = fs_transmitter_new_stream_transmitter (trans, p, 1, params, &error);
- ts_fail_unless (st == NULL);
- ts_fail_unless (error &&
- error->domain == FS_ERROR &&
- error->code == FS_ERROR_INVALID_ARGUMENTS);
- g_clear_error (&error);
g_value_unset (&params[0].value);
params[0].name = "relay-info";