From ddbab95e3f9224f40c8eda4b3164ed55ee29df0a Mon Sep 17 00:00:00 2001
From: Brett Tasker <brett@silverstripe.com>
Date: Fri, 21 Apr 2017 12:23:27 +1200
Subject: [PATCH] Namespacing for tests

---
 code/search/FullTextSearch.php                |  2 +
 code/search/SearchIndex.php                   | 95 +------------------
 code/search/SearchIndex_Null.php              | 23 +++++
 code/search/SearchIndex_Recording.php         | 79 +++++++++++++++
 code/solr/SolrIndex.php                       |  2 +-
 tests/BatchedProcessorTest.php                | 37 +-------
 .../BatchedProcessorTest_Index.php            | 15 +++
 .../BatchedProcessorTest_Object.php           | 13 +++
 .../BatchedProcessor_QueuedJobService.php     | 22 +++++
 tests/SearchUpdaterTest.php                   |  4 +
 ...rchVariantSiteTreeSubsitesPolyhomeTest.php |  4 +
 tests/SearchVariantVersionedTest.php          |  5 +
 tests/Solr4ServiceTest.php                    |  2 +
 tests/SolrIndexSubsitesTest.php               |  2 +
 tests/SolrIndexTest.php                       |  3 +
 tests/SolrIndexVersionedTest.php              |  4 +
 tests/SolrReindexQueuedTest.php               |  2 +
 tests/SolrReindexTest.php                     |  6 +-
 18 files changed, 191 insertions(+), 129 deletions(-)
 create mode 100644 code/search/SearchIndex_Null.php
 create mode 100644 code/search/SearchIndex_Recording.php
 create mode 100644 tests/BatchedProcessorTest/BatchedProcessorTest_Index.php
 create mode 100644 tests/BatchedProcessorTest/BatchedProcessorTest_Object.php
 create mode 100644 tests/BatchedProcessorTest/BatchedProcessor_QueuedJobService.php

diff --git a/code/search/FullTextSearch.php b/code/search/FullTextSearch.php
index 636bbaa..b419d25 100644
--- a/code/search/FullTextSearch.php
+++ b/code/search/FullTextSearch.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\FullTextSearch\Search;
+
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\ClassInfo;
 /**
diff --git a/code/search/SearchIndex.php b/code/search/SearchIndex.php
index 1857ee3..f4dc86a 100644
--- a/code/search/SearchIndex.php
+++ b/code/search/SearchIndex.php
@@ -1,5 +1,6 @@
 <?php
-namespace SilverStripe\FullTextSearch;
+
+namespace SilverStripe\FullTextSearch\Search;
 
 use SilverStripe\View\ViewableData;
 use SilverStripe\ORM\DataObject;
@@ -605,95 +606,3 @@ abstract class SearchIndex extends ViewableData
      */
     abstract public function init();
 }
