Test verifies that ROP search results are cached and reused on subsequent searches

Author: devalgupta404

test/unit/test_rop.c

@@ -141,35 +141,47 @@ bool test_rz_direct_solver() {
 	mu_end;
 }
 
-bool test_rop_cache() {
-	RzCore *core = setup_rz_core("x86", 64);
-	mu_assert_notnull(core, "setup_rz_core failed");
+
+bool test_rop_cache(void) {
+	RzCore *core = rz_core_new();
+	mu_assert_notnull(core, "core");
+
+	RzCoreFile *cf = rz_core_file_open(core, "bins/elf/analysis/hello-linux-x86_64", RZ_PERM_RX, 0);
+	mu_assert_notnull(cf, "open file");
+	rz_core_bin_load(core, NULL, 0);
 	rz_config_set_b(core->config, "rop.cache", true);
 
-	const char *greparg = "mov";
-	const char *expected = "0x00000000: mov rbx, 1; ret;\n";
-	ut64 cache_key = rz_str_djb2_hash(greparg);
+	const char *filter = "ret";
+	ut64 key = rz_str_djb2_hash(filter);
 
-	core->analysis->ht_rop = ht_up_new(NULL, free);
-	ht_up_insert(core->analysis->ht_rop, cache_key, strdup(expected));
-	char *cached = ht_up_find(core->analysis->ht_rop, cache_key, NULL);
-	mu_assert_streq(cached, expected, "cache store failed");
+	RzCmdStateOutput state;
+	rz_cmd_state_output_init(&state, RZ_OUTPUT_MODE_QUIET);
 
-	rz_cons_new();
 	RzRopSearchContext *ctx = rz_core_rop_search_context_new(
-		core, greparg, false, RZ_ROP_GADGET_PRINT, RZ_ROP_DETAIL_SEARCH_NON, NULL);
+		core, filter, false, RZ_ROP_GADGET_PRINT, RZ_ROP_DETAIL_SEARCH_NON, &state);
+	rz_core_rop_search(core, ctx);
+	rz_core_rop_search_context_free(ctx);
+
+	mu_assert_notnull(core->analysis->ht_rop, "ht_rop");
+	char *result = ht_up_find(core->analysis->ht_rop, key, NULL);
+	mu_assert_notnull(result, "cached result");
+
+	ctx = rz_core_rop_search_context_new(
+		core, filter, false, RZ_ROP_GADGET_PRINT, RZ_ROP_DETAIL_SEARCH_NON, &state);
 	rz_core_rop_search(core, ctx);
 	rz_core_rop_search_context_free(ctx);
-	mu_assert_streq(rz_cons_get_buffer(), expected, "cache retrieval failed");
-	rz_cons_free();
 
+	char *result2 = ht_up_find(core->analysis->ht_rop, key, NULL);
+	mu_assert_ptreq(result2, result, "cache hit");
+
+	rz_cmd_state_output_fini(&state);
 	rz_core_free(core);
 	mu_end;
 }
 
 bool all_tests() {
-	mu_run_test(test_rz_direct_solver);
 	mu_run_test(test_rop_cache);
+	mu_run_test(test_rz_direct_solver);
 	return tests_passed != tests_run;
 }