Skip to content

Commit

Permalink
Fixed bug in test suite.
Browse files Browse the repository at this point in the history
  • Loading branch information
@matejchalk
matejchalk committed Jul 24, 2015
1 parent 3559905 commit 69c74c2
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 38 deletions.
5 changes: 4 additions & 1 deletion drpm.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Name: drpm
Version: 0.2.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A small library for fetching information from deltarpm packages
License: LGPLv3+
URL: http://fedorahosted.org/%{name}
Expand Down Expand Up @@ -56,6 +56,9 @@ make check %{?_smp_mflags}
%{_libdir}/pkgconfig/drpm.pc

%changelog
* Fri Jul 24 2015 Matej Chalk <mchalk@redhat.com> 0.2.0-2
- Fixed bug in test suite

* Tue Jun 23 2015 Matej Chalk <mchalk@redhat.com> 0.2.0-1
- Bumped minor version

Expand Down
10 changes: 5 additions & 5 deletions src/drpm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ int drpm_read(drpm **delta, const char *filename);
* @brief Fetches information representable as an unsigned integer.
*
* Fetches information identified by @p tag from @p delta and copies it
* to adress pointed to by @p target.
* to address pointed to by @p target.
*
* Example of usage:
* @code
Expand Down Expand Up @@ -145,7 +145,7 @@ int drpm_get_uint(drpm *delta, int tag, unsigned *target);
* @brief Fetches information representable as an unsigned long integer.
*
* Fetches information identified by @p tag from @p delta and copies it
* to adress pointed to by @p target.
* to address pointed to by @p target.
*
* Example of usage:
* @code
Expand Down Expand Up @@ -180,7 +180,7 @@ int drpm_get_ulong(drpm *delta, int tag, unsigned long *target);
* @brief Fetches information representable as an unsigned long long integer.
*
* Fetches information identified by @p tag from @p delta and copies it
* to adress pointed to by @p target.
* to address pointed to by @p target.
*
* Example of usage:
* @code
Expand Down Expand Up @@ -218,7 +218,7 @@ int drpm_get_ullong(drpm *delta, int tag, unsigned long long *target);
*
* Fetches string-type information identified by @p tag from @p delta,
* copies it to space previously allocated by the function itself and
* saves the adress to @p *target.
* saves the address to @p *target.
*
* Example of usage:
* @code
Expand Down Expand Up @@ -257,7 +257,7 @@ int drpm_get_string(drpm *delta, int tag, char **target);
*
* Fetches information identified by @p tag from @p delta,
* copies it to space previously allocated by the function itself,
* saves the adress to @p *target and stores size in @p *size.
* saves the address to @p *target and stores size in @p *size.
*
* Example of usage:
* @code
Expand Down
64 changes: 32 additions & 32 deletions test/drpm_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ int __real_compstrm_destroy(struct compstrm **);

struct delta_meta {
drpm *delta;
uint16_t version;
uint16_t type;
uint16_t comp;
uint16_t tgt_comp;
uint32_t tgt_size;
uint32_t tgt_header_len;
uint32_t payload_fmt_off;
unsigned version;
unsigned type;
unsigned comp;
unsigned tgt_comp;
unsigned long tgt_size;
unsigned long tgt_header_len;
unsigned long payload_fmt_off;
};

struct delta_meta deltas[DELTAS];
Expand Down Expand Up @@ -324,16 +324,16 @@ static void test_drpm_get_uint(void **state)
};

