From 1f9540cce18b6fe6141ecae10ed8150329d31c1d Mon Sep 17 00:00:00 2001 From: Mark Davis Date: Thu, 10 Sep 2015 12:14:46 +0000 Subject: [PATCH] ICU-11803 added 'main', simplified code for easier debugging X-SVN-Rev: 37942 --- .../framework/src/com/ibm/icu/dev/test/TestFmwk.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestFmwk.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestFmwk.java index 81636d36d33..bf9021eff2b 100644 --- a/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestFmwk.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestFmwk.java @@ -1972,13 +1972,12 @@ public class TestFmwk extends AbstractTestLog { // Return the source code location of the caller located callDepth frames up the stack. public static String sourceLocation() { // Walk up the stack to the first call site outside this file - StackTraceElement[] st = new Throwable().getStackTrace(); - for (int i = 0; i < st.length; ++i) { - String source = st[i].getFileName(); + for (StackTraceElement st : new Throwable().getStackTrace()) { + String source = st.getFileName(); if (!source.equals("TestFmwk.java") && !source.equals("AbstractTestLog.java")) { - String methodName = st[i].getMethodName(); - if (methodName.startsWith("Test") || methodName.startsWith("test")) { - return "(" + source + ":" + st[i].getLineNumber() + ") "; + String methodName = st.getMethodName(); + if (methodName.startsWith("Test") || methodName.startsWith("test") || methodName.equals("main")) { + return "(" + source + ":" + st.getLineNumber() + ") "; } } }