From 1c5b49403bea0810d91fc86c74cad2914bf84c03 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Tue, 11 Aug 2015 23:11:54 -0700
Subject: [PATCH] Fix type checking to work with java 7

---
 .../common/inject/ModuleTestCase.java             | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/src/test/java/org/elasticsearch/common/inject/ModuleTestCase.java b/core/src/test/java/org/elasticsearch/common/inject/ModuleTestCase.java
index 5b581a12de3..807c3da6ec1 100644
--- a/core/src/test/java/org/elasticsearch/common/inject/ModuleTestCase.java
+++ b/core/src/test/java/org/elasticsearch/common/inject/ModuleTestCase.java
@@ -25,6 +25,7 @@ import org.elasticsearch.common.inject.spi.LinkedKeyBinding;
 import org.elasticsearch.common.inject.spi.ProviderInstanceBinding;
 import org.elasticsearch.test.ESTestCase;
 
+import java.lang.reflect.Type;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -40,8 +41,8 @@ public abstract class ModuleTestCase extends ESTestCase {
         for (Element element : elements) {
             if (element instanceof LinkedKeyBinding) {
                 LinkedKeyBinding binding = (LinkedKeyBinding)element;
-                if (to.getName().equals(binding.getKey().getTypeLiteral().getType().getTypeName())) {
-                    assertEquals(clazz.getName(), binding.getLinkedKey().getTypeLiteral().getType().getTypeName());
+                if (to.equals(binding.getKey().getTypeLiteral().getType())) {
+                    assertSame(clazz, binding.getLinkedKey().getTypeLiteral().getType());
                     return;
                 }
             }
@@ -79,17 +80,17 @@ public abstract class ModuleTestCase extends ESTestCase {
      */
     public void assertSetMultiBinding(Module module, Class to, Class... classes) {
         List<Element> elements = Elements.getElements(module);
-        Set<String> bindings = new HashSet<>();
+        Set<Type> bindings = new HashSet<>();
         boolean providerFound = false;
         for (Element element : elements) {
             if (element instanceof LinkedKeyBinding) {
                 LinkedKeyBinding binding = (LinkedKeyBinding)element;
-                if (to.getName().equals(binding.getKey().getTypeLiteral().getType().getTypeName())) {
-                    bindings.add(binding.getLinkedKey().getTypeLiteral().getType().getTypeName());
+                if (to.equals(binding.getKey().getTypeLiteral().getType())) {
+                    bindings.add(binding.getLinkedKey().getTypeLiteral().getType());
                 }
             } else if (element instanceof ProviderInstanceBinding) {
                 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() + ">")) {
                     providerFound = true;
                 }
@@ -97,7 +98,7 @@ public abstract class ModuleTestCase extends ESTestCase {
         }
 
         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);
             }
         }