From e3d61199531e8966012be3881e635770f418d0a0 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Tue, 4 Feb 2003 13:53:52 +0000
Subject: [PATCH] Make this test pass on different JDK 1.4 minor versions

PR:	15250


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273972 13f79535-47bb-0310-9956-ffa450edef68
---
 .../optional/sitraka/ClassFileTest.java        | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java
index 4d90a5e32..09de25c44 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java
@@ -82,14 +82,7 @@ public class ClassFileTest extends TestCase {
         assertEquals(3, methods.length);
         assertHasMethod("void <init>()", 2, methods);
         assertHasMethod("void testTwoLines()", 2, methods);
-        assertHasMethod("void testOneLine()", 
-                        // in JDK 1.4 we get four lines
-                        3 + 
-                        (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)
-                         || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2)
-                         || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3)
-                         ? 0 : 1),
-                        methods);
+        assertHasMethod("void testOneLine()", 3, methods);
     }
 
     protected void assertHasMethod(String methodsig, int line, MethodInfo[] methods) {
@@ -97,7 +90,8 @@ public class ClassFileTest extends TestCase {
         for (int i = 0; i < methods.length; i++) {
             MethodInfo method = methods[i];
             if (methodsig.equals(method.getFullSignature())) {
-                assertEquals(methodsig, line, method.getNumberOfLines());
+                
+                assertTrue(methodsig, method.getNumberOfLines() >= line);
                 return;
             }
         }
@@ -108,16 +102,16 @@ public class ClassFileTest extends TestCase {
 class ClassTest {
 
     // 2 lines
-            public ClassTest() {
+    public ClassTest() {
     }
 
     // 2 lines
-            public void testTwoLines() {
+    public void testTwoLines() {
         System.out.println("This is 1 line");
     }
 
     // 1 line
-            public void testOneLine() {
+    public void testOneLine() {
         try {
             throw new Exception();
         } catch (Exception e) {