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

Addressed PR comments

This commit is contained in:
Ryan Ernst 2015-09-02 11:13:05 -07:00
parent 51db6cc358
commit 205675ad19
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/test/java/org/elasticsearch/NamingConventionTests.java
View File

@ -48,7 +48,7 @@ public class NamingConventionTests extends ESTestCase {
// see https://github.com/elasticsearch/elasticsearch/issues/9945 // see https://github.com/elasticsearch/elasticsearch/issues/9945
public void testNamingConventions() public void testNamingConventions()
throws ClassNotFoundException, IOException, URISyntaxException { throws ClassNotFoundException, IOException, URISyntaxException {
final Set<Class> notImplementing = new HashSet<>(); final Set<Class> notImplementing = new HashSet<>();
final Set<Class> pureUnitTest = new HashSet<>(); final Set<Class> pureUnitTest = new HashSet<>();
final Set<Class> missingSuffix = new HashSet<>(); final Set<Class> missingSuffix = new HashSet<>();
@ -78,7 +78,6 @@ public class NamingConventionTests extends ESTestCase {
String filename = file.getFileName().toString(); String filename = file.getFileName().toString();
if (filename.endsWith(".class")) { if (filename.endsWith(".class")) {
Class<?> clazz = loadClass(filename); Class<?> clazz = loadClass(filename);
//if (Modifier.isAbstract(clazz.getModifiers()) == false && Modifier.isInterface(clazz.getModifiers()) == false) {
if (clazz.getName().endsWith("Tests") || if (clazz.getName().endsWith("Tests") ||
clazz.getName().endsWith("Test")) { // don't worry about the ones that match the pattern clazz.getName().endsWith("Test")) { // don't worry about the ones that match the pattern
@ -104,8 +103,6 @@ public class NamingConventionTests extends ESTestCase {
pureUnitTest.add(clazz); pureUnitTest.add(clazz);
} }
} }
//}
} }
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@ -165,25 +162,18 @@ public class NamingConventionTests extends ESTestCase {
ESTokenStreamTestCase.class.getSimpleName(), ESTokenStreamTestCase.class.getSimpleName(),
LuceneTestCase.class.getSimpleName()); LuceneTestCase.class.getSimpleName());
assertTrue("Not all subclasses of " + ESTestCase.class.getSimpleName() + assertTrue("Not all subclasses of " + ESTestCase.class.getSimpleName() +
" match the naming convention. Concrete classes must end with [Test|Tests]:\n" + listClasses(missingSuffix), " match the naming convention. Concrete classes must end with [Test|Tests]:\n" + Joiner.on('\n').join(missingSuffix),
missingSuffix.isEmpty()); missingSuffix.isEmpty());
assertTrue("Classes ending with [Test|Tests] are abstract or interfaces:\n" + listClasses(notRunnable), assertTrue("Classes ending with [Test|Tests] are abstract or interfaces:\n" + Joiner.on('\n').join(notRunnable),
notRunnable.isEmpty()); notRunnable.isEmpty());
assertTrue("Found inner classes that are tests, which are excluded from the test runner:\n" + listClasses(innerClasses), assertTrue("Found inner classes that are tests, which are excluded from the test runner:\n" + Joiner.on('\n').join(innerClasses),
innerClasses.isEmpty()); innerClasses.isEmpty());
assertTrue("Pure Unit-Test found must subclass one of [" + classesToSubclass +"]:\n" + listClasses(pureUnitTest), assertTrue("Pure Unit-Test found must subclass one of [" + classesToSubclass +"]:\n" + Joiner.on('\n').join(pureUnitTest),
pureUnitTest.isEmpty()); pureUnitTest.isEmpty());
assertTrue("Classes ending with Test|Tests] must subclass [" + classesToSubclass +"]:\n" + listClasses(notImplementing), assertTrue("Classes ending with Test|Tests] must subclass [" + classesToSubclass +"]:\n" + Joiner.on('\n').join(notImplementing),
notImplementing.isEmpty()); notImplementing.isEmpty());
assertTrue("Subclasses of ESIntegTestCase should end with IT as they are integration tests:\n" + listClasses(integTestsInDisguise), integTestsInDisguise.isEmpty()); assertTrue("Subclasses of ESIntegTestCase should end with IT as they are integration tests:\n" + Joiner.on('\n').join(integTestsInDisguise),
} integTestsInDisguise.isEmpty());
static String listClasses(Set<Class> classes) {
StringBuilder builder = new StringBuilder();
for (Class clazz : classes) {
builder.append(clazz.toString() + '\n');
}
return builder.toString();
} }
/* /*