1 files changed, 2 insertions, 49 deletions
diff --git a/guava-tests/test/com/google/common/base/EnumsTest.java b/guava-tests/test/com/google/common/base/EnumsTest.java
index 473df7d..142833b 100644
--- a/guava-tests/test/com/google/common/base/EnumsTest.java
+++ b/guava-tests/test/com/google/common/base/EnumsTest.java
@@ -24,10 +24,6 @@ import com.google.common.testing.SerializableTester;
 
 import junit.framework.TestCase;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.reflect.Field;
-
 /**
  * Tests for {@link Enums}.
  *
@@ -58,7 +54,7 @@ public class EnumsTest extends TestCase {
     assertNull(function.apply("poodlE"));
   }
 
-  public void testValueOfFunction_nullWhenNoMatchingConstant() {
+  public void testValueOfFunction_nullWhenNotMatchingConstant() {
     Function<String, TestEnum> function = Enums.valueOfFunction(TestEnum.class);
     assertNull(function.apply("WOMBAT"));
   }
@@ -77,52 +73,9 @@ public class EnumsTest extends TestCase {
     SerializableTester.reserializeAndAssert(function);
   }
 
-  public void testGetIfPresent() {
-    assertEquals(Optional.of(TestEnum.CHEETO), Enums.getIfPresent(TestEnum.class, "CHEETO"));
-    assertEquals(Optional.of(TestEnum.HONDA), Enums.getIfPresent(TestEnum.class, "HONDA"));
-    assertEquals(Optional.of(TestEnum.POODLE), Enums.getIfPresent(TestEnum.class, "POODLE"));
-
-    assertTrue(Enums.getIfPresent(TestEnum.class, "CHEETO").isPresent());
-    assertTrue(Enums.getIfPresent(TestEnum.class, "HONDA").isPresent());
-    assertTrue(Enums.getIfPresent(TestEnum.class, "POODLE").isPresent());
-
-    assertEquals(TestEnum.CHEETO, Enums.getIfPresent(TestEnum.class, "CHEETO").get());
-    assertEquals(TestEnum.HONDA, Enums.getIfPresent(TestEnum.class, "HONDA").get());
-    assertEquals(TestEnum.POODLE, Enums.getIfPresent(TestEnum.class, "POODLE").get());
-  }
-
-  public void testGetIfPresent_caseSensitive() {
-    assertFalse(Enums.getIfPresent(TestEnum.class, "cHEETO").isPresent());
-    assertFalse(Enums.getIfPresent(TestEnum.class, "Honda").isPresent());
-    assertFalse(Enums.getIfPresent(TestEnum.class, "poodlE").isPresent());
-  }
-
-  public void testGetIfPresent_whenNoMatchingConstant() {
-    assertEquals(Optional.absent(), Enums.getIfPresent(TestEnum.class, "WOMBAT"));
-  }
-
   @GwtIncompatible("NullPointerTester")
-  public void testNullPointerExceptions() {
+  public void testNullPointerExceptions() throws Exception {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(Enums.class);
   }
-
-  @Retention(RetentionPolicy.RUNTIME)
-  private @interface ExampleAnnotation {}
-
-  private enum AnEnum {
-    @ExampleAnnotation FOO,
-    BAR
-  }
-
-  @GwtIncompatible("reflection")
-  public void testGetField() {
-    Field foo = Enums.getField(AnEnum.FOO);
-    assertEquals("FOO", foo.getName());
-    assertTrue(foo.isAnnotationPresent(ExampleAnnotation.class));
-
-    Field bar = Enums.getField(AnEnum.BAR);
-    assertEquals("BAR", bar.getName());
-    assertFalse(bar.isAnnotationPresent(ExampleAnnotation.class));
-  }
 }