From 2007b35f99f0e690d294578ae330d3528bc0e5e6 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 16 May 2011 15:09:43 +0400 Subject: [PATCH] test is slow on slow machine --- .../src/com/intellij/testFramework/IdeaTestUtil.java | 2 +- .../src/com/intellij/testFramework/PlatformTestUtil.java | 8 ++------ .../src/com/intellij/testFramework/Timings.java | 8 ++++++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java index bfd3d274a196..a03ec4e4f42a 100644 --- a/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java +++ b/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java @@ -55,7 +55,7 @@ public class IdeaTestUtil extends PlatformTestUtil { @SuppressWarnings({"UseOfSystemOutOrSystemErr"}) public static void printDetectedPerformanceTimings() { - System.out.println("Etalon timing: " + ETALON_TIMING); + System.out.println("Etalon timing: " + Timings.ETALON_TIMING); System.out.println("This machine timing: " + Timings.MACHINE_TIMING); } diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java index d94395f420a4..52823807adfd 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java @@ -72,10 +72,6 @@ import java.util.jar.JarFile; * @author yole */ public class PlatformTestUtil { - /** - * Measured on dual core p4 3HZ 1gig ram - */ - protected static final long ETALON_TIMING = 438; public static final boolean COVERAGE_ENABLED_BUILD = "true".equals(System.getProperty("idea.coverage.enabled.build")); public static final CvsVirtualFileFilter CVS_FILE_FILTER = new CvsVirtualFileFilter(); @@ -375,7 +371,7 @@ public class PlatformTestUtil { public static void assertTiming(final String message, final long expected, final long actual) { if (COVERAGE_ENABLED_BUILD) return; - final long expectedOnMyMachine = Math.max(1, expected * Timings.MACHINE_TIMING / ETALON_TIMING); + final long expectedOnMyMachine = Math.max(1, expected * Timings.MACHINE_TIMING / Timings.ETALON_TIMING); final double acceptableChangeFactor = 1.1; // Allow 10% more in case of test machine is busy. @@ -387,7 +383,7 @@ public class PlatformTestUtil { logMessage += " Expected on my machine: " + expectedOnMyMachine + "." + " Actual: " + actual + "." + " Expected on Etalon machine: " + expected + ";" + - " Actual on Etalon: " + actual * ETALON_TIMING / Timings.MACHINE_TIMING + ";" + + " Actual on Etalon: " + actual * Timings.ETALON_TIMING / Timings.MACHINE_TIMING + ";" + " Timings: CPU=" + Timings.CPU_TIMING + ", I/O=" + Timings.IO_TIMING + "."; if (actual < expectedOnMyMachine) { diff --git a/platform/testFramework/src/com/intellij/testFramework/Timings.java b/platform/testFramework/src/com/intellij/testFramework/Timings.java index 7fa1027753c9..7190f47b2b7c 100644 --- a/platform/testFramework/src/com/intellij/testFramework/Timings.java +++ b/platform/testFramework/src/com/intellij/testFramework/Timings.java @@ -33,9 +33,8 @@ public class Timings { public static final long MACHINE_TIMING; static { - long start; - start = System.currentTimeMillis(); + long start = System.currentTimeMillis(); BigInteger k = new BigInteger("1"); for (int i = 0; i < CPU_PROBES; i++) { k = k.add(new BigInteger("1")); @@ -88,4 +87,9 @@ public class Timings { MACHINE_TIMING = CPU_TIMING + IO_TIMING; } + + /** + * Measured on dual core p4 3HZ 1gig ram + */ + public static final long ETALON_TIMING = 438; }