Improved tests using restrictions and extended parameters where necessary

Author: fjwillemsen

test/strategies/test_diff_evo.py

@@ -172,8 +172,14 @@ def check_result(result, expected):
 
 @pytest.mark.parametrize("method", supported_methods)
 def test_diff_evo(vector_add, method):
+    restrictions = [
+        "test_string == 'alg_2'", 
+        "test_bool == True", 
+        "test_mixed == 2.45"
+    ]
     result, _ = tune_kernel(
         *vector_add,
+        restrictions=restrictions,
         strategy="diff_evo",
         strategy_options=dict(popsize=5, method=method),
         verbose=True,

test/strategies/test_strategies.py

@@ -125,9 +125,9 @@ def test_strategies(vector_add, strategy):
             assert isinstance(res[expected_key], expected_type)
 
     # check if strategy respects user-specified starting point (x0)
-    x0 = [256]
+    x0 = [256, 'alg_2', 15, True, 2.45]
     filter_options["x0"] = x0
-    if not strategy in ["brute_force", "random_sample", "bayes_opt"]:
+    if not strategy in ["brute_force", "random_sample", "bayes_opt", "pyatf_strategies"]:
         results, _ = kernel_tuner.tune_kernel(*vector_add, restrictions=restrictions, strategy=strategy, strategy_options=filter_options,
                                             verbose=False, cache=cache_filename, simulation_mode=True)
         assert results[0]["block_size_x"] == x0[0]