From 2b56412ece33d4a8913f4dc1b87066e447a3e352 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 20 Nov 2002 12:55:53 +0000 Subject: [PATCH] Looks as if JDK 1.4 is counting lines differently git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273561 13f79535-47bb-0310-9956-ffa450edef68 --- .../ant/taskdefs/optional/sitraka/ClassFileTest.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 d695df109..4d90a5e32 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 @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,6 +57,7 @@ import java.io.IOException; import java.io.InputStream; import junit.framework.TestCase; +import org.apache.tools.ant.util.JavaEnvUtils; import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassFile; import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.MethodInfo; @@ -81,7 +82,14 @@ public class ClassFileTest extends TestCase { assertEquals(3, methods.length); assertHasMethod("void ()", 2, methods); assertHasMethod("void testTwoLines()", 2, methods); - assertHasMethod("void testOneLine()", 3, 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); } protected void assertHasMethod(String methodsig, int line, MethodInfo[] methods) {