/hg/icedtea6: 2 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Thu Feb 17 16:35:10 PST 2011


changeset 9882da94debb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9882da94debb
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 17 22:34:54 2011 +0000

	Fix placement of PR632 NEWS item.

	2011-02-17 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Fix placement of PR632.


changeset 728aac195993 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=728aac195993
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 18 00:34:56 2011 +0000

	S6444769:
	java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html
	fails

	2011-02-18 Andrew John Hughes <ahughes at redhat.com>

	 S6444769:
	java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html
	fails
		* Makefile.am: Add patch.
		* NEWS: Updated.
		* patches/openjdk/6444769-windowwithwarningtest.patch: Remove
	obsolete WindowWithWarningTest.


diffstat:

4 files changed, 367 insertions(+), 1 deletion(-)
ChangeLog                                           |   12 
Makefile.am                                         |    1 
NEWS                                                |    3 
patches/openjdk/6444769-windowwithwarningtest.patch |  352 +++++++++++++++++++

diffs (407 lines):

diff -r 2d689773ef17 -r 728aac195993 ChangeLog
--- a/ChangeLog	Thu Feb 17 21:44:24 2011 +0000
+++ b/ChangeLog	Fri Feb 18 00:34:56 2011 +0000
@@ -1,3 +1,15 @@ 2011-02-17  Andrew John Hughes  <ahughes
+2011-02-18  Andrew John Hughes  <ahughes at redhat.com>
+
+	S6444769: java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html fails
+	* Makefile.am: Add patch.
+	* NEWS: Updated.
+	* patches/openjdk/6444769-windowwithwarningtest.patch:
+	Remove obsolete WindowWithWarningTest.
+
+2011-02-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Fix placement of PR632.
+
 2011-02-17  Andrew John Hughes  <ahughes at redhat.com>
 
 	6693253: Security Warning appearance requires enhancements
diff -r 2d689773ef17 -r 728aac195993 Makefile.am
--- a/Makefile.am	Thu Feb 17 21:44:24 2011 +0000
+++ b/Makefile.am	Fri Feb 18 00:34:56 2011 +0000
@@ -200,6 +200,7 @@ ICEDTEA_PATCHES = \
         patches/openjdk/6755274-glgetstring-crash.patch \
         patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
 	patches/openjdk/6693253-security_warning.patch \
+	patches/openjdk/6444769-windowwithwarningtest.patch \
 	patches/icedtea-notice-safepoints.patch \
 	patches/icedtea-parisc-opt.patch \
 	patches/icedtea-lucene-crash.patch \
diff -r 2d689773ef17 -r 728aac195993 NEWS
--- a/NEWS	Thu Feb 17 21:44:24 2011 +0000
+++ b/NEWS	Fri Feb 18 00:34:56 2011 +0000
@@ -418,15 +418,16 @@ New in release 1.10 (2011-XX-XX):
   - S7015232: missing copyright header in CheckZOrderChange.java
   - S7017581: missing copyright header in test/sun/java2d/pipe/RegionOps.java
   - S6896068: SunGraphics2D exposes a reference to itself while non fully initialised.
-  - PR632: patches/security/20110215/6878713.patch breaks shark zero build
   - S6749060: LCD AA text rendered incorrectly when destination is non opaque (sw pipeline only)
   - S6728834: D3D/OGL: LCD AA text becomes bold and blurred when rendering to a non-opaque destination
   - S6693253: Security Warning appearance requires enhancements
   - S6779717: A Window does not show applet security warning icon on X platforms
   - S6785058: Parent don't get the focus after dialog is closed if security warning is applied
+  - S6444769: java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html fails
 * Bug fixes
   - RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
   - PR616, PR99: Don't statically link libstdc++ or libgcc
+  - PR632: patches/security/20110215/6878713.patch breaks shark zero build
 
 New in release 1.9.7 (2011-02-15):
 
