mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
098be29f5b
The test_msg() calls only repeat information already present in test descriptions and check definitions, which are shown automatically if the checks fail. Remove the redundant messages to simplify the tests and their output. Here it is with all of them failing before: # check "ret == NULL" failed at t/unit-tests/t-example-decorate.c:18 # when adding a brand-new object, NULL should be returned # check "ret == NULL" failed at t/unit-tests/t-example-decorate.c:21 # when adding a brand-new object, NULL should be returned not ok 1 - Add 2 objects, one with a non-NULL decoration and one with a NULL decoration. # check "ret == &vars->decoration_a" failed at t/unit-tests/t-example-decorate.c:29 # when readding an already existing object, existing decoration should be returned # check "ret == NULL" failed at t/unit-tests/t-example-decorate.c:32 # when readding an already existing object, existing decoration should be returned not ok 2 - When re-adding an already existing object, the old decoration is returned. # check "ret == NULL" failed at t/unit-tests/t-example-decorate.c:40 # lookup should return added declaration # check "ret == &vars->decoration_b" failed at t/unit-tests/t-example-decorate.c:43 # lookup should return added declaration # check "ret == NULL" failed at t/unit-tests/t-example-decorate.c:46 # lookup for unknown object should return NULL not ok 3 - Lookup returns the added declarations, or NULL if the object was never added. # check "objects_noticed == 2" failed at t/unit-tests/t-example-decorate.c:58 # left: 1 # right: 2 # should have 2 objects not ok 4 - The user can also loop through all entries. 1..4 ... and here with the patch applied: # check "ret == NULL" failed at t/unit-tests/t-example-decorate.c:18 # check "ret == NULL" failed at t/unit-tests/t-example-decorate.c:20 not ok 1 - Add 2 objects, one with a non-NULL decoration and one with a NULL decoration. # check "ret == &vars->decoration_a" failed at t/unit-tests/t-example-decorate.c:27 # check "ret == NULL" failed at t/unit-tests/t-example-decorate.c:29 not ok 2 - When re-adding an already existing object, the old decoration is returned. # check "ret == NULL" failed at t/unit-tests/t-example-decorate.c:36 # check "ret == &vars->decoration_b" failed at t/unit-tests/t-example-decorate.c:38 # check "ret == NULL" failed at t/unit-tests/t-example-decorate.c:40 not ok 3 - Lookup returns the added declarations, or NULL if the object was never added. # check "objects_noticed == 2" failed at t/unit-tests/t-example-decorate.c:51 # left: 1 # right: 2 not ok 4 - The user can also loop through all entries. 1..4 Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
75 lines
1.9 KiB
C
75 lines
1.9 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "test-lib.h"
|
|
#include "object.h"
|
|
#include "decorate.h"
|
|
#include "repository.h"
|
|
|
|
struct test_vars {
|
|
struct object *one, *two, *three;
|
|
struct decoration n;
|
|
int decoration_a, decoration_b;
|
|
};
|
|
|
|
static void t_add(struct test_vars *vars)
|
|
{
|
|
void *ret = add_decoration(&vars->n, vars->one, &vars->decoration_a);
|
|
|
|
check(ret == NULL);
|
|
ret = add_decoration(&vars->n, vars->two, NULL);
|
|
check(ret == NULL);
|
|
}
|
|
|
|
static void t_readd(struct test_vars *vars)
|
|
{
|
|
void *ret = add_decoration(&vars->n, vars->one, NULL);
|
|
|
|
check(ret == &vars->decoration_a);
|
|
ret = add_decoration(&vars->n, vars->two, &vars->decoration_b);
|
|
check(ret == NULL);
|
|
}
|
|
|
|
static void t_lookup(struct test_vars *vars)
|
|
{
|
|
void *ret = lookup_decoration(&vars->n, vars->one);
|
|
|
|
check(ret == NULL);
|
|
ret = lookup_decoration(&vars->n, vars->two);
|
|
check(ret == &vars->decoration_b);
|
|
ret = lookup_decoration(&vars->n, vars->three);
|
|
check(ret == NULL);
|
|
}
|
|
|
|
static void t_loop(struct test_vars *vars)
|
|
{
|
|
int i, objects_noticed = 0;
|
|
|
|
for (i = 0; i < vars->n.size; i++) {
|
|
if (vars->n.entries[i].base)
|
|
objects_noticed++;
|
|
}
|
|
check_int(objects_noticed, ==, 2);
|
|
}
|
|
|
|
int cmd_main(int argc UNUSED, const char **argv UNUSED)
|
|
{
|
|
struct object_id one_oid = { { 1 } }, two_oid = { { 2 } }, three_oid = { { 3 } };
|
|
struct test_vars vars = { 0 };
|
|
|
|
vars.one = lookup_unknown_object(the_repository, &one_oid);
|
|
vars.two = lookup_unknown_object(the_repository, &two_oid);
|
|
vars.three = lookup_unknown_object(the_repository, &three_oid);
|
|
|
|
TEST(t_add(&vars),
|
|
"Add 2 objects, one with a non-NULL decoration and one with a NULL decoration.");
|
|
TEST(t_readd(&vars),
|
|
"When re-adding an already existing object, the old decoration is returned.");
|
|
TEST(t_lookup(&vars),
|
|
"Lookup returns the added declarations, or NULL if the object was never added.");
|
|
TEST(t_loop(&vars), "The user can also loop through all entries.");
|
|
|
|
clear_decoration(&vars.n, NULL);
|
|
|
|
return test_done();
|
|
}
|