From 67463fa13536d99482b6230fe7ec7b359003a51a Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Sat, 10 Dec 2016 14:41:48 +0100 Subject: [PATCH] TASK: Refactor tests * Have necessary setup in all tests. * Added todos --- .../Fixtures/{Indexing/IndexTcaTable.ts => BasicSetup.ts} | 0 Tests/Functional/Fixtures/BasicSetup.xml | 8 ++++++++ Tests/Functional/Fixtures/Indexing/IndexTcaTable.xml | 6 ------ Tests/Functional/FunctionalTestCase.php | 4 ++++ Tests/Functional/Indexing/IndexTcaTableTest.php | 5 ++++- 5 files changed, 16 insertions(+), 7 deletions(-) rename Tests/Functional/Fixtures/{Indexing/IndexTcaTable.ts => BasicSetup.ts} (100%) create mode 100644 Tests/Functional/Fixtures/BasicSetup.xml diff --git a/Tests/Functional/Fixtures/Indexing/IndexTcaTable.ts b/Tests/Functional/Fixtures/BasicSetup.ts similarity index 100% rename from Tests/Functional/Fixtures/Indexing/IndexTcaTable.ts rename to Tests/Functional/Fixtures/BasicSetup.ts diff --git a/Tests/Functional/Fixtures/BasicSetup.xml b/Tests/Functional/Fixtures/BasicSetup.xml new file mode 100644 index 0000000..a85b72a --- /dev/null +++ b/Tests/Functional/Fixtures/BasicSetup.xml @@ -0,0 +1,8 @@ + + + + 1 + 0 + Root page containing necessary TypoScript + + diff --git a/Tests/Functional/Fixtures/Indexing/IndexTcaTable.xml b/Tests/Functional/Fixtures/Indexing/IndexTcaTable.xml index 50532f2..14ef723 100644 --- a/Tests/Functional/Fixtures/Indexing/IndexTcaTable.xml +++ b/Tests/Functional/Fixtures/Indexing/IndexTcaTable.xml @@ -1,11 +1,5 @@ - - 1 - 0 - Page Title - - 6 1 diff --git a/Tests/Functional/FunctionalTestCase.php b/Tests/Functional/FunctionalTestCase.php index bd04468..a329ca4 100644 --- a/Tests/Functional/FunctionalTestCase.php +++ b/Tests/Functional/FunctionalTestCase.php @@ -40,6 +40,10 @@ abstract class FunctionalTestCase extends CoreTestCase { parent::setUp(); + // Provide necessary configuration for extension + $this->importDataSet('Tests/Functional/Fixtures/BasicSetup.xml'); + $this->setUpFrontendRootPage(1, ['EXT:search_core/Tests/Functional/Fixtures/BasicSetup.ts']); + // Create client to make requests and assert something. $this->client = new \Elastica\Client([ 'host' => getenv('ES_HOST') ?: \Elastica\Connection::DEFAULT_HOST, diff --git a/Tests/Functional/Indexing/IndexTcaTableTest.php b/Tests/Functional/Indexing/IndexTcaTableTest.php index 57a6df6..7a6d355 100644 --- a/Tests/Functional/Indexing/IndexTcaTableTest.php +++ b/Tests/Functional/Indexing/IndexTcaTableTest.php @@ -34,7 +34,6 @@ class IndexTcaTableTest extends FunctionalTestCase parent::setUp(); $this->importDataSet('Tests/Functional/Fixtures/Indexing/IndexTcaTable.xml'); - $this->setUpFrontendRootPage(1, ['EXT:search_core/Tests/Functional/Fixtures/Indexing/IndexTcaTable.ts']); } /** @@ -53,4 +52,8 @@ class IndexTcaTableTest extends FunctionalTestCase $this->assertTrue($response->isOK()); $this->assertSame($response->getData()['hits']['total'], 1, 'Not exactly 1 document was indexed.'); } + + // TODO: Add tests for hook. + + // TODO: Add tests for search in frontend. }