From 4a9896894b8169c0e158255c49e443316490e01e Mon Sep 17 00:00:00 2001
From: vromero <unknown>
Date: Mon, 12 Aug 2013 17:40:14 +0100
Subject: [PATCH] 8015780: java/lang/reflect/Method/GenericStringTest.java
 failing Reviewed-by: darcy, jfranck

---
 test/ProblemList.txt                          |  3 ---
 .../reflect/Method/GenericStringTest.java     | 21 ++++++++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/test/ProblemList.txt b/test/ProblemList.txt
index 9a2a4bf3d..ed5f9b0e7 100644
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -131,9 +131,6 @@ java/lang/management/MemoryMXBean/CollectionUsageThreshold.java generic-all
 # 7196801
 java/lang/management/MemoryMXBean/LowMemoryTest2.sh		generic-all
 
-# 8015780
-java/lang/reflect/Method/GenericStringTest.java			generic-all
-
 # 8019845 due to memleak not related to the tested fix
 java/lang/instrument/RedefineBigClass.sh                        linux-x64
 java/lang/instrument/RetransformBigClass.sh                     linux-x64
diff --git a/test/java/lang/reflect/Method/GenericStringTest.java b/test/java/lang/reflect/Method/GenericStringTest.java
index 9e50dca3a..b169c216b 100644
--- a/test/java/lang/reflect/Method/GenericStringTest.java
+++ b/test/java/lang/reflect/Method/GenericStringTest.java
@@ -48,10 +48,18 @@ public class GenericStringTest {
                 if (egs != null) {
                     String actual = method.toGenericString();
                     System.out.println(actual);
-                    if (! egs.value().equals(actual)) {
-                        failures++;
-                        System.err.printf("ERROR: Expected ''%s''; got ''%s''.\n",
-                                          egs.value(), actual);
+                    if (method.isBridge()) {
+                        if (! egs.bridgeValue().equals(actual)) {
+                            failures++;
+                            System.err.printf("ERROR: Expected ''%s''; got ''%s''.\n",
+                                              egs.value(), actual);
+                        }
+                    } else {
+                        if (! egs.value().equals(actual)) {
+                            failures++;
+                            System.err.printf("ERROR: Expected ''%s''; got ''%s''.\n",
+                                              egs.value(), actual);
+                        }
                     }
                 }
 
@@ -117,7 +125,8 @@ class TestClass2<E, F extends Exception> {
 
 class Roebling implements Comparable<Roebling> {
     @ExpectedGenericString(
-   "public int Roebling.compareTo(Roebling)")
+    value="public int Roebling.compareTo(Roebling)",
+    bridgeValue="public int Roebling.compareTo(java.lang.Object)")
     public int compareTo(Roebling r) {
         throw new IllegalArgumentException();
     }
@@ -154,9 +163,11 @@ interface TestInterface1 {
 @Retention(RetentionPolicy.RUNTIME)
 @interface ExpectedGenericString {
     String value();
+    String bridgeValue() default "";
 }
 
 @Retention(RetentionPolicy.RUNTIME)
 @interface ExpectedString {
     String value();
 }
+
-- 
GitLab