Add option to update tests in array insensitive way

2 files changed, 14 insertions, 2 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionTestCase.java
index 74afd3eef25..fa4280d2236 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionTestCase.java
@@ -4,6 +4,7 @@ package com.yahoo.searchdefinition;
 import com.yahoo.io.IOUtils;
 
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
 
@@ -18,13 +19,23 @@ public abstract class SearchDefinitionTestCase {
     }
 
     public static void assertConfigFiles(String expectedFile, String cfgFile) throws IOException {
+        assertConfigFiles(expectedFile, cfgFile, false);
+    }
+
+    public static void assertConfigFiles(String expectedFile, String cfgFile, boolean updateOnAssert) throws IOException {
         try {
             assertSerializedConfigEquals(readAndCensorIndexes(expectedFile), readAndCensorIndexes(cfgFile));
         } catch (AssertionError e) {
+            if (updateOnAssert) {
+                BufferedWriter writer = IOUtils.createWriter(expectedFile, false);
+                writer.write(readAndCensorIndexes(cfgFile));
+                writer.newLine();
+                writer.flush();
+                writer.close();
+            }
             throw new AssertionError(e.getMessage() + " [not equal files: >>>"+expectedFile+"<<< and >>>"+cfgFile+"<<< in assertConfigFiles]", e);
         }
     }
-
     /**
      * This is to avoid having to keep those pesky array index numbers in the config format up to date
      * as new entries are added and removed.
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
index 88a02cc7a93..7a423f6f82a 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
@@ -174,7 +174,8 @@ public abstract class AbstractExportingTestCase extends SearchDefinitionTestCase
                 return;
             }
         }
-        assertConfigFiles(correctFileName, checkFileName);
+        // Set updateOnAssert to true if you want update the files with correct answer.
+        assertConfigFiles(correctFileName, checkFileName, false);
     }
 
     protected void deleteContent(File dir) {