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

SQL: Fail on trailing test specs (elastic/x-pack-elasticsearch#2836) 

If you wrote a test at the end of one of SQL's test spec files that was
just a name without a body then the parser would throw the test away.
Now it fails to intiaize the class with an error message telling you
which file is broken.

Original commit: elastic/x-pack-elasticsearch@023a942ca3
This commit is contained in:
Nik Everett 2017-11-04 13:17:49 +00:00 committed by GitHub
parent 44dc98385a
commit 49b295296e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/SpecBaseIntegrationTestCase.java
View File

@ -147,8 +147,7 @@ public abstract class SpecBaseIntegrationTestCase extends JdbcIntegrationTestCas
testName = Strings.capitalize(line); testName = Strings.capitalize(line);
testNames.put(testName, Integer.valueOf(lineNumber)); testNames.put(testName, Integer.valueOf(lineNumber));
} }
} } else {
else {
Object result = parser.parse(line); Object result = parser.parse(line);
// only if the parser is ready, add the object - otherwise keep on serving it lines // only if the parser is ready, add the object - otherwise keep on serving it lines
if (result != null) { if (result != null) {
@ -156,10 +155,12 @@ public abstract class SpecBaseIntegrationTestCase extends JdbcIntegrationTestCas
testName = null; testName = null;
} }
} }
// NOCOMMIT be more careful on the last line
} }
lineNumber++; lineNumber++;
} }
if (testName != null) {
throw new IllegalStateException("Read a test without a body at the end of [" + fileName + "].");
}
} }
assertNull("Cannot find spec for test " + testName, testName); assertNull("Cannot find spec for test " + testName, testName);