binary diff: test binary blob to blob tests
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138
diff --git a/tests/diff/binary.c b/tests/diff/binary.c
index 136c42c..7fac1c5 100644
--- a/tests/diff/binary.c
+++ b/tests/diff/binary.c
@@ -360,3 +360,133 @@ void test_diff_binary__print_patch_from_diff(void)
git_diff_free(diff);
git_index_free(index);
}
+
+struct diff_data {
+ char *old_path;
+ git_oid old_id;
+ git_buf old_binary_base85;
+ size_t old_binary_inflatedlen;
+ git_diff_binary_t old_binary_type;
+
+ char *new_path;
+ git_oid new_id;
+ git_buf new_binary_base85;
+ size_t new_binary_inflatedlen;
+ git_diff_binary_t new_binary_type;
+};
+
+static int file_cb(
+ const git_diff_delta *delta,
+ float progress,
+ void *payload)
+{
+ struct diff_data *diff_data = payload;
+
+ if (delta->old_file.path)
+ diff_data->old_path = git__strdup(delta->old_file.path);
+
+ if (delta->new_file.path)
+ diff_data->new_path = git__strdup(delta->new_file.path);
+
+ git_oid_cpy(&diff_data->old_id, &delta->old_file.id);
+ git_oid_cpy(&diff_data->new_id, &delta->new_file.id);
+
+ return 0;
+}
+
+static int binary_cb(
+ const git_diff_delta *delta,
+ const git_diff_binary *binary,
+ void *payload)
+{
+ struct diff_data *diff_data = payload;
+
+ git_buf_encode_base85(&diff_data->old_binary_base85,
+ binary->old_file.data, binary->old_file.datalen);
+ diff_data->old_binary_inflatedlen = binary->old_file.inflatedlen;
+ diff_data->old_binary_type = binary->old_file.type;
+
+ git_buf_encode_base85(&diff_data->new_binary_base85,
+ binary->new_file.data, binary->new_file.datalen);
+ diff_data->new_binary_inflatedlen = binary->new_file.inflatedlen;
+ diff_data->new_binary_type = binary->new_file.type;
+
+ return 0;
+}
+
+static int hunk_cb(
+ const git_diff_delta *delta,
+ const git_diff_hunk *hunk,
+ void *payload)
+{
+ cl_fail("did not expect hunk callback");
+ return 0;
+}
+
+static int line_cb(
+ const git_diff_delta *delta,
+ const git_diff_hunk *hunk,
+ const git_diff_line *line,
+ void *payload)
+{
+ cl_fail("did not expect line callback");
+ return 0;
+}
+
+void test_diff_binary__blob_to_blob(void)
+{
+ git_index *index;
+ git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
+ git_blob *old_blob, *new_blob;
+ git_oid old_id, new_id;
+ struct diff_data diff_data = {0};
+ const char *expected =
+ "diff --git a/untimely.txt b/untimely.txt\n" \
+ "index 9a69d960ae94b060f56c2a8702545e2bb1abb935..1111d4f11f4b35bf6759e0fb714fe09731ef0840 100644\n" \
+ "GIT binary patch\n" \
+ "delta 32\n" \
+ "nc%1vf+QYWt3zLL@hC)e3Vu?a>QDRl4f_G*?PG(-ZA}<#J$+QbW\n" \
+ "\n" \
+ "delta 7\n" \
+ "Oc%18D`@*{63ljhg(E~C7\n";
+
+ opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
+ opts.id_abbrev = GIT_OID_HEXSZ;
+
+ repo = cl_git_sandbox_init("renames");
+ cl_git_pass(git_repository_index(&index, repo));
+
+ cl_git_append2file("renames/untimely.txt", "Oh that crazy Kipling!\r\n");
+ cl_git_pass(git_index_add_bypath(index, "untimely.txt"));
+ cl_git_pass(git_index_write(index));
+
+ git_oid_fromstr(&old_id, "9a69d960ae94b060f56c2a8702545e2bb1abb935");
+ git_oid_fromstr(&new_id, "1111d4f11f4b35bf6759e0fb714fe09731ef0840");
+
+ cl_git_pass(git_blob_lookup(&old_blob, repo, &old_id));
+ cl_git_pass(git_blob_lookup(&new_blob, repo, &new_id));
+
+ cl_git_pass(git_diff_blobs(old_blob,
+ "untimely.txt", new_blob, "untimely.txt", &opts,
+ file_cb, binary_cb, hunk_cb, line_cb, &diff_data));
+
+ cl_assert_equal_s("untimely.txt", diff_data.old_path);
+ cl_assert_equal_oid(&old_id, &diff_data.old_id);
+ cl_assert_equal_i(GIT_DIFF_BINARY_DELTA, diff_data.old_binary_type);
+ cl_assert_equal_i(7, diff_data.old_binary_inflatedlen);
+ cl_assert_equal_s("c%18D`@*{63ljhg(E~C7",
+ diff_data.old_binary_base85.ptr);
+
+ cl_assert_equal_s("untimely.txt", diff_data.new_path);
+ cl_assert_equal_oid(&new_id, &diff_data.new_id);
+ cl_assert_equal_i(GIT_DIFF_BINARY_DELTA, diff_data.new_binary_type);
+ cl_assert_equal_i(32, diff_data.new_binary_inflatedlen);
+ cl_assert_equal_s("c%1vf+QYWt3zLL@hC)e3Vu?a>QDRl4f_G*?PG(-ZA}<#J$+QbW",
+ diff_data.new_binary_base85.ptr);
+
+ git_blob_free(old_blob);
+ git_blob_free(new_blob);
+
+ git__free(diff_data.old_path);
+ git__free(diff_data.new_path);
+}