commit ede78929bedd695e06a0c30839b9a561b5d6bc9c
from: Neels Hofmeyr <neels@hofmeyr.de>
date: Fri Nov 06 02:12:56 2020 UTC

results_test: fix output: print atom indexes, not file pos

commit - e638575c9295479520dc4db9d23e22c18d61f3fb
commit + ede78929bedd695e06a0c30839b9a561b5d6bc9c
blob - b15d76376408eb269b5923d31ea25786806b8dc1
blob + 9d083f161b0fd36d88753bff7631930a8bbf2e74
--- test/expect.results_test
+++ test/expect.results_test
@@ -1,12 +1,12 @@
 
 --- test_minus_after_plus()
 [0] same lines L2 R2 @L 0 @R 0
-[1] minus lines L3 R0 @L 4 @R 10
-[2] plus lines L0 R3 @L 4 @R 4
-[3] same lines L2 R2 @L 10 @R 10
+[1] minus lines L3 R0 @L 2 @R 2
+[2] plus lines L0 R3 @L 5 @R 2
+[3] same lines L2 R2 @L 5 @R 5
 
 --- test_plus_after_plus()
 [0] same lines L2 R2 @L 0 @R 0
-[1] minus lines L3 R0 @L 4 @R 4
-[2] plus lines L0 R3 @L 10 @R 4
-[3] same lines L2 R2 @L 10 @R 10
+[1] minus lines L3 R0 @L 2 @R 2
+[2] plus lines L0 R3 @L 5 @R 2
+[3] same lines L2 R2 @L 5 @R 5
blob - 880049e35da7795925a98b663edc4f56435ce549
blob + 02856a39c24900c89309c34a58b350fb641cb9e8
--- test/results_test.c
+++ test/results_test.c
@@ -23,12 +23,12 @@ void test_minus_after_plus(void)
 	d_left = (struct diff_data){
 		.data = left_data,
 		.len = strlen(left_data),
-		.root = result->left,
+		.root = &d_left,
 	};
 	d_right = (struct diff_data){
 		.data = right_data,
 		.len = strlen(right_data),
-		.root = result->right,
+		.root = &d_right,
 	};
 	*result = (struct diff_result) {
 		.left = &d_left,
@@ -79,8 +79,8 @@ void test_minus_after_plus(void)
 			   (t == CHUNK_SAME ? "same" : "?"))),
 		      c->left_count,
 		      c->right_count,
-		      (long long)(c->left_start ? c->left_start->pos : -1LL),
-		      (long long)(c->right_start ? c->right_start->pos : -1LL));
+		      (long long)(c->left_start ? diff_atom_root_idx(result->left, c->left_start) : -1LL),
+		      (long long)(c->right_start ? diff_atom_root_idx(result->right, c->right_start) : -1LL));
 	}
 
 	diff_result_free(result);
@@ -101,12 +101,12 @@ void test_plus_after_plus(void)
 	d_left = (struct diff_data){
 		.data = left_data,
 		.len = strlen(left_data),
-		.root = result->left,
+		.root = &d_left,
 	};
 	d_right = (struct diff_data){
 		.data = right_data,
 		.len = strlen(right_data),
-		.root = result->right,
+		.root = &d_right,
 	};
 	*result = (struct diff_result) {
 		.left = &d_left,
@@ -161,8 +161,8 @@ void test_plus_after_plus(void)
 			(t == CHUNK_SAME ? "same" : "?"))),
 		      c->left_count,
 		      c->right_count,
-		      (long long)(c->left_start ? c->left_start->pos : -1LL),
-		      (long long)(c->right_start ? c->right_start->pos : -1LL));
+		      (long long)(c->left_start ? diff_atom_root_idx(result->left, c->left_start) : -1LL),
+		      (long long)(c->right_start ? diff_atom_root_idx(result->right, c->right_start) : -1LL));
 	}
 
 	diff_result_free(result);