Skip to content

Commit 69c74c2

Browse files
matejchalkmatejchalk
committed
Fixed bug in test suite.
1 parent 3559905 commit 69c74c2

3 files changed

Lines changed: 41 additions & 38 deletions

File tree

‎drpm.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5858
%changelog
59+
* Fri Jul 24 2015 Matej Chalk <mchalk@redhat.com> 0.2.0-2
60+
- Fixed bug in test suite
61+
5962
* Tue Jun 23 2015 Matej Chalk <mchalk@redhat.com> 0.2.0-1
6063
- Bumped minor version
6164

‎src/drpm.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ int drpm_read(drpm **delta, const char *filename);
113113
* @brief Fetches information representable as an unsigned integer.
114114
*
115115
* Fetches information identified by @p tag from @p delta and copies it
116-
* to adress pointed to by @p target.
116+
* to address pointed to by @p target.
117117
*
118118
* Example of usage:
119119
* @code
@@ -145,7 +145,7 @@ int drpm_get_uint(drpm *delta, int tag, unsigned *target);
145145
* @brief Fetches information representable as an unsigned long integer.
146146
*
147147
* Fetches information identified by @p tag from @p delta and copies it
148-
* to adress pointed to by @p target.
148+
* to address pointed to by @p target.
149149
*
150150
* Example of usage:
151151
* @code
@@ -180,7 +180,7 @@ int drpm_get_ulong(drpm *delta, int tag, unsigned long *target);
180180
* @brief Fetches information representable as an unsigned long long integer.
181181
*
182182
* Fetches information identified by @p tag from @p delta and copies it
183-
* to adress pointed to by @p target.
183+
* to address pointed to by @p target.
184184
*
185185
* Example of usage:
186186
* @code
@@ -218,7 +218,7 @@ int drpm_get_ullong(drpm *delta, int tag, unsigned long long *target);
218218
*
219219
* Fetches string-type information identified by @p tag from @p delta,
220220
* copies it to space previously allocated by the function itself and
221-
* saves the adress to @p *target.
221+
* saves the address to @p *target.
222222
*
223223
* Example of usage:
224224
* @code
@@ -257,7 +257,7 @@ int drpm_get_string(drpm *delta, int tag, char **target);
257257
*
258258
* Fetches information identified by @p tag from @p delta,
259259
* copies it to space previously allocated by the function itself,
260-
* saves the adress to @p *target and stores size in @p *size.
260+
* saves the address to @p *target and stores size in @p *size.
261261
*
262262
* Example of usage:
263263
* @code

‎test/drpm_test.c‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ int __real_compstrm_destroy(struct compstrm **);
5151

5252
struct delta_meta {
5353
drpm *delta;
54-
uint16_t version;
55-
uint16_t type;
56-
uint16_t comp;
57-
uint16_t tgt_comp;
58-
uint32_t tgt_size;
59-
uint32_t tgt_header_len;
60-
uint32_t payload_fmt_off;
54+
unsigned version;
55+
unsigned type;
56+
unsigned comp;
57+
unsigned tgt_comp;
58+
unsigned long tgt_size;
59+
unsigned long tgt_header_len;
60+
unsigned long payload_fmt_off;
6161
};
6262

6363
struct delta_meta deltas[DELTAS];
@@ -324,16 +324,16 @@ static void test_drpm_get_uint(void **state)
324324
};
325325

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

333-
version = (unsigned)deltas[i].version;
334-
type = (unsigned)deltas[i].type;
335-
comp = (unsigned)deltas[i].comp;
336-
tgt_comp = (unsigned)deltas[i].tgt_comp;
333+
version = deltas[i].version;
334+
type = deltas[i].type;
335+
comp = deltas[i].comp;
336+
tgt_comp = deltas[i].tgt_comp;
337337

338338
assert_in_range(version, 1, 3);
339339
assert_in_set(type, types, 2);
@@ -385,14 +385,14 @@ static void test_drpm_get_ulong(void **state)
385385
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_VERSION, &version));
386386
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TYPE, &type));
387387
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_COMP, &comp));
388-
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TGTSIZE, (unsigned long *)&deltas[i].tgt_size));
388+
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TGTSIZE, &deltas[i].tgt_size));
389389
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TGTCOMP, &tgt_comp));
390-
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TGTHEADERLEN, (unsigned long *)&deltas[i].tgt_header_len));
391-
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_PAYLOADFMTOFF, (unsigned long *)&deltas[i].payload_fmt_off));
390+
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_TGTHEADERLEN, &deltas[i].tgt_header_len));
391+
assert_int_equal(DRPM_ERR_OK, drpm_get_ulong(deltas[i].delta, DRPM_TAG_PAYLOADFMTOFF, &deltas[i].payload_fmt_off));
392392

393-
tgt_size = (unsigned long)deltas[i].tgt_size;
394-
tgt_header_len = (unsigned long)deltas[i].tgt_header_len;
395-
payload_fmt_off = (unsigned long)deltas[i].payload_fmt_off;
393+
tgt_size = deltas[i].tgt_size;
394+
tgt_header_len = deltas[i].tgt_header_len;
395+
payload_fmt_off = deltas[i].payload_fmt_off;
396396

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

406-
assert_int_equal(version, deltas[i].version);
407-
assert_int_equal(type, deltas[i].type);
408-
assert_int_equal(comp, deltas[i].comp);
409-
assert_int_equal(tgt_comp, deltas[i].tgt_comp);
406+
assert_int_equal(version, (unsigned long)deltas[i].version);
407+
assert_int_equal(type, (unsigned long)deltas[i].type);
408+
assert_int_equal(comp, (unsigned long)deltas[i].comp);
409+
assert_int_equal(tgt_comp, (unsigned long)deltas[i].tgt_comp);
410410
}
411411

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

470-
assert_int_equal(version, deltas[i].version);
471-
assert_int_equal(type, deltas[i].type);
472-
assert_int_equal(comp, deltas[i].comp);
473-
assert_int_equal(tgt_comp, deltas[i].tgt_comp);
474-
assert_int_equal(tgt_size, deltas[i].tgt_size);
475-
assert_int_equal(tgt_header_len, deltas[i].tgt_header_len);
476-
assert_int_equal(payload_fmt_off, deltas[i].payload_fmt_off);
470+
assert_int_equal(version, (unsigned long long)deltas[i].version);
471+
assert_int_equal(type, (unsigned long long)deltas[i].type);
472+
assert_int_equal(comp, (unsigned long long)deltas[i].comp);
473+
assert_int_equal(tgt_comp, (unsigned long long)deltas[i].tgt_comp);
474+
assert_int_equal(tgt_size, (unsigned long long)deltas[i].tgt_size);
475+
assert_int_equal(tgt_header_len, (unsigned long long)deltas[i].tgt_header_len);
476+
assert_int_equal(payload_fmt_off, (unsigned long long)deltas[i].payload_fmt_off);
477477
}
478478

479479
assert_int_equal(DRPM_ERR_ARGS, drpm_get_ullong(NULL, DRPM_TAG_TYPE, &type));

0 commit comments

Comments
 (0)