-
-/**
- * A search index that does nothing. Useful for testing
- */
-abstract class SearchIndex_Null extends SearchIndex
-{
-    public function add($object)
-    {
-    }
-
-    public function delete($base, $id, $state)
-    {
-    }
-
-    public function commit()
-    {
-    }
-}
-
-/**
- * A search index that just records actions. Useful for testing
- */
-abstract class SearchIndex_Recording extends SearchIndex
-{
-    public $added = array();
-    public $deleted = array();
-    public $committed = false;
-
-    public function reset()
-    {
-        $this->added = array();
-        $this->deleted = array();
-        $this->committed = false;
-    }
-
-    public function add($object)
-    {
-        $res = array();
-
-        $res['ID'] = $object->ID;
-
-        foreach ($this->getFieldsIterator() as $name => $field) {
-            $val = $this->_getFieldValue($object, $field);
-            $res[$name] = $val;
-        }
-
-        $this->added[] = $res;
-    }
-
-    public function getAdded($fields = array())
-    {
-        $res = array();
-
-        foreach ($this->added as $added) {
-            $filtered = array();
-            foreach ($fields as $field) {
-                if (isset($added[$field])) {
-                    $filtered[$field] = $added[$field];
-                }
-            }
-            $res[] = $filtered;
-        }
-
-        return $res;
-    }
-
-    public function delete($base, $id, $state)
-    {
-        $this->deleted[] = array('base' => $base, 'id' => $id, 'state' => $state);
-    }
-
-    public function commit()
-    {
-        $this->committed = true;
-    }
-
-    public function getIndexName()
-    {
-        return get_class($this);
-    }
-
-    public function getIsCommitted()
-    {
-        return $this->committed;
-    }
-
-    public function getService()
-    {
-        // Causes commits to the service to be redirected back to the same object
-        return $this;
-    }
-}
diff --git a/code/search/SearchIndex_Null.php b/code/search/SearchIndex_Null.php
new file mode 100644
index 0000000..961bcb2
--- /dev/null
+++ b/code/search/SearchIndex_Null.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace SilverStripe\FullTextSearch\Search;
+
+use SilverStripe\FullTextSearch\Search\SearchIndex;
+
+/**
+ * A search index that does nothing. Useful for testing
+ */
+abstract class SearchIndex_Null extends SearchIndex
+{
+    public function add($object)
+    {
+    }
+
+    public function delete($base, $id, $state)
+    {
+    }
+
+    public function commit()
+    {
+    }
+}
diff --git a/code/search/SearchIndex_Recording.php b/code/search/SearchIndex_Recording.php
new file mode 100644
index 0000000..c8e8f89
--- /dev/null
+++ b/code/search/SearchIndex_Recording.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace SilverStripe\FullTextSearch\Search;
+
+use SilverStripe\FullTextSearch\Search\SearchIndex;
+
+/**
+ * A search index that just records actions. Useful for testing
+ */
+abstract class SearchIndex_Recording extends SearchIndex
+{
+    public $added = array();
+    public $deleted = array();
+    public $committed = false;
+
+    public function reset()
+    {
+        $this->added = array();
+        $this->deleted = array();
+        $this->committed = false;
+    }
+
+    public function add($object)
+    {
+        $res = array();
+
+        $res['ID'] = $object->ID;
+
+        foreach ($this->getFieldsIterator() as $name => $field) {
+            $val = $this->_getFieldValue($object, $field);
+            $res[$name] = $val;
+        }
+
+        $this->added[] = $res;
+    }
+
+    public function getAdded($fields = array())
+    {
+        $res = array();
+
+        foreach ($this->added as $added) {
+            $filtered = array();
+            foreach ($fields as $field) {
+                if (isset($added[$field])) {
+                    $filtered[$field] = $added[$field];
+                }
+            }
+            $res[] = $filtered;
+        }
+
+        return $res;
+    }
+
+    public function delete($base, $id, $state)
+    {
+        $this->deleted[] = array('base' => $base, 'id' => $id, 'state' => $state);
+    }
+
+    public function commit()
+    {
+        $this->committed = true;
+    }
+
+    public function getIndexName()
+    {
+        return get_class($this);
+    }
+
+    public function getIsCommitted()
+    {
+        return $this->committed;
+    }
+
+    public function getService()
+    {
+        // Causes commits to the service to be redirected back to the same object
+        return $this;
+    }
+}
diff --git a/code/solr/SolrIndex.php b/code/solr/SolrIndex.php
index bfe7477..8e69c77 100644
--- a/code/solr/SolrIndex.php
+++ b/code/solr/SolrIndex.php
@@ -4,7 +4,7 @@ Solr::include_client_api();
 
 use SilverStripe\Dev\BuildTask;
 use SilverStripe\Control\Director;
