Skip to content

Commit da41619

Browse files
michael-sandermichael-sander
committed
Updated tests:
 * testTokenExpireTimeDefault - expire_time is not expected in the xml response when the default time is used * testTokenExpireTimeNow - test was sometimes failing. now generates a token, waits a second and then verifies the ivalid expired token response * testP2PPreferenceEnabled, testP2PPreferenceDisabled - correct verbs are "enabled" and "disabled" Removed tests for depricated session properties: * multiplexer_numOutputStreams * multiplexer_switchType * multiplexer_switchTimeout * echoSuppression_enabled
1 parent cf9efab commit da41619

File tree

1 file changed

+16
-121
lines changed

1 file changed

+16
-121
lines changed

‎src/test/java/com/opentok/test/UnitTest.java

Lines changed: 16 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -62,98 +62,10 @@ public void testCreateSesionWithLocation() throws OpenTokException {
6262
String actual = xml.getElementValue("session_id", "Session");
6363
Assert.assertEquals("Java SDK tests: Session create with location failed", expected, actual);
6464
}
65-
66-
@Test
67-
public void testNumOutputStreams0() throws OpenTokException {
68-
int expected = 0;
69-
SessionProperties sp = new SessionProperties();
70-
sp.multiplexer_numOutputStreams = expected;
71-
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
72-
TokBoxXML xml = get_session_info(s.session_id);
73-
int actual = new Integer(xml.getElementValue("numOutputStreams", "multiplexer"));
74-
Assert.assertEquals("Java SDK tests: num output streams do not match", expected, actual);
75-
}
76-
77-
@Test
78-
public void testNumOutputStreams5() throws OpenTokException {
79-
int expected = 5;
80-
SessionProperties sp = new SessionProperties();
81-
sp.multiplexer_numOutputStreams = expected;
82-
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
83-
TokBoxXML xml = get_session_info(s.session_id);
84-
int actual = new Integer(xml.getElementValue("numOutputStreams", "multiplexer"));
85-
Assert.assertEquals("Java SDK tests: num output streams do not match", expected, actual);
86-
}
87-
88-
@Test
89-
public void testNumOutputStreams100() throws OpenTokException {
90-
int expected = 100;
91-
SessionProperties sp = new SessionProperties();
92-
sp.multiplexer_numOutputStreams = expected;
93-
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
94-
TokBoxXML xml = get_session_info(s.session_id);
95-
int actual = new Integer(xml.getElementValue("numOutputStreams", "multiplexer"));
96-
Assert.assertEquals("Java SDK tests: num output streams do not match", expected, actual);
97-
}
98-
99-
@Test
100-
public void testSwitchType0() throws OpenTokException {
101-
int expected = 0;
102-
SessionProperties sp = new SessionProperties();
103-
sp.multiplexer_switchType = expected;
104-
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
105-
TokBoxXML xml = get_session_info(s.session_id);
106-
int actual = new Integer(xml.getElementValue("switchType", "multiplexer"));
107-
Assert.assertEquals("Java SDK tests: switch type does not match", expected, actual);
108-
}
109-
110-
@Test
111-
public void testSwitchType1() throws OpenTokException {
112-
int expected = 1;
113-
SessionProperties sp = new SessionProperties();
114-
sp.multiplexer_switchType = expected;
115-
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
116-
TokBoxXML xml = get_session_info(s.session_id);
117-
int actual = new Integer(xml.getElementValue("switchType", "multiplexer"));
118-
Assert.assertEquals("Java SDK tests: switch type does not match", expected, actual);
119-
}
120-
121-
@Test
122-
public void testSwitchTimeout435() throws OpenTokException {
123-
int expected = 435;
124-
SessionProperties sp = new SessionProperties();
125-
sp.multiplexer_switchTimeout = expected;
126-
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
127-
TokBoxXML xml = get_session_info(s.session_id);
128-
int actual = new Integer(xml.getElementValue("switchTimeout", "multiplexer"));
129-
Assert.assertEquals("Java SDK tests: switch timeout does not match", expected, actual);
130-
}
131-
132-
@Test
133-
public void testSwitchTimeout2000() throws OpenTokException {
134-
int expected = 2000;
135-
SessionProperties sp = new SessionProperties();
136-
sp.multiplexer_switchTimeout = expected;
137-
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
138-
TokBoxXML xml = get_session_info(s.session_id);
139-
int actual = new Integer(xml.getElementValue("switchTimeout", "multiplexer"));
140-
Assert.assertEquals("Java SDK tests: switch timeout does not match", expected, actual);
141-
}
142-
143-
@Test
144-
public void testSwitchTimeout4350() throws OpenTokException {
145-
int expected = 4350;
146-
SessionProperties sp = new SessionProperties();
147-
sp.multiplexer_switchTimeout = expected;
148-
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
149-
TokBoxXML xml = get_session_info(s.session_id);
150-
int actual = new Integer(xml.getElementValue("switchTimeout", "multiplexer"));
151-
Assert.assertEquals("Java SDK tests: switch timeout does not match", expected, actual);
152-
}
15365

