From d3ce9b083f313f52ca366daa49b408a1d62f12aa Mon Sep 17 00:00:00 2001 From: rahulsainani Date: Tue, 12 Sep 2023 14:05:04 +0200 Subject: [PATCH] Bug 1852748 - Add quotes around each highlight snippet --- .../shopping/middleware/ProductAnalysisMapper.kt | 5 ++++- .../middleware/ProductAnalysisMapperTest.kt | 16 ++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt index c7dc5c026e..2cf93f3155 100644 --- a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt +++ b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt @@ -67,7 +67,7 @@ private fun Highlight.highlightsForType(highlightType: HighlightType) = HighlightType.SHIPPING -> shipping HighlightType.PACKAGING_AND_APPEARANCE -> appearance HighlightType.COMPETITIVENESS -> competitiveness - } + }?.map { it.surroundWithQuotes() } /** * GeckoView sets 0.0 as default instead of null for adjusted rating. This maps 0.0 to null making @@ -80,3 +80,6 @@ private fun Double.toFloatOrNull(): Float? = } else { toFloat() } + +private fun String.surroundWithQuotes(): String = + "\"$this\"" diff --git a/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt b/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt index 5fcae36341..5bc5470da8 100644 --- a/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt +++ b/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt @@ -38,11 +38,11 @@ class ProductAnalysisMapperTest { adjustedRating = 3.4f, productUrl = "https://example.com", highlights = sortedMapOf( - HighlightType.QUALITY to listOf("quality"), - HighlightType.PRICE to listOf("price"), - HighlightType.SHIPPING to listOf("shipping"), - HighlightType.PACKAGING_AND_APPEARANCE to listOf("appearance"), - HighlightType.COMPETITIVENESS to listOf("competitiveness"), + HighlightType.QUALITY to listOf("\"quality\""), + HighlightType.PRICE to listOf("\"price\""), + HighlightType.SHIPPING to listOf("\"shipping\""), + HighlightType.PACKAGING_AND_APPEARANCE to listOf("\"appearance\""), + HighlightType.COMPETITIVENESS to listOf("\"competitiveness\""), ), ) @@ -73,9 +73,9 @@ class ProductAnalysisMapperTest { adjustedRating = 3.4f, productUrl = "https://example.com", highlights = sortedMapOf( - HighlightType.QUALITY to listOf("quality"), - HighlightType.PACKAGING_AND_APPEARANCE to listOf("appearance"), - HighlightType.COMPETITIVENESS to listOf("competitiveness"), + HighlightType.QUALITY to listOf("\"quality\""), + HighlightType.PACKAGING_AND_APPEARANCE to listOf("\"appearance\""), + HighlightType.COMPETITIVENESS to listOf("\"competitiveness\""), ), )