honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[TEST] Added check that yaml REST test suites always end with \n 

Our yaml parser seems to be too tolerant in some cases, e.g. it properly parses yaml suites when they don't end with a line feed, whereas other clients tests break due to that. We should try to do the same to keep consistency across runners.
This commit is contained in:
Luca Cavanna 2014-02-03 09:38:42 +01:00
parent 74dd33689e
commit 1ca565cf9f
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/test/java/org/elasticsearch/test/rest/parser/RestTestSuiteParser.java
View File

@ -18,6 +18,7 @@
*/
package org.elasticsearch.test.rest.parser;
import org.apache.lucene.util.IOUtils;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.yaml.YamlXContent;
import org.elasticsearch.test.rest.section.RestTestSuite;
@ -26,6 +27,7 @@ import org.elasticsearch.test.rest.section.TestSection;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.RandomAccessFile;
/**
* Parser for a complete test suite (yaml file)
@ -41,14 +43,27 @@ public class RestTestSuiteParser implements RestTestFragmentParser<RestTestSuite
throw new IllegalArgumentException(file.getAbsolutePath() + " is not a file");
}
String filename = file.getName();
//remove the file extension
int i = filename.lastIndexOf('.');
if (i > 0) {
filename = filename.substring(0, i);
}
//our yaml parser seems to be too tolerant. Each yaml suite must end with \n, otherwise clients tests might break.
RandomAccessFile randomAccessFile = null;
try {
randomAccessFile = new RandomAccessFile(file, "r");
randomAccessFile.skipBytes((int)randomAccessFile.length() - 1);
if (randomAccessFile.read() != 10) {
throw new RestTestParseException("test suite [" + api + "/" + filename + "] doesn't end with line feed (\\n)");
}
} finally {
IOUtils.close(randomAccessFile);
}
XContentParser parser = YamlXContent.yamlXContent.createParser(new FileInputStream(file));
try {
String filename = file.getName();
//remove the file extension
int i = filename.lastIndexOf('.');
if (i > 0) {
filename = filename.substring(0, i);
}
RestTestSuiteParseContext testParseContext = new RestTestSuiteParseContext(api, filename, parser, currentVersion);
return parse(testParseContext);
} finally {