Changeset 13885

Timestamp:

Jan 27, 2013, 5:47:38 PM (8 years ago)

Author:

jordan

Message:

(libT) tweaks to rename-test to give better line numbers on failure in Jenkins

File:

• trunk/libtransmission/rename-test.c (modified) (5 diffs)

trunk/libtransmission/rename-test.c

@@ -40 +40 @@
   } while (0)
 
-#define check_have_all(tor, totalSize) \
-  do { \
-    const tr_stat * st = tr_torrentStat(tor); \
-    check_int_eq (TR_STATUS_STOPPED, st->activity); \
-    check_int_eq (TR_STAT_OK, st->error); \
-    check_int_eq (0, st->leftUntilDone); \
-    check_int_eq (0, st->haveUnchecked); \
-    check_int_eq (0, st->desiredAvailable); \
-    check_int_eq (totalSize, st->sizeWhenDone); \
-    check_int_eq (totalSize, st->haveValid); \
-  } while (0)
-
 static bool
 testFileExistsAndConsistsOfThisString (const tr_torrent * tor, tr_file_index_t fileIndex, const char * str)
@@ -169 +157 @@
   const size_t totalSize = 14;
   tr_ctor * ctor;
+  const tr_stat * st;
 
   /* this is a single-file torrent whose file is hello-world.txt, holding the string "hello, world!" */
@@ -192 +181 @@
   /* sanity check the stats again, now that we've added the file */
   verify_and_block_until_done (tor);
-  check_have_all (tor, totalSize);
+  st = tr_torrentStat (tor);
+  check_int_eq (TR_STATUS_STOPPED, st->activity);
+  check_int_eq (TR_STAT_OK, st->error);
+  check_int_eq (0, st->leftUntilDone);
+  check_int_eq (0, st->haveUnchecked);
+  check_int_eq (0, st->desiredAvailable);
+  check_int_eq (totalSize, st->sizeWhenDone);
+  check_int_eq (totalSize, st->haveValid);
 
   /**
@@ -294 +290 @@
   char * tmp;
   static const size_t totalSize = 67;
+  const tr_stat * st;
   const tr_file * files;
   const char * strings[4];
@@ -338 +335 @@
   /* sanity check the (full) stats */
   verify_and_block_until_done (tor);
-  check_have_all (tor, totalSize);
+  st = tr_torrentStat (tor);
+  check_int_eq (TR_STATUS_STOPPED, st->activity);
+  check_int_eq (TR_STAT_OK, st->error);
+  check_int_eq (0, st->leftUntilDone);
+  check_int_eq (0, st->haveUnchecked);
+  check_int_eq (0, st->desiredAvailable);
+  check_int_eq (totalSize, st->sizeWhenDone);
+  check_int_eq (totalSize, st->haveValid);
+
 
   /**