# HG changeset patch # User kshefov # Date 1371822780 -14400 # Node ID 6612728b51914f0e35728b5aba9bfd26c38e63d1 # Parent bad5e0686160c9c0e3148317acd9a40aa53ad398 8015976: OpenJDK part of bug JDK-8015812 [TEST_BUG] Tests have conflicting test descriptions Reviewed-by: coffeys, alanb diff -r bad5e0686160 -r 6612728b5191 test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html --- a/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html Tue Jan 14 20:24:45 2014 -0500 +++ b/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html Fri Jun 21 17:53:00 2013 +0400 @@ -1,6 +1,5 @@ - - @run applet/othervm MissedHtmlAndRtfBug.html -*/> Java 7 on mac os x only provides text clipboard formats diff -r bad5e0686160 -r 6612728b5191 test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java --- a/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java Tue Jan 14 20:24:45 2014 -0500 +++ b/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java Fri Jun 21 17:53:00 2013 +0400 @@ -22,17 +22,10 @@ */ /* - @test - @bug 8005932 - @summary Java 7 on mac os x only provides text clipboard formats - @author mikhail.cherkasov@oracle.com - @library ../../regtesthelpers - @library ../../regtesthelpers/process - @build Util - @build ProcessResults ProcessCommunicator - - - @run applet/othervm MissedHtmlAndRtfBug.html + This is a part of MissedHtmlAndRtfBug.html test. Do not add any JTREG tags here + bug 8005932 + summary Java 7 on mac os x only provides text clipboard formats + author mikhail.cherkasov@oracle.com */ import java.awt.*; import java.awt.datatransfer.DataFlavor; diff -r bad5e0686160 -r 6612728b5191 test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java --- a/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java Tue Jan 14 20:24:45 2014 -0500 +++ b/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java Fri Jun 21 17:53:00 2013 +0400 @@ -39,13 +39,10 @@ import java.util.Hashtable; /* -@test -@bug 8010009 -@summary [macosx] Unable type into online word games on MacOSX -@author petr.pchelko : area=awt.keyboard -@run clean * -@run build TestApplet -@run applet/manual=yesno KeyReleasedInAppletTest.html + This is a part of test KeyReleasedInAppletTest.html. Do not add any JTREG tags here + bug 8010009 + summary [macosx] Unable type into online word games on MacOSX + author petr.pchelko : area=awt.keyboard */ public class KeyReleasedInAppletTest extends JApplet {