test/java/beans/Introspector/AnonymousClassBeanPropertyTest.java

@@ -36,12 +36,11 @@
  * @bug 8132973 8132732 8155013 8154958
  * @summary Some check for BeanProperty annotation
  * @author a.stepanov
  * @run main AnonymousClassBeanPropertyTest
  */
-
-
+//TODO in final revision each test should have only one checkInfo/checkAlternate
 public class AnonymousClassBeanPropertyTest {
 
     private final static String  DESCRIPTION = "TEST";
     private final static boolean BOUND       = true;
     private final static boolean EXPERT      = false;

@@ -653,12 +652,10 @@
         };
         ok = checkInfo(testGetSet_2.getClass(), "IGetSet-2", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
-        // TODO: please uncomment/update after 8132973 fix
-        /*
         IGetSet testGetSet_3 = new IGetSet() {
 
             private double x;
 
             @Override

@@ -686,14 +683,11 @@
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
         ok = checkInfo(testGetSet_3.getClass(), "IGetSet-3", true);
         System.out.println("OK = " + ok);
-        ok2 = checkAlternativeInfo(testGetSet_3.getClass(), "IGetSet-3");
-        System.out.println("OK = " + ok2);
-        passed = passed && (ok || ok2);
-        */
+        passed = passed && ok;
 
         //----------------------------------------------------------------------
 
         IGetSetByIndex testGetSetByIndex_1 = new IGetSetByIndex() {
 

@@ -744,12 +738,10 @@
         };
         ok = checkInfo(testGetSetByIndex_2.getClass(), "IGetSetByIndex-2", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
-        // TODO: please uncomment/update after 8132973 fix
-        /*
         IGetSetByIndex testGetSetByIndex_3 = new IGetSetByIndex() {
 
             private double x[] = {X, X};
 
             @BeanProperty(

@@ -781,15 +773,11 @@
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
         ok = checkInfo(testGetSetByIndex_3.getClass(), "IGetSetByIndex-3", true);
         System.out.println("OK = " + ok);
-        ok2 = checkAlternativeInfo(
-            testGetSetByIndex_3.getClass(), "IGetSetByIndex-3");
-        System.out.println("OK = " + ok2);
-        passed = passed && (ok || ok2);
-        */
+        passed = passed && ok;
 
         //----------------------------------------------------------------------
 
         // TODO: please uncomment/update after 8155013 fix
         /*

@@ -853,11 +841,11 @@
         ok = checkInfo(testGetSetBoth_2.getClass(), "IGetSetBoth-2", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
         */
 
-        // TODO: please uncomment/update after 8132973 fix
+        // TODO: please uncomment/update after 8155013 fix
         /*
         IGetSetBoth testGetSetBoth_3 = new IGetSetBoth() {
 
             private double x[] = {X, X};
 

@@ -976,12 +964,10 @@
         System.out.println("OK = " + ok);
         ok2 = checkAlternativeInfo(testIs_3.getClass(), "IIs-3");
         System.out.println("OK = " + ok2);
         passed = passed && (ok || ok2);
 
-        // TODO: please uncomment/update after 8132973 fix
-        /*
         IIs testIs_4 = new IIs() {
 
             private boolean b;
 
             @BeanProperty(

@@ -1008,15 +994,11 @@
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
         ok = checkInfo(testIs_4.getClass(), "IIs-4", false);
         System.out.println("OK = " + ok);
-        ok2 = checkAlternativeInfo(testIs_4.getClass(), "IIs-4");
-        System.out.println("OK = " + ok2);
-        passed = passed && (ok || ok2);
-        */
-
+        passed = passed && ok;
 
         //----------------------------------------------------------------------
 
 
         if (!passed) { throw new RuntimeException("test failed"); }