15466
@Test
15567
public void testP2PPreferenceEnable() throws OpenTokException {
156-
String expected = "enable";
68+
String expected = "enabled";
15769
SessionProperties sp = new SessionProperties();
15870
sp.p2p_preference = expected;
15971
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
@@ -164,7 +76,7 @@ public void testP2PPreferenceEnable() throws OpenTokException {
16476

16577
@Test
16678
public void testP2PPreferenceDisable() throws OpenTokException {
167-
String expected = "disable";
79+
String expected = "disabled";
16880
SessionProperties sp = new SessionProperties();
16981
sp.p2p_preference = expected;
17082
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
@@ -173,28 +85,6 @@ public void testP2PPreferenceDisable() throws OpenTokException {
17385
Assert.assertEquals("Java SDK tests: p2p not disabled", expected, actual);
17486
}
17587

176-
@Test
177-
public void testEchoSuppressionEnable() throws OpenTokException {
178-
String expected = "True";
179-
SessionProperties sp = new SessionProperties();
180-
sp.echoSuppression_enabled = new Boolean(expected);
181-
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
182-
TokBoxXML xml = get_session_info(s.session_id);
183-
String actual = xml.getElementValue("enabled", "echoSuppression");
184-
Assert.assertEquals("Java SDK tests: echoSuppression not set to true", expected, actual);
185-
}
186-
187-
@Test
188-
public void testEchoSuppressionDisable() throws OpenTokException {
189-
String expected = "False";
190-
SessionProperties sp = new SessionProperties();
191-
sp.echoSuppression_enabled = new Boolean(expected);
192-
OpenTokSession s = sdk.create_session("216.38.134.114", sp);
193-
TokBoxXML xml = get_session_info(s.session_id);
194-
String actual = xml.getElementValue("enabled", "echoSuppression");
195-
Assert.assertEquals("Java SDK tests: echoSuppression not set to false", expected, actual);
196-
}
197-
19888
@Test
19989
public void testRoleDefault() throws OpenTokException {
20090
String s= sdk.create_session().session_id;
@@ -309,20 +199,18 @@ public void testRoleNull() {
309199

310200
@Test
311201
public void testTokenExpireTimeDefault() throws OpenTokException {
312-
String expected = "";
313202
String s= sdk.create_session().session_id;
314203
String t = sdk.generate_token(s, RoleConstants.MODERATOR);
315204
TokBoxXML xml = get_token_info(t);
316-
String actual = xml.getElementValue("expire_time", "token").trim();
317-
Assert.assertEquals("Java SDK tests: expire time not set to expected time", expected, actual);
205+
Assert.assertFalse("Java SDK tests: expire_time should not exist for default", xml.hasElement("expire_time", "token"));
318206
}
319207

320208
@Test
321209
public void testTokenExpireTimePast() {
322210
OpenTokException expected = null;
323211
try {
324212
String s= sdk.create_session().session_id;
325-
sdk.generate_token(s, RoleConstants.MODERATOR, new Date().getTime() - 100);
213+
sdk.generate_token(s, RoleConstants.MODERATOR, new Date().getTime() / 1000 - 100);
326214
} catch (OpenTokException e) {
327215
expected = e;
328216
}
@@ -331,12 +219,19 @@ public void testTokenExpireTimePast() {
331219

332220
@Test
333221
public void testTokenExpireTimeNow() throws OpenTokException {
334-
long expected = new Date().getTime() / 1000;
335-
String s= sdk.create_session().session_id;
336-
String t = sdk.generate_token(s, RoleConstants.MODERATOR, expected);
222+
long expireTime = new Date().getTime() / 1000;
223+
String expected = "Token expired on " + expireTime;
224+
String s = sdk.create_session().session_id;
225+
String t = sdk.generate_token(s, RoleConstants.MODERATOR, expireTime);
226+
// Allow the token to expire.
227+
try {
228+
Thread.sleep(1000);
229+
} catch (InterruptedException e) {
230+
// do nothing
231+
}
337232
TokBoxXML xml = get_token_info(t);
338-
long actual = new Long(xml.getElementValue("expire_time", "token").trim());
339-
Assert.assertEquals("Java SDK tests: expire time not set to expected time", expected, actual);
233+
String actual = xml.getElementValue("invalid", "token");
234+
Assert.assertEquals("Java SDK tests: unexpected invalid token message", expected, actual);
340235
}
341236

342237
@Test

0 commit comments

Comments
 (0)