Skip to content
Extraits de code Groupes Projets
Valider 966fb421 rédigé par mattab's avatar mattab
Parcourir les fichiers

Fix test

parent 04e3b93f
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
tests/PHPUnit/Integration/SegmentTest.php
+ 16
− 16
Voir le fichier @ 966fb421
......@@ -36,11 +36,11 @@ class SegmentTest extends IntegrationTestCase
parent::tearDown();
}
protected function _filterWhitsSpaces($valueToFilter)
protected function _filterWhiteSpaces($valueToFilter)
{
if (is_array($valueToFilter)) {
foreach ($valueToFilter as $key => $value) {
$valueToFilter[$key] = $this->_filterWhitsSpaces($value);
$valueToFilter[$key] = $this->_filterWhiteSpaces($value);
}
return $valueToFilter;
} else {
......@@ -117,11 +117,11 @@ class SegmentTest extends IntegrationTestCase
$segment = new Segment($segment, $idSites = array());
$sql = $segment->getSelectQuery($select, $from, false);
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($sql));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($sql));
// calling twice should give same results
$sql = $segment->getSelectQuery($select, array($from));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($sql));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($sql));
$this->assertEquals(32, strlen($segment->getHash()));
}
......@@ -150,7 +150,7 @@ class SegmentTest extends IntegrationTestCase
( log_visit.custom_var_k1 = ? AND log_visit.visitor_returning = ? )",
"bind" => array(1, 'Test', 0));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($query));
}
public function test_getSelectQuery_whenJoinVisitOnAction()
......@@ -178,7 +178,7 @@ class SegmentTest extends IntegrationTestCase
( log_link_visit_action.custom_var_k1 = ? AND log_visit.visitor_returning = ? )",
"bind" => array(1, 'Test', 0));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($query));
}
public function test_getSelectQuery_whenJoinActionOnVisit()
......@@ -214,7 +214,7 @@ class SegmentTest extends IntegrationTestCase
) AS log_inner",
"bind" => array(1, 'Test', 0));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($query));
}
public function test_getSelectQuery_whenJoinConversionOnAction()
......@@ -242,7 +242,7 @@ class SegmentTest extends IntegrationTestCase
( log_link_visit_action.custom_var_k1 = ? AND log_conversion.idgoal = ? AND log_link_visit_action.custom_var_k2 = ? )",
"bind" => array(1, 'Test', 1, 'Test2'));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($query));
}
public function test_getSelectQuery_whenJoinActionOnConversion()
......@@ -270,7 +270,7 @@ class SegmentTest extends IntegrationTestCase
( ( log_conversion.idgoal IS NULL OR log_conversion.idgoal <> ? ) AND log_link_visit_action.custom_var_k1 = ? AND log_conversion.idgoal = ? )",
"bind" => array(1, 2, 'Test', 1));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($query));
}
public function test_getSelectQuery_whenJoinConversionOnVisit()
......@@ -305,7 +305,7 @@ class SegmentTest extends IntegrationTestCase
) AS log_inner",
"bind" => array(1, 1));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($query));
}
public function test_getSelectQuery_whenJoinConversionOnly()
......@@ -332,7 +332,7 @@ class SegmentTest extends IntegrationTestCase
( log_conversion.idgoal = ? )",
"bind" => array(1, 1));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($query));
}
public function test_getSelectQuery_whenJoinVisitOnConversion()
......@@ -360,7 +360,7 @@ class SegmentTest extends IntegrationTestCase
( (log_conversion.idgoal = ? OR HOUR(log_visit.visit_last_action_time) = ? ))",
"bind" => array(1, 1, 12));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($query));
}
/**
......@@ -391,7 +391,7 @@ class SegmentTest extends IntegrationTestCase
HOUR(log_visit.visit_last_action_time) = ? AND log_conversion.idgoal = ? ",
"bind" => array(12, 1));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($query));
}
/**
......@@ -429,7 +429,7 @@ class SegmentTest extends IntegrationTestCase
) AS log_inner",
"bind" => array(1, 12, 'Test'));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($query));
}
/**
......@@ -477,7 +477,7 @@ class SegmentTest extends IntegrationTestCase
$expected = array(
"sql" => "
SELECT
sum(log_visit.visit_total_time) as sum_visit_length
sum(log_inner.visit_total_time) as sum_visit_length
FROM
(
SELECT
......@@ -496,6 +496,6 @@ class SegmentTest extends IntegrationTestCase
LIMIT 33",
"bind" => array(1, 'Test'));
$this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
$this->assertEquals($this->_filterWhiteSpaces($expected), $this->_filterWhiteSpaces($query));
}
}
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter