Fix unit/test_diff.c

ampotos · Sep 15, 2017 · 64cd6f2 · 64cd6f2
1 parent 4e88e0c
commit 64cd6f2
Showing 1 changed file with 41 additions and 87 deletions.
diff --git a/unit/test_diff.c b/unit/test_diff.c
@@ -3,102 +3,56 @@
 #include "minunit.h"
 
 static struct {
-	const ut8 *a, *b;
-	int distance;
+	const ut8 *a;
+	const ut8 *b;
+	int di_distance;
+	int dis_distance;
 } tests[] = {
-	{"wallaby", "wallet", 3 /* two replacements, one add */},
-	{"foo", "foobar", 3},
+	{"", "zzz", 3, 3},
+	{"meow", "", 4, 4},
+	{"a", "b", 2, 1},
+	{"aaa", "aaa", 0, 0},
+	{"aaaaa", "aabaa", 2, 1},
+	{"aaaa", "aabaa", 1, 1},
+	{"aaba", "babca", 3, 2},
+	{"foo", "foobar", 3, 3},
+	{"wallaby", "wallet", 5, 3},
 	{"identity", "identity", 0},
-#if 0
-	/* FAILS the symmetry test for case 5: 
-	   levenstein and distance
-	   distance a-b != distance b-a */
-	{"lolinongogonon", "lingon", 2*4},
-#endif
-	/* special cases: -1 for fails to compare */
-	{"", "empty", -1},
-	{NULL, "missing", -1},
-	{NULL, NULL, -1},
 };
-static const int testcount = sizeof(tests)/sizeof(tests[0]);
-
-enum {
-	LEVENSTEIN, SIMILARITY, DISTANCE, SWAPPED,
-	TESTBITS_END
-};
-
 
 bool test_r_diff_buffers_distance(void) {
-	char message[1024];
-	int i, j;
-
-	for (i=0; i<testcount; i++) {
-		int la=0, lb=0;
-
-		if (tests[i].a)
-			la = strlen(tests[i].a);
-		if (tests[i].b)
-			lb = strlen(tests[i].b);
+	char msg[128];
+	RDiff *diff = r_diff_new();
+	int i, distance;
 
-		for (j=0; j < 1<<TESTBITS_END; j++) {
-			const ut8 *pa, *pb;
-			int pla, plb;
-
-			ut32 distance = 0xdeadbeef, *pd;
-			double similarity = NAN, *ps;
-			bool result;
-
-			RDiff *rdiff = r_diff_new();
-			rdiff->levenstein = ! ! (j & (1<<LEVENSTEIN));
-			if (j & (1<<SWAPPED)) {
-				pa = tests[i].b;
-				pb = tests[i].a;
-				pla = lb;
-				plb = la;
-			} else {
-				pa = tests[i].a;
-				pb = tests[i].b;
-				pla = la;
-				plb = lb;
-			}
-			pd = j & (1<<DISTANCE) ? &distance : NULL;
-			ps = j & (1<<SIMILARITY) ? &similarity : NULL;
-#if 0
-			printf("Test run %d %x: args %p %d %p %d %p %p\n",
-			       i, j, pa, pla, pb, plb, pd, ps);
-#endif
+	// Levenshtein edit distance (deletion/insertion/substitution)
+	diff->type = '\0';
+	for (i = 0; i < R_ARRAY_SIZE (tests); i++) {
+		size_t la = strlen (tests[i].a), lb = strlen (tests[i].b);
+		r_diff_buffers_distance (diff, tests[i].a, la, tests[i].b, lb, &distance, NULL);
+		snprintf (msg, sizeof msg, "original %s/%s distance", tests[i].a, tests[i].b);
+		mu_assert_eq (distance, tests[i].dis_distance, msg);
+	}
 
-			result = r_diff_buffers_distance(rdiff,
-							 pa, pla,
-							 pb, plb,
-							 pd, ps);
+	// Broken r_diff_buffers_distance_levenshtein, uncomment and see why it is incorrect
+	// diff->type = 'l';
+	// for (i = 0; i < R_ARRAY_SIZE (tests); i++) {
+	// 	size_t la = strlen (tests[i].a), lb = strlen (tests[i].b);
+	// 	r_diff_buffers_distance (diff, tests[i].a, la, tests[i].b, lb, &distance, NULL);
+	// 	snprintf (msg, sizeof msg, "levenshtein %s/%s distance", tests[i].a, tests[i].b);
+	// 	mu_assert_eq (distance, tests[i].dis_distance, msg);
+	// }
 
-			if (tests[i].distance >= 0) {
-				sprintf(message, "%s case %d/%x, return value", __FUNCTION__, i, j);
-				mu_assert_eq(result, true, message);
-				if (j & (1<<DISTANCE)) {
-					sprintf(message, "%s case %d/%x, distance",
-						__FUNCTION__, i, j);
-					mu_assert_eq(distance, tests[i].distance, message);
-				}
-				if (j & (1<<SIMILARITY) && pla && plb) {
-					/* Note: could fail from precision errors? */
-					double ref_similarity = 1.0 -
-						(double)tests[i].distance / 
-						R_MAX(pla,plb);
-					sprintf(message,
-						"%s case %d/%x, similarity, expected %g got %g",
-						__FUNCTION__, i, j, ref_similarity, similarity);
-					mu_assert(similarity==ref_similarity, message);
-				}
-			} else {
-				sprintf(message, "%s case %d/%x, return value", __FUNCTION__, i, j);
-				mu_assert_eq(result, false, message);
-			}
-
-			r_diff_free(rdiff);
-		}
+	// Eugene W. Myers' O(ND) diff algorithm, deletion/insertion edit distance
+	diff->type = 'm';
+	for (i = 0; i < R_ARRAY_SIZE (tests); i++) {
+		size_t la = strlen (tests[i].a), lb = strlen (tests[i].b);
+		r_diff_buffers_distance (diff, tests[i].a, la, tests[i].b, lb, &distance, NULL);
+		snprintf (msg, sizeof msg, "myers %s/%s distance", tests[i].a, tests[i].b);
+		mu_assert_eq (distance, tests[i].di_distance, msg);
 	}
+
+	r_diff_free (diff);
 	mu_end;
 }