From 8b8132c246ba6d1f66e54a17a1224679c84425ea Mon Sep 17 00:00:00 2001
From: Dmitri Pal <dpal@redhat.com>
Date: Sun, 26 Dec 2010 00:18:48 -0500
Subject: Test DETECT mode and use new file

Patch adds smerge.conf file to the list
of files to test and adds test for the DETECT
mode for inidividual values.
---
 ini/ini_parse_ut.c | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/ini/ini_parse_ut.c b/ini/ini_parse_ut.c
index 9327eba..40c64bb 100644
--- a/ini/ini_parse_ut.c
+++ b/ini/ini_parse_ut.c
@@ -173,6 +173,7 @@ int read_save_test(void)
                             "mysssd",
                             "ipa",
                             "test",
+                            "smerge",
                             NULL };
 
 
@@ -203,6 +204,7 @@ int read_again_test(void)
                             "mysssd",
                             "ipa",
                             "test",
+                            "smerge",
                             NULL };
 
 
@@ -279,14 +281,25 @@ int create_expect(const char *checkname)
     fprintf(ff,"#Second value\n");
     fprintf(ff,"bar = second value\n");
     fprintf(ff,"#End of section\n");
+    /* Detect */
+    fprintf(ff,"#Hoho section\n");
+    fprintf(ff,"[hoho]\n");
+    fprintf(ff,"#Hoho value\n");
+    fprintf(ff,"val = hoho\n");
+    fprintf(ff,"#End of hoho\n");
+    fprintf(ff,"#Start of section\n");
+    fprintf(ff,"[foo]\n");
+    fprintf(ff,"#First value\n");
+    fprintf(ff,"bar = first value\n");
+    fprintf(ff,"#Second value\n");
+    fprintf(ff,"bar = second value\n");
+    fprintf(ff,"#End of section\n");
 
     fclose(ff);
 
     return EOK;
 }
 
-
-
 /* Check merge modes */
 int merge_values_test(void)
 {
@@ -301,12 +314,14 @@ int merge_values_test(void)
     uint32_t mflags[] = { INI_MV1S_OVERWRITE,
                           INI_MV1S_ERROR,
                           INI_MV1S_PRESERVE,
-                          INI_MV1S_ALLOW };
+                          INI_MV1S_ALLOW,
+                          INI_MV1S_DETECT };
 
     const char *mstr[] = { "OVERWRITE",
                            "ERROR",
                            "PRESERVE",
-                           "ALLOW" };
+                           "ALLOW",
+                           "DETECT" };
 
     char filename[PATH_MAX];
     const char *resname = "./merge.conf.out";
@@ -323,7 +338,7 @@ int merge_values_test(void)
         return error;
     }
 
-    for (i = 0; i < 4; i++) {
+    for (i = 0; i < 5; i++) {
 
         INIOUT(printf("<==== Testing mode %s  ====>\n", mstr[i]));
 
@@ -360,8 +375,9 @@ int merge_values_test(void)
                 ini_config_free_errors(error_list);
             }
 
-            if ((mflags[i] != INI_MV1S_ERROR) ||
-                ((mflags[i] = INI_MV1S_ERROR) && (error != EEXIST))) {
+            if (((mflags[i] != INI_MV1S_ERROR) && (mflags[i]!= INI_MV1S_DETECT)) ||
+                ((mflags[i] = INI_MV1S_ERROR) && (error != EEXIST)) ||
+                ((mflags[i] = INI_MV1S_DETECT) && (error != EEXIST))) {
                 printf("This is unexpected error %d in mode %d\n", error, mflags[i]);
 	            ini_config_destroy(ini_config);
 		        simplebuffer_free(sbobj);
-- 
cgit