refactoring

osmandapp · Dec 29, 2024 · 0c56dd0 · 0c56dd0
1 parent cfcffe9
commit 0c56dd0
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 20 deletions.
diff --git a/.../test/java/net/osmand/plus/settings/fragments/search/SettingsSearchParameterizedTest.java b/.../test/java/net/osmand/plus/settings/fragments/search/SettingsSearchParameterizedTest.java
@@ -102,9 +102,21 @@ public static Iterable<Object[]> data() {
 
 						{
 								"search_ApplicationMode_find_SelectCopyAppModeBottomSheet",
-								searchQueryAndResult(
-										context -> ApplicationMode.PEDESTRIAN.toHumanString(),
-										context -> List.of(String.format("Path: Driving > %s", context.getString(R.string.copy_from_other_profile))))
+								new SettingsSearchTestTemplate() {
+
+									@Override
+									protected String getSearchQuery(final Context context1) {
+										return ApplicationMode.PEDESTRIAN.toHumanString();
+									}
+
+									@Override
+									protected List<String> getExpectedSearchResults(final Context context) {
+										return List.of(
+												String.format(
+														"Path: Driving > %s",
+														context.getString(R.string.copy_from_other_profile)));
+									}
+								}
 						},
 
 						{

diff --git a/OsmAnd/test/java/net/osmand/plus/settings/fragments/search/SettingsSearchTestFactory.java b/OsmAnd/test/java/net/osmand/plus/settings/fragments/search/SettingsSearchTestFactory.java
@@ -10,9 +10,7 @@
 // FK-TODO: inline methods
 class SettingsSearchTestFactory {
 
-	public static SettingsSearchTest searchQueryAndResult(
-			final Function<Context, String> searchQueryProvider,
-			final Function<Context, List<String>> searchResultsProvider) {
+	public static SettingsSearchTest searchQueryAndResult(final Function<Context, String> searchQueryProvider) {
 		return new SettingsSearchTestTemplate() {
 
 			@Override
@@ -22,46 +20,53 @@ protected String getSearchQuery(final Context context) {
 
 			@Override
 			protected List<String> getExpectedSearchResults(final Context context) {
-				return searchResultsProvider.apply(context);
+				return List.of(searchQueryProvider.apply(context));
 			}
 		};
 	}
 
-	public static SettingsSearchTest searchQueryAndResult(final Function<Context, String> searchQueryProvider) {
+	public static SettingsSearchTest searchQueryAndResult(final @StringRes int queryId, final @StringRes int resultId) {
 		return new SettingsSearchTestTemplate() {
 
 			@Override
 			protected String getSearchQuery(final Context context) {
-				return searchQueryProvider.apply(context);
+				return context.getString(queryId);
 			}
 
 			@Override
 			protected List<String> getExpectedSearchResults(final Context context) {
-				return List.of(searchQueryProvider.apply(context));
+				return List.of(context.getString(resultId));
 			}
 		};
 	}
 
-	public static SettingsSearchTest searchQueryAndResult(final @StringRes int queryId, final @StringRes int resultId) {
+	public static SettingsSearchTest searchQueryAndResult(final @StringRes int id) {
 		return new SettingsSearchTestTemplate() {
 
 			@Override
-			protected String getSearchQuery(final Context context) {
-				return context.getString(queryId);
+			protected String getSearchQuery(final Context context1) {
+				return context1.getString(id);
 			}
 
 			@Override
-			protected List<String> getExpectedSearchResults(final Context context) {
-				return List.of(context.getString(resultId));
+			protected List<String> getExpectedSearchResults(final Context context1) {
+				return List.of(context1.getString(id));
 			}
 		};
 	}
 
-	public static SettingsSearchTest searchQueryAndResult(final @StringRes int id) {
-		return searchQueryAndResult(context -> context.getString(id));
-	}
-
 	public static SettingsSearchTest searchQueryAndResult(final String str) {
-		return searchQueryAndResult(context -> str);
+		return new SettingsSearchTestTemplate() {
+
+			@Override
+			protected String getSearchQuery(final Context context1) {
+				return str;
+			}
+
+			@Override
+			protected List<String> getExpectedSearchResults(final Context context1) {
+				return List.of(str);
+			}
+		};
 	}
 }