2323#include "swupd.h"
2424#include "test_helper.h"
2525
26- static void validate_file (struct list * files , const char * filename , int version , int hash , int is_dir , int is_file , int is_link , int is_deleted , int is_ghosted , int is_manifest , int is_config , int is_state , int is_boot , int is_experimental )
26+ static void validate_file (struct list * files , const char * filename , int version , int hash , int is_dir , int is_file , int is_link , int is_deleted , int is_ghosted , int is_manifest , int is_experimental )
2727{
2828 struct list * list ;
2929 char hash_str [SWUPD_HASH_LEN ];
@@ -39,9 +39,6 @@ static void validate_file(struct list *files, const char *filename, int version,
3939 check (file -> is_deleted == is_deleted );
4040 check (file -> is_ghosted == is_ghosted );
4141 check (file -> is_manifest == is_manifest );
42- check (file -> is_config == is_config );
43- check (file -> is_state == is_state );
44- check (file -> is_boot == is_boot );
4542 check (file -> is_experimental == is_experimental );
4643
4744 check (file -> last_change == version );
@@ -92,24 +89,21 @@ static void test_manifest_parse()
9289 // Check if parser can parse all different flags supported for the file list
9390 manifest = manifest_parse_test ("test" , dir , "data/mom2" , false);
9491 check (manifest != NULL );
95- check (list_len (manifest -> files ) == 13 );
92+ check (list_len (manifest -> files ) == 10 );
9693 check (list_len (manifest -> manifests ) == 1 );
9794
98- validate_file (manifest -> manifests , "m1" , 10 , 1 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 );
99-
100- validate_file (manifest -> files , "f1" , 20 , 1 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
101- validate_file (manifest -> files , "f2" , 30 , 2 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
102- validate_file (manifest -> files , "f3" , 30 , 3 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
103- validate_file (manifest -> files , "f4" , 30 , 4 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
104- validate_file (manifest -> files , "f5" , 30 , 5 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 0 );
105- validate_file (manifest -> files , "f6" , 30 , 6 , 0 , 0 , 0 , 1 , 1 , 0 , 0 , 0 , 0 , 0 );
106- validate_file (manifest -> files , "f7" , 30 , 7 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 );
107- validate_file (manifest -> files , "f8" , 30 , 8 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 );
108- validate_file (manifest -> files , "f9" , 30 , 9 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 );
109- validate_file (manifest -> files , "f10" , 30 , 10 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 0 );
110- validate_file (manifest -> files , "f11" , 30 , 11 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
111- validate_file (manifest -> files , "f12" , 30 , 12 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
112- validate_file (manifest -> files , "f13" , 30 , 13 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
95+ validate_file (manifest -> manifests , "m1" , 10 , 1 , 0 , 0 , 0 , 0 , 0 , 1 , 0 );
96+
97+ validate_file (manifest -> files , "f1" , 20 , 1 , 0 , 1 , 0 , 0 , 0 , 0 , 0 );
98+ validate_file (manifest -> files , "f2" , 30 , 2 , 1 , 0 , 0 , 0 , 0 , 0 , 0 );
99+ validate_file (manifest -> files , "f3" , 30 , 3 , 0 , 0 , 1 , 0 , 0 , 0 , 0 );
100+ validate_file (manifest -> files , "f4" , 30 , 4 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
101+ validate_file (manifest -> files , "f5" , 30 , 5 , 0 , 0 , 0 , 1 , 0 , 0 , 0 );
102+ validate_file (manifest -> files , "f6" , 30 , 6 , 0 , 0 , 0 , 1 , 1 , 0 , 0 );
103+ validate_file (manifest -> files , "f7" , 30 , 7 , 0 , 0 , 0 , 0 , 0 , 0 , 1 );
104+ validate_file (manifest -> files , "f8" , 30 , 8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
105+ validate_file (manifest -> files , "f9" , 30 , 9 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
106+ validate_file (manifest -> files , "f10" , 30 , 10 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
113107
114108 manifest_free (manifest );
115109
0 commit comments