test/jdk/java/awt/Choice/RemoveAllShrinkTest/RemoveAllShrinkTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 22,44 ****
   */
  
  /*
    @test
    @key headful
!   @bug 4851798 8041896
    @summary Tests Choice List shrinks after removeAll
    @run main RemoveAllShrinkTest
  */
  
! import java.awt.*;
! import java.awt.event.*;
! 
  
  public class RemoveAllShrinkTest {
  
      public static void main(String[] args) {
          Frame f = new Frame();
          Choice choice = new Choice();
  
          for (int i = 0; i < 10; ++i) {
              choice.addItem("Item " + i);
          }
--- 22,50 ----
   */
  
  /*
    @test
    @key headful
!   @bug 4851798 8041896 8225126
    @summary Tests Choice List shrinks after removeAll
    @run main RemoveAllShrinkTest
  */
  
! import java.awt.BorderLayout;
! import java.awt.Choice;
! import java.awt.Color;
! import java.awt.Frame;
! import java.awt.Panel;
! import java.awt.Point;
! import java.awt.Robot;
! import java.awt.event.InputEvent;
  
  public class RemoveAllShrinkTest {
  
      public static void main(String[] args) {
          Frame f = new Frame();
+         try {
              Choice choice = new Choice();
  
              for (int i = 0; i < 10; ++i) {
                  choice.addItem("Item " + i);
              }
*** 47,56 ****
--- 53,63 ----
              Panel panel = new Panel();
              panel.setBackground(Color.RED);
              f.add(panel);
  
              f.setSize(200, 200);
+             f.setLocationRelativeTo(null);
              f.setVisible(true);
              f.toFront();
  
              choice.removeAll();
  
*** 79,86 ****
--- 86,96 ----
                      throw new RuntimeException("RemoveAllShrinkTest failed. " + color);
                  }
              } catch (Exception e) {
                  throw new RuntimeException("The test was not completed.\n\n" + e);
              }
+         } finally {
+             f.dispose();
+         }
      }
  }