harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apavle...@apache.org
Subject svn commit: r600829 - /harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/swing/JComponent/JComponentAncestorListenerTest.java
Date Tue, 04 Dec 2007 08:06:28 GMT
Author: apavlenko
Date: Tue Dec  4 00:06:27 2007
New Revision: 600829

URL: http://svn.apache.org/viewvc?rev=600829&view=rev
Log:
Applied patch for HARMONY-4436

Modified:
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/swing/JComponent/JComponentAncestorListenerTest.java

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/swing/JComponent/JComponentAncestorListenerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/swing/JComponent/JComponentAncestorListenerTest.java?rev=600829&r1=600828&r2=600829&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/swing/JComponent/JComponentAncestorListenerTest.java
(original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/swing/JComponent/JComponentAncestorListenerTest.java
Tue Dec  4 00:06:27 2007
@@ -263,9 +263,18 @@
         l1 = al1.getLog();
         l2 = al2.getLog();
 
-        if (l1.size() != 2 || !"removed".equals(l1.get(0))
-                || !"removed".equals(l1.get(1)) || l2.size() != 1
-                || !"removed".equals(l2.get(0))) {
+        if ((l1.size() != 2 || !"removed".equals(l1.get(0))
+                || !"removed".equals(l1.get(1)) || l2.size() != 1 || !"removed"
+                .equals(l2.get(0)))
+                && (l1.size() != 4 || !"removed".equals(l1.get(0))
+                        || !"removed".equals(l1.get(1))
+                        || !"removed".equals(l1.get(2))
+                        || !"removed".equals(l1.get(3))
+                        || l2.size() != 2 
+                        || !"removed".equals(l2.get(0))
+                        || !"removed".equals(l2.get(1))
+                        )
+                && (l1.size() != 0 && l2.size() != 0)) {
             return failed("wrong AncestorListener hooks called on second jc.setVisible(false)");
         }
 
@@ -312,4 +321,4 @@
     public List getLog() {
         return log;
     }
-}
\ No newline at end of file
+}



Mime
View raw message