X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test-job-type.c;h=62f04fdf13c71d0ff48b563acabe7628c5d8ecc3;hp=db5c329e13cf68e0892cbe7fd3058a7e5da76cc0;hb=f3bff0eb3bc65de3b74286415a996af9556333af;hpb=1ffba6fe82d65f2a87b53a21c7927bca8176038c

diff --git a/test-job-type.c b/test-job-type.c
index db5c329e1..62f04fdf1 100644
--- a/test-job-type.c
+++ b/test-job-type.c
@@ -13,16 +13,16 @@ int main(int argc, char*argv[]) {
         for (a = 0; a < _JOB_TYPE_MAX; a++)
                 for (b = 0; b < _JOB_TYPE_MAX; b++) {
 
-                        if (!job_type_mergeable(a, b))
+                        if (!job_type_is_mergeable(a, b))
                                 printf("Not mergeable: %s + %s\n", job_type_to_string(a), job_type_to_string(b));
 
                         for (c = 0; c < _JOB_TYPE_MAX; c++) {
 
                                 /* Verify transitivity of mergeability
                                  * of job types */
-                                assert(!job_type_mergeable(a, b) ||
-                                       !job_type_mergeable(b, c) ||
-                                       job_type_mergeable(a, c));
+                                assert(!job_type_is_mergeable(a, b) ||
+                                       !job_type_is_mergeable(b, c) ||
+                                       job_type_is_mergeable(a, c));
 
                                 d = a;
                                 if (job_type_merge(&d, b) >= 0) {
@@ -32,14 +32,14 @@ int main(int argc, char*argv[]) {
                                         /* Verify that merged entries can be
                                          * merged with the same entries they
                                          * can be merged with seperately */
-                                        assert(!job_type_mergeable(a, c) || job_type_mergeable(d, c));
-                                        assert(!job_type_mergeable(b, c) || job_type_mergeable(d, c));
+                                        assert(!job_type_is_mergeable(a, c) || job_type_is_mergeable(d, c));
+                                        assert(!job_type_is_mergeable(b, c) || job_type_is_mergeable(d, c));
 
                                         /* Verify that if a merged
                                          * with b is not mergable with
                                          * c then either a or b is not
                                          * mergeable with c either. */
-                                        assert(job_type_mergeable(d, c) || !job_type_mergeable(a, c) || !job_type_mergeable(b, c));
+                                        assert(job_type_is_mergeable(d, c) || !job_type_is_mergeable(a, c) || !job_type_is_mergeable(b, c));
 
                                         e = b;
                                         if (job_type_merge(&e, c) >= 0) {