@@ -53,21 +53,12 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
5353
5454 try {
5555 signal .await (120 , TimeUnit .SECONDS ); // wait for callback
56+ Assert .assertNotNull ("timeout" , info );
5657 } catch (InterruptedException e ) {
5758 e .printStackTrace ();
5859 }
59- // 尝试获取info信息。
60- // key == null ： 没进入 complete ？ 什么导致的？
61- if (!expectKey .equals (key )) {
62- //此处通不过， travis 会打印信息
63- Assert .assertEquals ("" , info );
64- }
65- if (info == null || !info .isOK ()) {
66- //此处通不过， travis 会打印信息
67- Assert .assertEquals ("" , info );
68- }
69- Assert .assertEquals (expectKey , key );
70- Assert .assertTrue (info .isOK ());
60+ Assert .assertEquals (info .toString (), expectKey , key );
61+ Assert .assertTrue (info .toString (), info .isOK ());
7162 Assert .assertNotNull (info .reqId );
7263 Assert .assertNotNull (resp );
7364 Assert .assertEquals ("/" , info .path );
@@ -95,17 +86,14 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
9586
9687 try {
9788 signal .await (120 , TimeUnit .SECONDS ); // wait for callback
89+ Assert .assertNotNull ("timeout" , info );
9890 } catch (InterruptedException e ) {
9991 e .printStackTrace ();
10092 }
10193
102- // 尝试获取info信息。
103- if (info == null || !info .isOK ()) {
104- //此处通不过， travis 会打印信息
105- Assert .assertEquals ("" , info );
106- }
107- Assert .assertEquals (expectKey , key );
108- Assert .assertTrue (info .isOK ());
94+ Assert .assertEquals (info .toString (), expectKey , key );
95+ Assert .assertTrue (info .toString (), info .isOK ());
96+
10997 Assert .assertNotNull (info .reqId );
11098 Assert .assertEquals ("/" , info .path );
11199 Assert .assertNotNull (resp );
@@ -131,11 +119,12 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
131119
132120 try {
133121 signal .await (120 , TimeUnit .SECONDS ); // wait for callback
122+ Assert .assertNotNull ("timeout" , info );
134123 } catch (InterruptedException e ) {
135124 e .printStackTrace ();
136125 }
137- Assert .assertEquals (expectKey , key );
138- Assert .assertEquals (ResponseInfo .InvalidToken , info .statusCode );
126+ Assert .assertEquals (info . toString (), expectKey , key );
127+ Assert .assertEquals (info . toString (), ResponseInfo .InvalidToken , info .statusCode );
139128 Assert .assertNotNull (info .reqId );
140129 Assert .assertNull (resp );
141130 }
@@ -157,11 +146,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
157146
158147 try {
159148 signal .await (120 , TimeUnit .SECONDS ); // wait for callback
149+ assertNotNull ("timeout" , info );
160150 } catch (InterruptedException e ) {
161151 e .printStackTrace ();
162152 }
163- Assert .assertEquals (expectKey , key );
164- Assert .assertEquals (ResponseInfo .InvalidArgument , info .statusCode );
153+ Assert .assertEquals (info .toString (), expectKey , key );
154+ Assert .assertEquals (info .toString (), ResponseInfo .InvalidArgument ,
155+ info .statusCode );
165156 Assert .assertNull (resp );
166157 }
167158
@@ -184,11 +175,12 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
184175
185176 try {
186177 signal .await (120 , TimeUnit .SECONDS ); // wait for callback
178+ Assert .assertNotNull ("timeout" , info );
187179 } catch (InterruptedException e ) {
188180 e .printStackTrace ();
189181 }
190- Assert .assertEquals (expectKey , key );
191- Assert .assertEquals (ResponseInfo .InvalidArgument , info .statusCode );
182+ Assert .assertEquals (info . toString (), expectKey , key );
183+ Assert .assertEquals (info . toString (), ResponseInfo .InvalidArgument , info .statusCode );
192184 Assert .assertNull (resp );
193185 }
194186
@@ -211,11 +203,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
211203
212204 try {
213205 signal .await (120 , TimeUnit .SECONDS ); // wait for callback
206+ Assert .assertNotNull ("timeout" , info );
214207 } catch (InterruptedException e ) {
215208 e .printStackTrace ();
216209 }
217- Assert .assertEquals (expectKey , key );
218- Assert .assertEquals (ResponseInfo .InvalidArgument , info .statusCode );
210+ Assert .assertEquals (info .toString (), expectKey , key );
211+ Assert .assertEquals (info .toString (), ResponseInfo .InvalidArgument ,
212+ info .statusCode );
219213 Assert .assertNull (resp );
220214 }
221215
@@ -238,21 +232,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
238232
239233 try {
240234 signal .await (130 , TimeUnit .SECONDS ); // wait for callback
235+ Assert .assertNotNull ("timeout" , info );
241236 } catch (InterruptedException e ) {
242237 e .printStackTrace ();
243238 }
244- // 尝试获取info信息。
245- // key == null ： 没进入 complete ？ 什么导致的？
246- if (!expectKey .equals (key )) {
247- //此处通不过， travis 会打印信息
248- Assert .assertEquals ("" , info );
249- }
250- if (info == null || !info .isOK ()) {
251- //此处通不过， travis 会打印信息
252- Assert .assertEquals ("" , info );
253- }
254- Assert .assertEquals (expectKey , key );
255- Assert .assertTrue (info .isOK ());
239+
240+ Assert .assertEquals (info .toString (), expectKey , key );
241+ Assert .assertTrue (info .toString (), info .isOK ());
256242 Assert .assertNotNull (info .reqId );
257243 Assert .assertNotNull (resp );
258244 TempFile .remove (f );
@@ -306,21 +292,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
306292
307293 try {
308294 signal .await (120 , TimeUnit .SECONDS ); // wait for callback
295+ Assert .assertNotNull ("timeout" , info );
309296 } catch (InterruptedException e ) {
310297 e .printStackTrace ();
311298 }
312- // 尝试获取info信息。
313- // key == null ： 没进入 complete ？ 什么导致的？
314- if (!expectKey .equals (key )) {
315- //此处通不过， travis 会打印信息
316- Assert .assertEquals ("" , info );
317- }
318- if (info == null || !info .isOK ()) {
319- //此处通不过， travis 会打印信息
320- Assert .assertEquals ("" , info );
321- }
322- Assert .assertEquals (expectKey , key );
323- Assert .assertTrue (info .isOK ());
299+
300+ Assert .assertEquals (info .toString (), expectKey , key );
301+ Assert .assertTrue (info .toString (), info .isOK ());
324302 Assert .assertNotNull (info .reqId );
325303 Assert .assertNotNull (resp );
326304 }
@@ -350,21 +328,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
350328
351329 try {
352330 signal .await (120 , TimeUnit .SECONDS ); // wait for callback
331+ Assert .assertNotNull ("timeout" , info );
353332 } catch (InterruptedException e ) {
354333 e .printStackTrace ();
355334 }
356- // 尝试获取info信息。
357- // key == null ： 没进入 complete ？ 什么导致的？
358- if (!expectKey .equals (key )) {
359- //此处通不过， travis 会打印信息
360- Assert .assertEquals ("" , info );
361- }
362- if (info == null || !info .isOK ()) {
363- //此处通不过， travis 会打印信息
364- Assert .assertEquals ("" , info );
365- }
366- Assert .assertEquals (expectKey , key );
367- Assert .assertTrue (info .isOK ());
335+
336+ Assert .assertEquals (info .toString (), expectKey , key );
337+ Assert .assertTrue (info .toString (), info .isOK ());
368338 Assert .assertNotNull (info .reqId );
369339 Assert .assertNotNull (resp );
370340 }
@@ -393,21 +363,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
393363
394364 try {
395365 signal .await (120 , TimeUnit .SECONDS ); // wait for callback
366+ Assert .assertNotNull ("timeout" , info );
396367 } catch (InterruptedException e ) {
397368 e .printStackTrace ();
398369 }
399- // 尝试获取info信息。
400- // key == null ： 没进入 complete ？ 什么导致的？
401- if (!expectKey .equals (key )) {
402- //此处通不过， travis 会打印信息
403- Assert .assertEquals ("" , info );
404- }
405- if (info == null || !info .isOK ()) {
406- //此处通不过， travis 会打印信息
407- Assert .assertEquals ("" , info );
408- }
409- Assert .assertEquals (expectKey , key );
410- Assert .assertTrue (info .isOK ());
370+
371+ Assert .assertEquals (info .toString (), expectKey , key );
372+ Assert .assertTrue (info .toString (), info .isOK ());
411373 Assert .assertNotNull (info .reqId );
412374 Assert .assertNotNull (resp );
413375 }
0 commit comments