Make use unit tests put temp files in work dir rather than under base dir, a=chris

Chris Pollett [2013-04-10 00:Apr:th]
Make use unit tests put temp files in work dir rather than under base dir, a=chris
Filename
tests/bloom_filter_file_test.php
tests/hash_table_test.php
tests/index_shard_test.php
tests/priority_queue_test.php
tests/string_array_test.php
tests/web_archive_test.php
tests/web_queue_bundle_test.php
diff --git a/tests/bloom_filter_file_test.php b/tests/bloom_filter_file_test.php
index 68ffa762b..08d308bef 100755
--- a/tests/bloom_filter_file_test.php
+++ b/tests/bloom_filter_file_test.php
@@ -55,7 +55,8 @@ class BloomFilterFileTest extends UnitTest
      */
     function setUp()
     {
-        $this->test_objects['FILE1'] = new BloomFilterFile("test.ftr", 10, 100);
+        $this->test_objects['FILE1'] = new BloomFilterFile(WORK_DIRECTORY.
+            "/test.ftr", 10, 100);
     }

     /**
@@ -64,7 +65,7 @@ class BloomFilterFileTest extends UnitTest
      */
     function tearDown()
     {
-        @unlink("test.ftr");
+        @unlink(WORK_DIRECTORY."/test.ftr");
     }

     /**
@@ -103,7 +104,8 @@ class BloomFilterFileTest extends UnitTest
         $this->test_objects['FILE1']->save();
         $this->test_objects['FILE1'] = NULL;

-        $this->test_objects['FILE2'] = BloomFilterFile::load("test.ftr");
+        $this->test_objects['FILE2'] = BloomFilterFile::load(WORK_DIRECTORY.
+            "/test.ftr");
         $this->assertTrue(
             $this->test_objects['FILE2']->contains(77), "File 2 contains 77");
         $this->assertFalse(
@@ -111,4 +113,4 @@ class BloomFilterFileTest extends UnitTest

     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/hash_table_test.php b/tests/hash_table_test.php
index 22ad9d050..70afb8367 100755
--- a/tests/hash_table_test.php
+++ b/tests/hash_table_test.php
@@ -60,8 +60,10 @@ class HashTableTest extends UnitTest
      */
     function setUp()
     {
-        $this->test_objects['FILE1'] = new HashTable("hash1.txt", 20000, 8, 8);
-        $this->test_objects['FILE2'] = new HashTable("hash2.txt", 10, 8, 1);
+        $this->test_objects['FILE1'] = new HashTable(
+            WORK_DIRECTORY."/hash1.txt", 20000, 8, 8);
+        $this->test_objects['FILE2'] = new HashTable(WORK_DIRECTORY.
+            "/hash2.txt", 10, 8, 1);
     }

     /**
@@ -70,8 +72,8 @@ class HashTableTest extends UnitTest
      */
     function tearDown()
     {
-        @unlink("hash1.txt");
-        @unlink("hash2.txt");
+        @unlink(WORK_DIRECTORY."/hash1.txt");
+        @unlink(WORK_DIRECTORY."/hash2.txt");
     }

     /**
@@ -210,4 +212,4 @@ class HashTableTest extends UnitTest
     }

 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/index_shard_test.php b/tests/index_shard_test.php
index 5e917c206..0a63fb3e8 100644
--- a/tests/index_shard_test.php
+++ b/tests/index_shard_test.php
@@ -65,9 +65,12 @@ class IndexShardTest extends UnitTest
      */
     function setUp()
     {
-        $this->test_objects['shard'] = new IndexShard("shard.txt", 0);
-        $this->test_objects['shard2'] = new IndexShard("shard2.txt", 0);
-        $this->test_objects['shard3'] = new IndexShard("shard3.txt", 0);
+        $this->test_objects['shard'] = new IndexShard(WORK_DIRECTORY.
+            "/shard.txt", 0);
+        $this->test_objects['shard2'] = new IndexShard(WORK_DIRECTORY.
+            "/shard2.txt", 0);
+        $this->test_objects['shard3'] = new IndexShard(WORK_DIRECTORY.
+            "/shard3.txt", 0);
     }

     /**
@@ -75,9 +78,9 @@ class IndexShardTest extends UnitTest
      */
     function tearDown()
     {
-        @unlink("shard.txt");
-        @unlink("shard2.txt");
-        @unlink("shard3.txt");
+        @unlink(WORK_DIRECTORY."/shard.txt");
+        @unlink(WORK_DIRECTORY."/shard2.txt");
+        @unlink(WORK_DIRECTORY."/shard3.txt");
     }

     /**
@@ -403,7 +406,8 @@ class IndexShardTest extends UnitTest

         $this->test_objects['shard']->save();

-        $this->test_objects['shard2'] = IndexShard::load("shard.txt");
+        $this->test_objects['shard2'] = IndexShard::load(WORK_DIRECTORY.
+            "/shard.txt");
         $this->assertEqual($this->test_objects['shard2']->len_all_docs, 3,
             "Len All Docs Correctly Counts Length of First Doc");

@@ -457,4 +461,4 @@ class IndexShardTest extends UnitTest

     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/priority_queue_test.php b/tests/priority_queue_test.php
index f9314a5b2..9502b508c 100755
--- a/tests/priority_queue_test.php
+++ b/tests/priority_queue_test.php
@@ -56,9 +56,11 @@ class PriorityQueueTest extends UnitTest
     function setUp()
     {
         $this->test_objects['FILE1'] =
-            new PriorityQueue("queue1.txt", 100, 4, CrawlConstants::MAX);
+            new PriorityQueue(WORK_DIRECTORY."/queue1.txt",
+                100, 4, CrawlConstants::MAX);
         $this->test_objects['FILE2'] =
-            new PriorityQueue("queue2.txt", 100, 4, CrawlConstants::MIN);
+            new PriorityQueue(WORK_DIRECTORY."/queue2.txt",
+                100, 4, CrawlConstants::MIN);
     }

     /**
@@ -67,8 +69,8 @@ class PriorityQueueTest extends UnitTest
      */
     function tearDown()
     {
-        @unlink("queue1.txt");
-        @unlink("queue2.txt");
+        @unlink(WORK_DIRECTORY."/queue1.txt");
+        @unlink(WORK_DIRECTORY."/queue2.txt");
     }

     /**
@@ -170,4 +172,4 @@ class PriorityQueueTest extends UnitTest
     }

 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/string_array_test.php b/tests/string_array_test.php
index 0f6c44829..3fbdcbce6 100644
--- a/tests/string_array_test.php
+++ b/tests/string_array_test.php
@@ -55,7 +55,8 @@ class StringArrayTest extends UnitTest
      */
     function setUp()
     {
-        $this->test_objects['FILE1'] = new StringArray("array.txt", 4, 4, -1);
+        $this->test_objects['FILE1'] = new StringArray(WORK_DIRECTORY.
+            "/array.txt", 4, 4, -1);
     }

     /**
@@ -64,7 +65,7 @@ class StringArrayTest extends UnitTest
      */
     function tearDown()
     {
-        @unlink("array.txt");
+        @unlink(WORK_DIRECTORY."/array.txt");
     }

     /**
@@ -97,7 +98,7 @@ class StringArrayTest extends UnitTest
         $this->test_objects['FILE1']->put(2, pack("N", 3));
         $this->test_objects['FILE1']->put(3, pack("N", 2));
         $this->test_objects['FILE1']->save();
-        $object = StringArray::load("array.txt");
+        $object = StringArray::load(WORK_DIRECTORY."/array.txt");
         //check can read in what we saved
         $tmp = unpack("N",$object->get(0));
         $this->assertEqual($tmp[1], 5, "Get put 0th items equal");
@@ -118,4 +119,4 @@ class StringArrayTest extends UnitTest
         $this->assertEqual($tmp[1], 2, "Get put 3th items equal");
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/web_archive_test.php b/tests/web_archive_test.php
index df84ac832..fd29f3c0b 100755
--- a/tests/web_archive_test.php
+++ b/tests/web_archive_test.php
@@ -62,7 +62,7 @@ class WebArchiveTest extends UnitTest
     function setUp()
     {
         $this->test_objects['FILE1'] =
-            new WebArchive("ar1.sqwa", new GzipCompressor());
+            new WebArchive(WORK_DIRECTORY."/ar1.sqwa", new GzipCompressor());
     }

     /**
@@ -70,7 +70,7 @@ class WebArchiveTest extends UnitTest
      */
     function tearDown()
     {
-        @unlink("ar1.sqwa");
+        @unlink(WORK_DIRECTORY."/ar1.sqwa");
     }

     /**
@@ -150,10 +150,10 @@ class WebArchiveTest extends UnitTest
             $this->test_objects['FILE1']->addObjects("offset", $more_items);

         $this->test_objects['REF_FILE1'] =
-            new WebArchive("ar1.sqwa", new GzipCompressor());
+            new WebArchive(WORK_DIRECTORY."/ar1.sqwa", new GzipCompressor());
         $this->assertEqual(
             $this->test_objects['REF_FILE1']->count, 6,
             "Archive count is equal to number of items inserted");
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/web_queue_bundle_test.php b/tests/web_queue_bundle_test.php
index c8d0725d2..513219f9b 100644
--- a/tests/web_queue_bundle_test.php
+++ b/tests/web_queue_bundle_test.php
@@ -73,7 +73,8 @@ class WebQueueBundleTest extends UnitTest
     function setUp()
     {
         $this->test_objects['FILE1'] =
-            new WebQueueBundle("QueueTest", 1000, 1000, CrawlConstants::MAX);
+            new WebQueueBundle(WORK_DIRECTORY."/QueueTest",
+                1000, 1000, CrawlConstants::MAX);
     }

     /**
@@ -81,7 +82,7 @@ class WebQueueBundleTest extends UnitTest
      */
     function tearDown()
     {
-        $this->db->unlinkRecursive("QueueTest");
+        $this->db->unlinkRecursive(WORK_DIRECTORY."/QueueTest");
     }

     /**
@@ -169,4 +170,4 @@ class WebQueueBundleTest extends UnitTest
         }
     }
 }
-?>
\ No newline at end of file
+?>
ViewGit