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

Fix type checking to work with java 7

This commit is contained in:
Ryan Ernst 2015-08-11 23:11:54 -07:00
parent 41af2ca75f
commit 1c5b49403b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/test/java/org/elasticsearch/common/inject/ModuleTestCase.java
View File

@ -25,6 +25,7 @@ import org.elasticsearch.common.inject.spi.LinkedKeyBinding;
import org.elasticsearch.common.inject.spi.ProviderInstanceBinding; import org.elasticsearch.common.inject.spi.ProviderInstanceBinding;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import java.lang.reflect.Type;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -40,8 +41,8 @@ public abstract class ModuleTestCase extends ESTestCase {
for (Element element : elements) { for (Element element : elements) {
if (element instanceof LinkedKeyBinding) { if (element instanceof LinkedKeyBinding) {
LinkedKeyBinding binding = (LinkedKeyBinding)element; LinkedKeyBinding binding = (LinkedKeyBinding)element;
if (to.getName().equals(binding.getKey().getTypeLiteral().getType().getTypeName())) { if (to.equals(binding.getKey().getTypeLiteral().getType())) {
assertEquals(clazz.getName(), binding.getLinkedKey().getTypeLiteral().getType().getTypeName()); assertSame(clazz, binding.getLinkedKey().getTypeLiteral().getType());
return; return;
} }
} }
@ -79,17 +80,17 @@ public abstract class ModuleTestCase extends ESTestCase {
*/ */
public void assertSetMultiBinding(Module module, Class to, Class... classes) { public void assertSetMultiBinding(Module module, Class to, Class... classes) {
List<Element> elements = Elements.getElements(module); List<Element> elements = Elements.getElements(module);
Set<String> bindings = new HashSet<>(); Set<Type> bindings = new HashSet<>();
boolean providerFound = false; boolean providerFound = false;
for (Element element : elements) { for (Element element : elements) {
if (element instanceof LinkedKeyBinding) { if (element instanceof LinkedKeyBinding) {
LinkedKeyBinding binding = (LinkedKeyBinding)element; LinkedKeyBinding binding = (LinkedKeyBinding)element;
if (to.getName().equals(binding.getKey().getTypeLiteral().getType().getTypeName())) { if (to.equals(binding.getKey().getTypeLiteral().getType())) {
bindings.add(binding.getLinkedKey().getTypeLiteral().getType().getTypeName()); bindings.add(binding.getLinkedKey().getTypeLiteral().getType());
} }
} else if (element instanceof ProviderInstanceBinding) { } else if (element instanceof ProviderInstanceBinding) {
ProviderInstanceBinding binding = (ProviderInstanceBinding)element; ProviderInstanceBinding binding = (ProviderInstanceBinding)element;
String setType = binding.getKey().getTypeLiteral().getType().getTypeName(); String setType = binding.getKey().getTypeLiteral().getType().toString();
if (setType.equals("java.util.Set<" + to.getName() + ">")) { if (setType.equals("java.util.Set<" + to.getName() + ">")) {
providerFound = true; providerFound = true;
} }
@ -97,7 +98,7 @@ public abstract class ModuleTestCase extends ESTestCase {
} }
for (Class clazz : classes) { for (Class clazz : classes) {
if (bindings.contains(clazz.getName()) == false) { if (bindings.contains(clazz) == false) {
fail("Expected to find " + clazz.getName() + " as set binding to " + to.getName() + ", found these classes:\n" + bindings); fail("Expected to find " + clazz.getName() + " as set binding to " + to.getName() + ", found these classes:\n" + bindings);
} }
} }