From 77333b27e89a35696c27964862ce164d277d9ebb Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Mon, 17 Sep 2018 10:07:13 +1200 Subject: Fix "not empty" condition in SegmentExpression (#13386) (#13431) * Fix "not empty" condition in SegmentExpression (#13386) * Fix "not empty" condition in SegmentExpression * fix tests * update expected values in AutoSuggestAPITest, SegmentTest * fix some tests * fix more tests --- core/Segment/SegmentExpression.php | 4 +- ...irstVisit__API.getSuggestedValuesForSegment.xml | 1 - ...erceOrder__API.getSuggestedValuesForSegment.xml | 1 - ...LastVisit__API.getSuggestedValuesForSegment.xml | 1 - ...viceBrand__API.getSuggestedValuesForSegment.xml | 1 - ...PITest_deviceBrand__VisitsSummary.get_range.xml | 16 +-- ...st_events__API.getSuggestedValuesForSegment.xml | 1 - ...gestAPITest_events__VisitsSummary.get_range.xml | 18 +-- ..._searches__API.getSuggestedValuesForSegment.xml | 1 - ...stAPITest_searches__VisitsSummary.get_range.xml | 18 +-- ...tDuration__API.getSuggestedValuesForSegment.xml | 1 - ...Test_visitDuration__VisitsSummary.get_range.xml | 18 +-- ...erverHour__API.getSuggestedValuesForSegment.xml | 1 - ...st_visitServerHour__VisitsSummary.get_range.xml | 18 +-- ...eduledReports.generateReport_week.original.html | 156 ++++++++++----------- ...eduledReports.generateReport_week.original.html | 156 ++++++++++----------- tests/PHPUnit/Integration/SegmentTest.php | 12 +- ...duledReports.generateReport_month.original.html | 150 ++++++++++---------- ...duledReports.generateReport_month.original.html | 150 ++++++++++---------- 19 files changed, 358 insertions(+), 366 deletions(-) diff --git a/core/Segment/SegmentExpression.php b/core/Segment/SegmentExpression.php index 40eea9581f..ffade291be 100644 --- a/core/Segment/SegmentExpression.php +++ b/core/Segment/SegmentExpression.php @@ -263,12 +263,12 @@ class SegmentExpression break; case self::MATCH_IS_NOT_NULL_NOR_EMPTY: - $sqlMatch = '%s IS NOT NULL AND (%s <> \'\' OR %s = 0)'; + $sqlMatch = '%s IS NOT NULL AND %s <> \'\' AND %s <> \'0\''; $value = null; break; case self::MATCH_IS_NULL_OR_EMPTY: - $sqlMatch = '%s IS NULL OR %s = \'\' '; + $sqlMatch = '%s IS NULL OR %s = \'\' OR %s = \'0\''; $value = null; break; diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml index 487ce13284..90545e08bf 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml @@ -2,5 +2,4 @@ 100 101 - 0 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml index ab150e6b32..73d5727246 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml @@ -2,5 +2,4 @@ 50 51 - 0 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml index 9a04ddc8c8..497af1a4a5 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml @@ -2,5 +2,4 @@ 10 11 - 0 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml index 981ff8e068..1eb076ac56 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml @@ -1,6 +1,5 @@ - Unknown Dell Google HTC diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml index e5851e11e6..0e04d3f6d9 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ - 25 - 67 - 25 - 13 - 19452 + 2 + 6 + 2 + 1 + 1621 5 - 52% - 2.7 - 778 + 50% + 3 + 811 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml index 727df89075..70bdb9e417 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml @@ -1,5 +1,4 @@ - 0 1 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml index 7ace3fcbe7..eb20b7dcf9 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ - 18 - 18 - 18 - 18 - 0 - 1 - 100% - 1 - 0 + 17 + 77 + 17 + 0 + 27557 + 5 + 0% + 4.5 + 1621 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml index 727df89075..70bdb9e417 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml @@ -1,5 +1,4 @@ - 0 1 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml index 7c9bf3fd36..125518f3a5 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ - 26 - 50 - 26 - 18 - 12968 - 4 - 69% - 1.9 - 499 + 9 + 45 + 9 + 0 + 14589 + 5 + 0% + 5 + 1621 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml index 829f7602ef..1d39a66637 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml @@ -1,5 +1,4 @@ - 0 1621 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml index 7ace3fcbe7..eb20b7dcf9 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ - 18 - 18 - 18 - 18 - 0 - 1 - 100% - 1 - 0 + 17 + 77 + 17 + 0 + 27557 + 5 + 0% + 4.5 + 1621 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml index 727df89075..70bdb9e417 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml @@ -1,5 +1,4 @@ - 0 1 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml index 7ace3fcbe7..eb20b7dcf9 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ - 18 - 18 - 18 - 18 - 0 - 1 - 100% - 1 - 0 + 17 + 77 + 17 + 0 + 27557 + 5 + 0% + 4.5 + 1621 \ No newline at end of file diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 9fc9a7301a..b1fedf85f1 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -44,377 +44,377 @@