gordonbanderson / silverstripe-elastica

tests/ElasticsearchFunctionalTestBase.php

Doc Comments +16 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 	 * Note:   characters are stripped from the content; make sure that your assertions take this into account.
 	 *
 	 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
-	 * @param array|string $expectedMatches The content of at least one of the matched tags
+	 * @param integer $index
 	 * @throws PHPUnit_Framework_AssertionFailedError
 	 * @return boolean
 	 */
@@ -155,7 +155,8 @@ 
 	 * Note:   characters are stripped from the content; make sure that your assertions take this into account.
 	 *
 	 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
-	 * @param array|string $expectedMatches The content of at least one of the matched tags
+	 * @param integer $index
+	 * @param string $expectedClause
 	 * @throws PHPUnit_Framework_AssertionFailedError
 	 * @return boolean
 	 */
@@ -183,6 +184,12 @@ 
 	/*
 	Check all the nodes matching the selector for attribute name = expected value
 	 */
+
+	/**
+	 * @param string $selector
+	 * @param string $attributeName
+	 * @param string $expectedValue
+	 */
 	public function assertAttributeHasExactValue($selector, $attributeName, $expectedValue) {
 		$items = $this->cssParser()->getBySelector($selector);
 		foreach ($items as $item) {
@@ -191,6 +198,9 @@ 
 	}
 
 
+	/**
+	 * @param string $selector
+	 */
 	public function assertAttributesHaveExactValues($selector, $expectedValues) {
 		$attributeNames = array_keys($expectedValues);
 		$items = $this->cssParser()->getBySelector($selector);
@@ -204,6 +214,10 @@ 
 	}
 
 
+	/**
+	 * @param string $selector
+	 * @param integer $expectedAmount
+	 */
 	public function assertNumberOfNodes($selector, $expectedAmount) {
 		$items = $this->cssParser()->getBySelector($selector);
 		foreach ($items as $item) {

Indentation +9 added lines, -9 removed lines

@@ -150,15 +150,15 @@
 
 
 		/**
-	 *Assert that the indexth matching css node has a prefix as expected
-	 *
-	 * Note:   characters are stripped from the content; make sure that your assertions take this into account.
-	 *
-	 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
-	 * @param array|string $expectedMatches The content of at least one of the matched tags
-	 * @throws PHPUnit_Framework_AssertionFailedError
-	 * @return boolean
-	 */
+		 *Assert that the indexth matching css node has a prefix as expected
+		 *
+		 * Note:   characters are stripped from the content; make sure that your assertions take this into account.
+		 *
+		 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
+		 * @param array|string $expectedMatches The content of at least one of the matched tags
+		 * @throws PHPUnit_Framework_AssertionFailedError
+		 * @return boolean
+		 */
 	public function assertSelectorContains($selector, $index, $expectedClause) {
 		$items = $this->cssParser()->getBySelector($selector);
 

Spacing +20 added lines, -20 removed lines

@@ -9,8 +9,8 @@ 
 	public static $ignoreFixtureFileFor = array();
 
 	protected $extraDataObjects = array(
-		'SearchableTestPage','FlickrPhotoTO','FlickrAuthorTO','FlickrSetTO','FlickrTagTO',
-		'SearchableTestFatherPage','SearchableTestGrandFatherPage'
+		'SearchableTestPage', 'FlickrPhotoTO', 'FlickrAuthorTO', 'FlickrSetTO', 'FlickrTagTO',
+		'SearchableTestFatherPage', 'SearchableTestGrandFatherPage'
 	);
 
 
@@ -27,7 +27,7 @@ 
 
 	public function setUp() {
 
-		error_log("*************** TEST: ".$this->getName());
+		error_log("*************** TEST: " . $this->getName());
 
 		$cache = SS_Cache::factory('elasticsearch');
 		$cache->clean(Zend_Cache::CLEANING_MODE_ALL);
@@ -35,7 +35,7 @@ 
 
 		// this needs to be called in order to create the list of searchable
 		// classes and fields that are available.  Simulates part of a build
-		$classes = array('SearchableTestPage','SiteTree','Page','FlickrPhotoTO','FlickrSetTO',
+		$classes = array('SearchableTestPage', 'SiteTree', 'Page', 'FlickrPhotoTO', 'FlickrSetTO',
 			'FlickrTagTO', 'FlickrAuthorTO');
 		$this->requireDefaultRecordsFrom = $classes;
 
@@ -54,7 +54,7 @@ 
 			$this->service->setTestMode(true);
 
 			// A previous test may have deleted the index and then failed, so check for this
-			if (!$this->service->getIndex()->exists()) {
+			if(!$this->service->getIndex()->exists()) {
 				$this->service->getIndex()->create();
 			}
 			$this->service->reset();
@@ -65,9 +65,9 @@ 
 			// load fixtures
 			$orig_fixture_file = static::$fixture_file;
 
-			foreach (static::$ignoreFixtureFileFor as $testPattern) {
-				$pattern = '/'.$testPattern.'/';
-				if (preg_match($pattern, $this->getName())) {
+			foreach(static::$ignoreFixtureFileFor as $testPattern) {
+				$pattern = '/' . $testPattern . '/';
+				if(preg_match($pattern, $this->getName())) {
 					static::$fixture_file = null;
 				}
 			}
@@ -79,7 +79,7 @@ 
 		// this has to be executed otherwise nesting exceptions occur
 		parent::setUp();
 
-		if ($elasticaException) {
+		if($elasticaException) {
 			$this->fail('T1 Exception with Elasticsearch');
 		}
 
@@ -101,18 +101,18 @@ 
 			$elasticaException = true;
 		}
 
-		if ($elasticaException) {
+		if($elasticaException) {
 			$this->fail('T2 Exception with Elasticsearch');
 		}
 	}
 
 
 	private function publishSiteTree() {
-		foreach (SiteTree::get()->getIterator() as $page) {
+		foreach(SiteTree::get()->getIterator() as $page) {
 			// temporarily disable Elasticsearch indexing, it will be done in a batch
 			$page->IndexingOff = true;
 
-			$page->publish('Stage','Live');
+			$page->publish('Stage', 'Live');
 		}
 	}
 
@@ -133,7 +133,7 @@ 
 		$items = $this->cssParser()->getBySelector($selector);
 
 		$ctr = 0;
-		foreach ($items as $item) {
+		foreach($items as $item) {
 			$text = strip_tags($item);
 			$escaped = str_replace("'", "\'", $text);
 			$ctr++;
@@ -163,7 +163,7 @@ 
 		$items = $this->cssParser()->getBySelector($selector);
 
 		$ctr = 0;
-		foreach ($items as $item) {
+		foreach($items as $item) {
 			$text = strip_tags($item);
 			$escaped = str_replace("'", "\'", $text);
 			$ctr++;
@@ -185,7 +185,7 @@ 
 	 */
 	public function assertAttributeHasExactValue($selector, $attributeName, $expectedValue) {
 		$items = $this->cssParser()->getBySelector($selector);
-		foreach ($items as $item) {
+		foreach($items as $item) {
 			$this->assertEquals($expectedValue, $item['value']);
 		}
 	}
@@ -194,9 +194,9 @@ 
 	public function assertAttributesHaveExactValues($selector, $expectedValues) {
 		$attributeNames = array_keys($expectedValues);
 		$items = $this->cssParser()->getBySelector($selector);
-		foreach ($items as $item) {
+		foreach($items as $item) {
 			$actualValues = array();
-			foreach ($attributeNames as $attributeName) {
+			foreach($attributeNames as $attributeName) {
 				$actualValues[$attributeName] = (string)$item[$attributeName];
 			}
 			$this->assertEquals($expectedValues, $actualValues);
@@ -206,7 +206,7 @@ 
 
 	public function assertNumberOfNodes($selector, $expectedAmount) {
 		$items = $this->cssParser()->getBySelector($selector);
-		foreach ($items as $item) {
+		foreach($items as $item) {
 			$text = strip_tags($item);
 		}
 
@@ -219,9 +219,9 @@ 
 	public function collateSearchResults() {
 		$items = $this->cssParser()->getBySelector('div.searchResults .searchResult');
 		$result = array();
-		foreach ($items as $item) {
+		foreach($items as $item) {
 			$attr = $item->attributes()->id;
-			array_push($result, $attr."");
+			array_push($result, $attr . "");
 		}
 
 		return $result;

tests/ElasticSearchPageControllerTest.php

Indentation +19 added lines, -19 removed lines

@@ -74,11 +74,11 @@ 
 		$this->assertEquals(200, $searchPage->getStatusCode());
 		$url = rtrim($url, '/');
 
-        $response = $this->get($url);
+		$response = $this->get($url);
 
-        $this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(200, $response->getStatusCode());
 
-        $this->assertSelectorStartsWithOrEquals('ul.iso span.count', 0, '(5)');
+		$this->assertSelectorStartsWithOrEquals('ul.iso span.count', 0, '(5)');
 		$this->assertSelectorStartsWithOrEquals('ul.iso span.count', 1, '(11)');
 		$this->assertSelectorStartsWithOrEquals('ul.iso span.count', 2, '(12)');
 		$this->assertSelectorStartsWithOrEquals('ul.iso span.count', 3, '(13)');
@@ -128,11 +128,11 @@ 
 		$url = rtrim($url, '/');
 		$url .= '?ISO=400';
 
-        $response = $this->get($url);
+		$response = $this->get($url);
 
-        $this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(200, $response->getStatusCode());
 
-        // These are less than in the no facets selected case, as expected
+		// These are less than in the no facets selected case, as expected
 		$this->assertSelectorStartsWithOrEquals('ul.focal_length span.count', 0, '(2)');
 		$this->assertSelectorStartsWithOrEquals('ul.focal_length span.count', 1, '(1)');
 		$this->assertSelectorStartsWithOrEquals('ul.focal_length span.count', 2, '(2)');
@@ -176,11 +176,11 @@ 
 		$url = rtrim($url, '/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250';
 
-        $response = $this->get($url);
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		$this->assertEquals(200, $response->getStatusCode());
 
-        // These are less than in the one facet selected case, as expected
-        $this->assertSelectorStartsWithOrEquals('ul.focal_length span.count', 0, '(1)');
+		// These are less than in the one facet selected case, as expected
+		$this->assertSelectorStartsWithOrEquals('ul.focal_length span.count', 0, '(1)');
 		$this->assertSelectorStartsWithOrEquals('ul.focal_length span.count', 1, '(2)');
 		$this->assertSelectorStartsWithOrEquals('ul.aperture span.count', 0, '(1)');
 		$this->assertSelectorStartsWithOrEquals('ul.aperture span.count', 1, '(1)');
@@ -207,11 +207,11 @@ 
 		$url = rtrim($url, '/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250&Aspect=Vertical';
 
-        $response = $this->get($url);
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		$this->assertEquals(200, $response->getStatusCode());
 
-        // These are less than in the one facet selected case, as expected
-        $this->assertSelectorStartsWithOrEquals('span.count', 0, '(2)');
+		// These are less than in the one facet selected case, as expected
+		$this->assertSelectorStartsWithOrEquals('span.count', 0, '(2)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(1)');
 	}
@@ -542,13 +542,13 @@ 
 		$searchPage = $this->get($searchPageObj->URLSegment);
 		$this->assertEquals(200, $searchPage->getStatusCode());
 
-        $response = $this->submitForm("ElasticSearchForm_SearchForm", null, array(
-            'q' => 'New Zealand'
-        ));
+		$response = $this->submitForm("ElasticSearchForm_SearchForm", null, array(
+			'q' => 'New Zealand'
+		));
 
 		$url = rtrim($url, '/');
-        $this->assertEquals(302, $response->getStatusCode());
-        $this->assertEquals($url . '?q=New Zealand&sfid=testwithagg', $response->getHeader('Location'));
+		$this->assertEquals(302, $response->getStatusCode());
+		$this->assertEquals($url . '?q=New Zealand&sfid=testwithagg', $response->getHeader('Location'));
 	}
 
 

Spacing +9 added lines, -9 removed lines

@@ -243,7 +243,7 @@ 
 	public function testQueryInSearchBoxForOneFormOnly() {
 		$searchPageObj = $this->ElasticSearchPage2;
 		$url = rtrim($searchPageObj->Link(), '/');
-		$url .= "?q=Auckland&sfid=".$searchPageObj->Identifier;
+		$url .= "?q=Auckland&sfid=" . $searchPageObj->Identifier;
 		$response = $this->get($url);
 		$this->assertEquals(200, $response->getStatusCode());
 		$this->assertAttributeHasExactValue('#ElasticSearchForm_SearchForm_q', 'q',
@@ -378,7 +378,7 @@ 
 		$ctr = 0;
 
 		// results vary slightly due to sharding, hence check for a string instead of absolute results
-		while ($ctr < 18) {
+		while($ctr < 18) {
 			$this->assertSelectorContains('div.searchResult a', $ctr, 'New Orleans, Southern Pacific');
 			$ctr++;
 			$this->assertSelectorStartsWithOrEquals('div.searchResult a', $ctr, 'Similar');
@@ -397,13 +397,13 @@ 
 		$url = rtrim($searchPageObj->Link(), '/');
 		$url .= "?q=New%20Zealind&TestMode=true";
 		$response = $this->get($url);
-		error_log(print_r($response,1));
+		error_log(print_r($response, 1));
 		$this->assertEquals(200, $response->getStatusCode());
 
 		$ctr = 0;
 
 		// results vary slightly due to sharding, hence check for a string instead of absolute results
-		while ($ctr < 18) {
+		while($ctr < 18) {
 			$this->assertSelectorContains('div.searchResult a', $ctr, 'New');
 			$ctr++;
 			$this->assertSelectorStartsWithOrEquals('div.searchResult a', $ctr, 'Similar');
@@ -501,7 +501,7 @@ 
 		//Note pages need to be published, by default fixtures only reside in Stage
 		$searchPageObj = $this->ElasticSearchPage2;
 		$url = rtrim($searchPageObj->Link(), '/');
-		$url = $url.'?q='.$searchTerm;
+		$url = $url . '?q=' . $searchTerm;
 		$response = $this->get($url);
 		$this->assertEquals(200, $response->getStatusCode());
 
@@ -568,7 +568,7 @@ 
 		//Note pages need to be published, by default fixtures only reside in Stage
 		$searchPageObj = $this->ElasticSearchPage;
 		$url = rtrim($searchPageObj->Link(), '/');
-		$url = $url.'?q='.$searchTerm;
+		$url = $url . '?q=' . $searchTerm;
 		$response = $this->get($url);
 		$this->assertEquals(200, $response->getStatusCode());
 
@@ -699,18 +699,18 @@ 
 		//increase the number of results and assert that they are the same as per pages 1,2 joined
 		$searchPageObj->ResultsPerPage = 20;
 		$searchPageObj->write();
-		$searchPageObj->publish('Stage','Live');
+		$searchPageObj->publish('Stage', 'Live');
 		$response3 = $this->get($firstPageURL);
 	}
 
 
 	private function enableHighlights() {
-		foreach (SearchableField::get()->filter('Name', 'Title') as $sf) {
+		foreach(SearchableField::get()->filter('Name', 'Title') as $sf) {
 			$sf->ShowHighlights = true;
 			$sf->write();
 		}
 
-		foreach (SearchableField::get()->filter('Name', 'Content') as $sf) {
+		foreach(SearchableField::get()->filter('Name', 'Content') as $sf) {
 			$sf->ShowHighlights = true;
 			$sf->write();
 		}