-use SilverStripe\FulltextSearch\SearchIndex;
+use SilverStripe\FulltextSearch\Search\SearchIndex;
 
 abstract class SolrIndex extends SearchIndex
 {
diff --git a/tests/BatchedProcessorTest.php b/tests/BatchedProcessorTest.php
index 6978d3e..fcb96b3 100644
--- a/tests/BatchedProcessorTest.php
+++ b/tests/BatchedProcessorTest.php
@@ -1,40 +1,9 @@
 <?php
 
+namespace SilverStripe\FullTextSearch\Tests;
 
-class BatchedProcessorTest_Object extends SiteTree implements TestOnly
-{
-    private static $db = array(
-        'TestText' => 'Varchar'
-    );
-}
-
-class BatchedProcessorTest_Index extends SearchIndex_Recording implements TestOnly
-{
-    public function init()
-    {
-        $this->addClass('BatchedProcessorTest_Object');
-        $this->addFilterField('TestText');
-    }
-}
-
-class BatchedProcessor_QueuedJobService
-{
-    protected $jobs = array();
-
-    public function queueJob(QueuedJob $job, $startAfter = null, $userId = null, $queueName = null)
-    {
-        $this->jobs[] = array(
-            'job' => $job,
-            'startAfter' => $startAfter
-        );
-        return $job;
-    }
-
-    public function getJobs()
-    {
-        return $this->jobs;
-    }
-}
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\FullTextSearch\Search\FullTextSearch;
 
 /**
  * Tests {@see SearchUpdateQueuedJobProcessor}
diff --git a/tests/BatchedProcessorTest/BatchedProcessorTest_Index.php b/tests/BatchedProcessorTest/BatchedProcessorTest_Index.php
new file mode 100644
index 0000000..c62ea6b
--- /dev/null
+++ b/tests/BatchedProcessorTest/BatchedProcessorTest_Index.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace SilverStripe\FullTextSearch\Tests\BatchedProcessorTest;
+
+use SilverStripe\Dev\TestOnly;
+use SilverStripe\FullTextSearch\Search\SearchIndex_Recording;
+
+class BatchedProcessorTest_Index extends SearchIndex_Recording implements TestOnly
+{
+    public function init()
+    {
+        $this->addClass('BatchedProcessorTest_Object');
+        $this->addFilterField('TestText');
+    }
+}
diff --git a/tests/BatchedProcessorTest/BatchedProcessorTest_Object.php b/tests/BatchedProcessorTest/BatchedProcessorTest_Object.php
new file mode 100644
index 0000000..b596a3a
--- /dev/null
+++ b/tests/BatchedProcessorTest/BatchedProcessorTest_Object.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace SilverStripe\FullTextSearch\Tests\BatchedProcessorTest;
+
+use SilverStripe\CMS\Model\SiteTree;
+use SilverStripe\Dev\TestOnly;
+
+class BatchedProcessorTest_Object extends SiteTree implements TestOnly
+{
+    private static $db = array(
+        'TestText' => 'Varchar'
+    );
+}
diff --git a/tests/BatchedProcessorTest/BatchedProcessor_QueuedJobService.php b/tests/BatchedProcessorTest/BatchedProcessor_QueuedJobService.php
new file mode 100644
index 0000000..1cf5253
--- /dev/null
+++ b/tests/BatchedProcessorTest/BatchedProcessor_QueuedJobService.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace SilverStripe\FullTextSearch\Tests\BatchedProcessorTest;
+
+class BatchedProcessor_QueuedJobService
+{
+    protected $jobs = array();
+
+    public function queueJob(QueuedJob $job, $startAfter = null, $userId = null, $queueName = null)
+    {
+        $this->jobs[] = array(
+            'job' => $job,
+            'startAfter' => $startAfter
+        );
+        return $job;
+    }
+
+    public function getJobs()
+    {
+        return $this->jobs;
+    }
+}
diff --git a/tests/SearchUpdaterTest.php b/tests/SearchUpdaterTest.php
index d2211c0..9cbb9c8 100644
--- a/tests/SearchUpdaterTest.php
+++ b/tests/SearchUpdaterTest.php
@@ -1,5 +1,9 @@
 <?php
 
+use SilverStripe\ORM\DataObject;
+use SilverStripe\FullTextSearch\Search\SearchIndex_Recording;
+use SilverStripe\Dev\SapphireTest;
+
 class SearchUpdaterTest_Container extends DataObject
 {
     private static $db = array(
diff --git a/tests/SearchVariantSiteTreeSubsitesPolyhomeTest.php b/tests/SearchVariantSiteTreeSubsitesPolyhomeTest.php
index 20e1d9a..fdf89f6 100644
--- a/tests/SearchVariantSiteTreeSubsitesPolyhomeTest.php
+++ b/tests/SearchVariantSiteTreeSubsitesPolyhomeTest.php
@@ -1,5 +1,9 @@
 <?php
 
+use SilverStripe\CMS\Model\SiteTree;
+use SilverStripe\FullTextSearch\Search\SearchIndex_Recording;
+use SilverStripe\Dev\SapphireTest;
+
 class SearchVariantSiteTreeSubsitesPolyhomeTest_Item extends SiteTree
 {
     // TODO: Currently theres a failure if you addClass a non-table class
diff --git a/tests/SearchVariantVersionedTest.php b/tests/SearchVariantVersionedTest.php
index 76747f5..ebfd561 100644
--- a/tests/SearchVariantVersionedTest.php
+++ b/tests/SearchVariantVersionedTest.php
@@ -1,5 +1,10 @@
 <?php
 
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\CMS\Model\SiteTree;
+use SilverStripe\Dev\TestOnly;
+use SilverStripe\FullTextSearch\Search\SearchIndex_Recording;
+
 class SearchVariantVersionedTest extends SapphireTest
 {
     /**
diff --git a/tests/Solr4ServiceTest.php b/tests/Solr4ServiceTest.php
index 1359d6e..60b8d02 100644
--- a/tests/Solr4ServiceTest.php
+++ b/tests/Solr4ServiceTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\Dev\SapphireTest;
+
 /**
  * Test solr 4.0 compatibility
  */
diff --git a/tests/SolrIndexSubsitesTest.php b/tests/SolrIndexSubsitesTest.php
index 49e74b6..5b39812 100644
--- a/tests/SolrIndexSubsitesTest.php
+++ b/tests/SolrIndexSubsitesTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\Dev\SapphireTest;
+
 if (class_exists('Phockito')) {
     Phockito::include_hamcrest(false);
 }
diff --git a/tests/SolrIndexTest.php b/tests/SolrIndexTest.php
index c710113..e75b8e5 100644
--- a/tests/SolrIndexTest.php
+++ b/tests/SolrIndexTest.php
@@ -1,4 +1,7 @@
 <?php
+
+use SilverStripe\Dev\SapphireTest;
+
 class SolrIndexTest extends SapphireTest
 {
     public function setUpOnce()
diff --git a/tests/SolrIndexVersionedTest.php b/tests/SolrIndexVersionedTest.php
index f9df86f..2c06ea5 100644
--- a/tests/SolrIndexVersionedTest.php
+++ b/tests/SolrIndexVersionedTest.php
@@ -1,5 +1,9 @@
 <?php
 
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\ORM\DataObject;
+use SilverStripe\Dev\TestOnly;
+
 if (class_exists('Phockito')) {
     Phockito::include_hamcrest(false);
 }
diff --git a/tests/SolrReindexQueuedTest.php b/tests/SolrReindexQueuedTest.php
index f3339f2..3eb5c89 100644
--- a/tests/SolrReindexQueuedTest.php
+++ b/tests/SolrReindexQueuedTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\Dev\SapphireTest;
+
 /**
  * Additional tests of solr reindexing processes when run with queuedjobs
  */
diff --git a/tests/SolrReindexTest.php b/tests/SolrReindexTest.php
index d7ad6b5..5f696fb 100644
--- a/tests/SolrReindexTest.php
+++ b/tests/SolrReindexTest.php
@@ -4,6 +4,10 @@ use Monolog\Handler\AbstractProcessingHandler;
 use Monolog\Handler\HandlerInterface;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Dev\TestOnly;
+use SilverStripe\ORM\DataObject;
+use SilverStripe\ORM\DataExtension;
 
 if (class_exists('Phockito')) {
     Phockito::include_hamcrest(false);
@@ -339,7 +343,7 @@ class SolrReindexTest_ItemExtension extends DataExtension implements TestOnly
      * @param SQLQuery $query
      * @param DataQuery $dataQuery
      */
-    public function augmentSQL(SQLQuery &$query, DataQuery &$dataQuery = null)
+    public function augmentSQL(SilverStripe\ORM\Queries\SQLSelect $query, SilverStripe\ORM\DataQuery $dataQuery = NULL)
     {
         $variant = SolrReindexTest_Variant::get_current();
         if ($variant !== null && !$query->filtersOnID()) {