X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-job-type.c;h=1d9d49b2283a02165c23f95c7e8457a4196fc15f;hb=27e9c5af817147ea1c678769e45e83f2e4b4ae96;hp=a60be240906deaf88cd6901161e29bbcd4c8e6a3;hpb=e0209d83e7b30153f43b1a633c955f66eb2c2e4a;p=elogind.git

diff --git a/src/test/test-job-type.c b/src/test/test-job-type.c
index a60be2409..1d9d49b22 100644
--- a/src/test/test-job-type.c
+++ b/src/test/test-job-type.c
@@ -37,7 +37,7 @@ int main(int argc, char*argv[]) {
         /* fake a unit */
         static Service s = {
                 .meta.load_state = UNIT_LOADED,
-                .type = UNIT_SERVICE
+                .type = SERVICE_SIMPLE,
         };
         Unit *u = UNIT(&s);
 
@@ -52,29 +52,29 @@ int main(int argc, char*argv[]) {
                                 merged_ab = (job_type_merge_and_collapse(&ab, b, u) >= 0);
 
                                 if (!job_type_is_mergeable(a, b)) {
-                                        assert(!merged_ab);
+                                        assert_se(!merged_ab);
                                         printf("Not mergeable: %s + %s\n", job_type_to_string(a), job_type_to_string(b));
                                         continue;
                                 }
 
-                                assert(merged_ab);
+                                assert_se(merged_ab);
                                 printf("%s + %s = %s\n", job_type_to_string(a), job_type_to_string(b), job_type_to_string(ab));
 
                                 for (c = 0; c < _JOB_TYPE_MAX_MERGING; c++) {
 
                                         /* Verify transitivity of mergeability of job types */
-                                        assert(!job_type_is_mergeable(a, b) ||
+                                        assert_se(!job_type_is_mergeable(a, b) ||
                                                !job_type_is_mergeable(b, c) ||
                                                job_type_is_mergeable(a, c));
 
                                         /* Verify that merged entries can be merged with the same entries
                                          * they can be merged with separately */
-                                        assert(!job_type_is_mergeable(a, c) || job_type_is_mergeable(ab, c));
-                                        assert(!job_type_is_mergeable(b, c) || job_type_is_mergeable(ab, c));
+                                        assert_se(!job_type_is_mergeable(a, c) || job_type_is_mergeable(ab, c));
+                                        assert_se(!job_type_is_mergeable(b, c) || job_type_is_mergeable(ab, c));
 
                                         /* Verify that if a merged with b is not mergeable with c, then
                                          * either a or b is not mergeable with c either. */
-                                        assert(job_type_is_mergeable(ab, c) || !job_type_is_mergeable(a, c) || !job_type_is_mergeable(b, c));
+                                        assert_se(job_type_is_mergeable(ab, c) || !job_type_is_mergeable(a, c) || !job_type_is_mergeable(b, c));
 
                                         bc = b;
                                         if (job_type_merge_and_collapse(&bc, c, u) >= 0) {
@@ -82,16 +82,16 @@ int main(int argc, char*argv[]) {
                                                 /* Verify associativity */
 
                                                 ab_c = ab;
-                                                assert(job_type_merge_and_collapse(&ab_c, c, u) == 0);
+                                                assert_se(job_type_merge_and_collapse(&ab_c, c, u) == 0);
 
                                                 bc_a = bc;
-                                                assert(job_type_merge_and_collapse(&bc_a, a, u) == 0);
+                                                assert_se(job_type_merge_and_collapse(&bc_a, a, u) == 0);
 
                                                 a_bc = a;
-                                                assert(job_type_merge_and_collapse(&a_bc, bc, u) == 0);
+                                                assert_se(job_type_merge_and_collapse(&a_bc, bc, u) == 0);
 
-                                                assert(ab_c == bc_a);
-                                                assert(ab_c == a_bc);
+                                                assert_se(ab_c == bc_a);
+                                                assert_se(ab_c == a_bc);
 
                                                 printf("%s + %s + %s = %s\n", job_type_to_string(a), job_type_to_string(b), job_type_to_string(c), job_type_to_string(ab_c));
                                         }