for (int i = 0; i < DELTAS; i++) {
assert_int_equal(DRPM_ERR_OK, drpm_get_uint(deltas[i].delta, DRPM_TAG_VERSION, (unsigned *)&deltas[i].version));
assert_int_equal(DRPM_ERR_OK, drpm_get_uint(deltas[i].delta, DRPM_TAG_TYPE, (unsigned *)&deltas[i].type));
assert_int_equal(DRPM_ERR_OK, drpm_get_uint(deltas[i].delta, DRPM_TAG_COMP, (unsigned *)&deltas[i].comp));
assert_int_equal(DRPM_ERR_OK, drpm_get_uint(deltas[i].delta, DRPM_TAG_VERSION, &deltas[i].version));
assert_int_equal(DRPM_ERR_OK, drpm_get_uint(deltas[i].delta, DRPM_TAG_TYPE, &deltas[i].type));
assert_int_equal(DRPM_ERR_OK, drpm_get_uint(deltas[i].delta, DRPM_TAG_COMP, &deltas[i].comp));
assert_int_equal(DRPM_ERR_OK, drpm_get_uint(deltas[i].delta, DRPM_TAG_TGTSIZE, &tgt_size));
assert_int_equal(DRPM_ERR_OK, drpm_get_uint(deltas[i].delta, DRPM_TAG_TGTCOMP, (unsigned *)&deltas[i].tgt_comp));
assert_int_equal(DRPM_ERR_OK, drpm_get_uint(deltas[i].delta, DRPM_TAG_TGTCOMP, &deltas[i].tgt_comp));

version = (unsigned)deltas[i].version;
type = (unsigned)deltas[i].type;
comp = (unsigned)deltas[i].comp;
tgt_comp = (unsigned)deltas[i].tgt_comp;
version = deltas[i].version;
type = deltas[i].type;
comp = deltas[i].comp;
tgt_comp = deltas[i].tgt_comp;

assert_in_range(version, 1, 3);
assert_in_set(type, types, 2);
Expand Down Expand Up @@ -385,14 +385,14 @@ static void test_drpm_get_ulong(void **state)
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_VERSION, &version));
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TYPE, &type));
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_COMP, &comp));
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TGTSIZE, (unsigned long *)&deltas[i].tgt_size));
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TGTSIZE, &deltas[i].tgt_size));
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TGTCOMP, &tgt_comp));
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TGTHEADERLEN, (unsigned long *)&deltas[i].tgt_header_len));
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_PAYLOADFMTOFF, (unsigned long *)&deltas[i].payload_fmt_off));
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TGTHEADERLEN, &deltas[i].tgt_header_len));
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_PAYLOADFMTOFF, &deltas[i].payload_fmt_off));

tgt_size = (unsigned long)deltas[i].tgt_size;
tgt_header_len = (unsigned long)deltas[i].tgt_header_len;
payload_fmt_off = (unsigned long)deltas[i].payload_fmt_off;
tgt_size = deltas[i].tgt_size;
tgt_header_len = deltas[i].tgt_header_len;
payload_fmt_off = deltas[i].payload_fmt_off;

assert_in_range(version, 1, 3);
assert_in_set(type, types, 2);
Expand All @@ -403,10 +403,10 @@ static void test_drpm_get_ulong(void **state)
if (type == DRPM_TYPE_RPMONLY)
assert_int_not_equal(0, tgt_header_len);

assert_int_equal(version, deltas[i].version);
assert_int_equal(type, deltas[i].type);
assert_int_equal(comp, deltas[i].comp);
assert_int_equal(tgt_comp, deltas[i].tgt_comp);
assert_int_equal(version, (unsigned long)deltas[i].version);
assert_int_equal(type, (unsigned long)deltas[i].type);
assert_int_equal(comp, (unsigned long)deltas[i].comp);
assert_int_equal(tgt_comp, (unsigned long)deltas[i].tgt_comp);
}

assert_int_equal(DRPM_ERR_ARGS, drpm_get_ulong(NULL, DRPM_TAG_PAYLOADFMTOFF, &payload_fmt_off));
Expand Down Expand Up @@ -467,13 +467,13 @@ static void test_drpm_get_ullong(void **state)
if (type == DRPM_TYPE_RPMONLY)
assert_int_not_equal(0, tgt_header_len);

assert_int_equal(version, deltas[i].version);
assert_int_equal(type, deltas[i].type);
assert_int_equal(comp, deltas[i].comp);
assert_int_equal(tgt_comp, deltas[i].tgt_comp);
assert_int_equal(tgt_size, deltas[i].tgt_size);
assert_int_equal(tgt_header_len, deltas[i].tgt_header_len);
assert_int_equal(payload_fmt_off, deltas[i].payload_fmt_off);
assert_int_equal(version, (unsigned long long)deltas[i].version);
assert_int_equal(type, (unsigned long long)deltas[i].type);
assert_int_equal(comp, (unsigned long long)deltas[i].comp);
assert_int_equal(tgt_comp, (unsigned long long)deltas[i].tgt_comp);
assert_int_equal(tgt_size, (unsigned long long)deltas[i].tgt_size);
assert_int_equal(tgt_header_len, (unsigned long long)deltas[i].tgt_header_len);
assert_int_equal(payload_fmt_off, (unsigned long long)deltas[i].payload_fmt_off);
}

assert_int_equal(DRPM_ERR_ARGS, drpm_get_ullong(NULL, DRPM_TAG_TYPE, &type));
Expand Down

0 comments on commit 69c74c2

Please sign in to comment.