diff -r 2d689773ef17 -r 728aac195993 patches/openjdk/6444769-windowwithwarningtest.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6444769-windowwithwarningtest.patch	Fri Feb 18 00:34:56 2011 +0000
@@ -0,0 +1,352 @@
+# HG changeset patch
+# User andrew
+# Date 1292334667 0
+# Node ID ff5b73fcc2ac8d72c0df5d31b6210ecb73eb4391
+# Parent  3d243dc7441260f121db54cca6fbc99fec1e929a
+6444769: java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html fails
+Summary: Remove unneeded test
+Reviewed-by: anthony
+
+diff -r 3d243dc74412 -r ff5b73fcc2ac test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html
+--- openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html	Thu Feb 17 20:36:45 2011 +0000
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,20 +0,0 @@
+-<html>
+-<!--
+-        @test
+-        @bug 6391770
+-        @summary Content of the Window should be laid out in the area left after WarningWindow was added.
+-        @author Yuri Nesterenko
+-        @run applet WindowWithWarningTest.html
+--->
+-
+-  <head>
+-    <title>WindowWithWarningTest</title>
+-  </head>
+-  <pre>
+-  This test will run automatically.
+-  </pre>
+-  <body>
+-    <applet code="WindowWithWarningTest.class" width=350 height=300></applet>
+-  </body>
+-</html>
+-
+diff -r 3d243dc74412 -r ff5b73fcc2ac test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java
+--- openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java	Thu Feb 17 20:36:45 2011 +0000
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,315 +0,0 @@
+-/*
+- * Copyright (c) 2006, 2008, 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.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+- * or visit www.oracle.com if you need additional information or have any
+- * questions.
+- */
+-
+-
+-/*
+-  test
+-  @bug 6391770
+-  @summary Content of the Window should be laid out in the area left after WarningWindow was added.
+-  @author yuri nesterenko: area=
+-  @run applet WindowWithWarningTest.html
+-*/
+-
+-// Note there is no @ in front of test above.  This is so that the
+-//  harness will not mistake this file as a test file.  It should
+-//  only see the html file as a test file. (the harness runs all
+-//  valid test files, so it would run this test twice if this file
+-//  were valid as well as the html file.)
+-// Also, note the area= after Your Name in the author tag.  Here, you
+-//  should put which functional area the test falls in.  See the
+-//  AWT-core home page -> test areas and/or -> AWT team  for a list of
+-//  areas.
+-// Note also the 'AutomaticAppletTest.html' in the run tag.  This should
+-//  be changed to the name of the test.
+-
+-
+-/**
+- * WindowWithWarningTest.java
+- *
+- * summary:
+- */
+-
+-import java.applet.Applet;
+-import java.awt.*;
+-import java.awt.event.*;
+-import javax.swing.*;
+-
+-//Automated tests should run as applet tests if possible because they
+-// get their environments cleaned up, including AWT threads, any
+-// test created threads, and any system resources used by the test
+-// such as file descriptors.  (This is normally not a problem as
+-// main tests usually run in a separate VM, however on some platforms
+-// such as the Mac, separate VMs are not possible and non-applet
+-// tests will cause problems).  Also, you don't have to worry about
+-// synchronisation stuff in Applet tests they way you do in main
+-// tests...
+-
+-
+-public class WindowWithWarningTest extends Applet
+-{
+-    //Declare things used in the test, like buttons and labels here
+-    boolean buttonClicked = false;
+-    public static final int MAX_COUNT = 100;
+-
+-    public void init()
+-    {
+-        //Create instructions for the user here, as well as set up
+-        // the environment -- set the layout manager, add buttons,
+-        // etc.
+-
+-        this.setLayout (new BorderLayout ());
+-
+-        String[] instructions =
+-        {
+-            "This is an AUTOMATIC test",
+-            "simply wait until it is done"
+-        };
+-        //Sysout.createDialog( );
+-        //Sysout.printInstructions( instructions );
+-
+-    }//End  init()
+-    public void start ()
+-    {
+-        //Get things going.  Request focus, set size, et cetera
+-        System.setSecurityManager( new SecurityManager() {
+-        // deny AWTPermission("showWindowWithoutWarningBanner")
+-            public boolean checkTopLevelWindow(Object window) {
+-                return false;
+-            }
+-         });
+-        JFrame frame = new JFrame("Window Test");
+-        frame.setBounds(50, 50, 200, 200);
+-        frame.show();
+-
+-        JWindow window = new JWindow( frame );
+-        JButton jbutton1 = new JButton( "First" );
+-        jbutton1.addMouseListener( new MouseAdapter() {
+-            public void mousePressed( MouseEvent me ) {
+-                buttonClicked = true;
+-            }
+-         });
+-        JButton jbutton2 = new JButton( "Second" );
+-        window.setLocation( 300, 300 );
+-
+-        window.add("North", jbutton1);
+-        window.add("South", jbutton2);
+-
+-        window.pack();
+-        window.show();
+-        //wait for frame to show:
+-        getLocation( frame );
+-        window.toFront();
+-
+-        Dimension size0 = window.getSize();
+-        Dimension size1 = null;
+-        try {
+-            Robot robot = new Robot();
+-
+-            robot.delay(500);
+-            window.pack();
+-            robot.delay(500);
+-            window.pack();
+-            // size1 must be the same as size0
+-            size1 = window.getSize();
+-            robot.delay(500);
+-            Point pt = jbutton1.getLocationOnScreen();
+-            robot.mouseMove((int) jbutton1.getLocationOnScreen().x + jbutton1.getWidth() / 2,
+-                            (int) jbutton1.getLocationOnScreen().y + jbutton1.getHeight() / 2);
+-            robot.delay(500);
+-            robot.mousePress(MouseEvent.BUTTON1_MASK);
+-            robot.delay(100);
+-            robot.mouseRelease(MouseEvent.BUTTON1_MASK);
+-            robot.delay(2000);
+-         }catch(Exception e) {
+-            throw new RuntimeException( "Exception "+e );
+-         }
+-         if( !size0.equals(size1) ) {
+-            throw new RuntimeException( "Wrong Window size after multiple pack()s");
+-         }
+-         if( !buttonClicked ) {
+-            throw new RuntimeException( "Button was not clicked");
+-         }
+-         window.dispose();
+-         frame.dispose();
+-
+-         System.out.println("Test Passed.");
+-    }// start()
+-    public static Point getLocation( Component co ) throws RuntimeException {
+-       Point pt = null;
+-       boolean bFound = false;
+-       int count = 0;
+-       while( !bFound ) {
+-          try {
+-             pt = co.getLocationOnScreen();
+-             bFound = true;
+-          }catch( Exception ex ) {
+-             bFound = false;
+-             count++;
+-          }
+-          if( !bFound && count > MAX_COUNT ) {
+-             throw new RuntimeException("don't see a component to get location");
+-          }
+-       }
+-       return pt;
+-    }
+-
+-
+-}// class AutomaticAppletTest
+-
+-
+-/****************************************************
+- Standard Test Machinery
+- DO NOT modify anything below -- it's a standard
+-  chunk of code whose purpose is to make user
+-  interaction uniform, and thereby make it simpler
+-  to read and understand someone else's test.
+- ****************************************************/
+-
+-/**
+- This is part of the standard test machinery.
+- It creates a dialog (with the instructions), and is the interface
+-  for sending text messages to the user.
+- To print the instructions, send an array of strings to Sysout.createDialog
+-  WithInstructions method.  Put one line of instructions per array entry.
+- To display a message for the tester to see, simply call Sysout.println
+-  with the string to be displayed.
+- This mimics System.out.println but works within the test harness as well
+-  as standalone.
+- */
+-
+-class Sysout
+-{
+-    private static TestDialog dialog;
+-
+-    public static void createDialogWithInstructions( String[] instructions )
+-    {
+-        dialog = new TestDialog( new Frame(), "Instructions" );
+-        dialog.printInstructions( instructions );
+-        dialog.setVisible(true);
+-        println( "Any messages for the tester will display here." );
+-    }
+-
+-    public static void createDialog( )
+-    {
+-        dialog = new TestDialog( new Frame(), "Instructions" );
+-        String[] defInstr = { "Instructions will appear here. ", "" } ;
+-        dialog.printInstructions( defInstr );
+-        dialog.setVisible(true);
+-        println( "Any messages for the tester will display here." );
+-    }
+-
+-
+-    public static void printInstructions( String[] instructions )
+-    {
+-        dialog.printInstructions( instructions );
+-    }
+-
+-
+-    public static void println( String messageIn )
+-    {
+-        dialog.displayMessage( messageIn );
+-    }
+-
+-}// Sysout  class
+-
+-/**
+-  This is part of the standard test machinery.  It provides a place for the
+-   test instructions to be displayed, and a place for interactive messages
+-   to the user to be displayed.
+-  To have the test instructions displayed, see Sysout.
+-  To have a message to the user be displayed, see Sysout.
+-  Do not call anything in this dialog directly.
+-  */
+-class TestDialog extends Dialog
+-{
+-
+-    TextArea instructionsText;
+-    TextArea messageText;
+-    int maxStringLength = 80;
+-
+-    //DO NOT call this directly, go through Sysout
+-    public TestDialog( Frame frame, String name )
+-    {
+-        super( frame, name );
+-        int scrollBoth = TextArea.SCROLLBARS_BOTH;
+-        instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+-        add( "North", instructionsText );
+-
+-        messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+-        add("Center", messageText);
+-
+-        pack();
+-
+-        show();
+-    }// TestDialog()
+-
+-    //DO NOT call this directly, go through Sysout
+-    public void printInstructions( String[] instructions )
+-    {
+-        //Clear out any current instructions
+-        instructionsText.setText( "" );
+-
+-        //Go down array of instruction strings
+-
+-        String printStr, remainingStr;
+-        for( int i=0; i < instructions.length; i++ )
+-        {
+-            //chop up each into pieces maxSringLength long
+-            remainingStr = instructions[ i ];
+-            while( remainingStr.length() > 0 )
+-            {
+-                //if longer than max then chop off first max chars to print
+-                if( remainingStr.length() >= maxStringLength )
+-                {
+-                    //Try to chop on a word boundary
+-                    int posOfSpace = remainingStr.
+-                        lastIndexOf( ' ', maxStringLength - 1 );
+-
+-                    if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+-
+-                    printStr = remainingStr.substring( 0, posOfSpace + 1 );
+-                    remainingStr = remainingStr.substring( posOfSpace + 1 );
+-                }
+-                //else just print
+-                else
+-                {
+-                    printStr = remainingStr;
+-                    remainingStr = "";
+-                }
+-
+-                instructionsText.append( printStr + "\n" );
+-
+-            }// while
+-
+-        }// for
+-
+-    }//printInstructions()
+-
+-    //DO NOT call this directly, go through Sysout
+-    public void displayMessage( String messageIn )
+-    {
+-        messageText.append( messageIn + "\n" );
+-        System.out.println(messageIn);
+-    }
+-
+-}// TestDialog  class



More information about the distro-pkg-dev mailing list