Remove th eold way of forcing updat eof tests.

The preferred way will now write array the correct way too.

1 files changed, 0 insertions, 59 deletions

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 7a423f6f82a..f39896f5779 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
@@ -24,50 +24,6 @@ public abstract class AbstractExportingTestCase extends SearchDefinitionTestCase
     static final String tempDir = "temp/";
     static final String searchDefRoot = "src/test/derived/";
 
-    private static final boolean WRITE_FILES = false;
-
-    static {
-        if ("true".equals(System.getProperty("sd.updatetests"))) {
-            /*
-             * Use this when you know that your code is correct, and don't want to manually check and fix the .cfg files
-             * in the exporting tests.
-             */
-            setUpUpdateTest();
-        }
-        // Or uncomment the lines you want below AND set WRITE_FILES to true
-        //System.setProperty("sd.updatetests", "true");
-        //System.setProperty("sd.updatetestfile", "attributes");
-        //System.setProperty("sd.updatetestfile", "documentmanager");
-        //System.setProperty("sd.updatetestfile", "fdispatchrc");
-        //System.setProperty("sd.updatetestfile", "ilscripts");
-        //System.setProperty("sd.updatetestfile", "index-info");
-        //System.setProperty("sd.updatetestfile", "indexschema");
-        //System.setProperty("sd.updatetestfile", "juniperrc");
-        //System.setProperty("sd.updatetestfile", "partitions");
-        //System.setProperty("sd.updatetestfile", "qr-logging");
-        //System.setProperty("sd.updatetestfile", "qr-searchers");
-        //System.setProperty("sd.updatetestfile", "rank-profiles");
-        //System.setProperty("sd.updatetestfile", "summary");
-        //System.setProperty("sd.updatetestfile", "summarymap");
-        //System.setProperty("sd.updatetestfile", "translogserver");
-        //System.setProperty("sd.updatetestfile", "vsmsummary");
-        //System.setProperty("sd.updatetestfile", "vsmfields");
-    }
-
-    private static void setUpUpdateTest() {
-        try {
-            System.out.println("Property sd.updatetests is true, updating test files from generated ones...");
-            System.out.println("Enter export test file name to be updated (eg. index-info), or blank to update every file. 'q' to quit: ");
-            String fileName = new BufferedReader(new InputStreamReader(System.in)).readLine();
-            if ("q".equals(fileName)) {
-                throw new IllegalArgumentException("Aborted by user");
-            }
-            System.setProperty("sd.updatetestfile", fileName);
-        } catch (IOException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
     protected DerivedConfiguration derive(String dirName, String searchDefinitionName) throws IOException, ParseException {
         File toDir = new File(tempDir + dirName);
         toDir.mkdirs();
@@ -158,22 +114,7 @@ public abstract class AbstractExportingTestCase extends SearchDefinitionTestCase
         }
     }
 
-    protected void assertEqualConfig(String name, String config) throws IOException {
-        final String expectedConfigDirName = searchDefRoot + name + "/";
-        assertEqualFiles(expectedConfigDirName + config + ".cfg",
-                         tempDir + name + "/" + config + ".cfg");
-    }
-
-    @SuppressWarnings({ "ConstantConditions" })
     public static void assertEqualFiles(String correctFileName, String checkFileName) throws IOException {
-        if (WRITE_FILES || "true".equals(System.getProperty("sd.updatetests"))) {
-            String updateFile = System.getProperty("sd.updatetestfile");
-            if (WRITE_FILES || "".equals(updateFile) || correctFileName.endsWith(updateFile + ".cfg") || correctFileName.endsWith(updateFile + ".MODEL.cfg")) {
-                System.out.println("Copying " + checkFileName + " to " + correctFileName);
-                IOUtils.copy(checkFileName, correctFileName);
-                return;
-            }
-        }
         // Set updateOnAssert to true if you want update the files with correct answer.
         assertConfigFiles(correctFileName, checkFileName, false);
     }