changeset 1070:340244351917

7901225: JMH converts the result file name to lower-case Summary: Fix the operation order, only lower-case the result format suffix.
author shade
date Mon, 22 Dec 2014 17:12:32 +0300
parents 56fd40275263
children df151f9c0071
files jmh-core-it/src/test/java/org/openjdk/jmh/it/result/ResultFileNameTest.java jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java
diffstat 2 files changed, 93 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/result/ResultFileNameTest.java	Mon Dec 22 17:12:32 2014 +0300
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.jmh.it.result;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.it.Fixtures;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests if harness favors the iteration count annotations.
+ */
+@State(Scope.Thread)
+public class ResultFileNameTest {
+
+    @Benchmark
+    @BenchmarkMode(Mode.All)
+    @Warmup(iterations = 0)
+    @Measurement(iterations = 1, time = 1, timeUnit = TimeUnit.MILLISECONDS)
+    @Fork(1)
+    public void test() {
+        Fixtures.work();
+    }
+
+    @Test
+    public void testLower() throws RunnerException, IOException {
+        doWith("jmh" + this.getClass().getSimpleName().toLowerCase() + ".result");
+    }
+
+    @Test
+    public void testUpper() throws RunnerException, IOException {
+        doWith("JMH" + this.getClass().getSimpleName().toUpperCase() + ".RESULT");
+    }
+
+    @Test
+    public void testMixed() throws RunnerException, IOException {
+        doWith("jmh" + this.getClass().getSimpleName() + ".result");
+    }
+
+    public void doWith(String name) throws RunnerException, IOException {
+        name = System.getProperty("java.io.tmpdir") + File.separator + name;
+        Options opts = new OptionsBuilder()
+                .include(Fixtures.getTestMask(this.getClass()))
+                .shouldFailOnError(true)
+                .result(name)
+                .build();
+        new Runner(opts).run();
+
+        Assert.assertTrue(new File(name).exists());
+    }
+
+}
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java	Fri Dec 19 02:54:08 2014 +0300
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java	Mon Dec 22 17:12:32 2014 +0300
@@ -235,8 +235,10 @@
         // and prepare to write it out after the run.
         String resultFile = null;
         if (options.getResult().hasValue() || options.getResultFormat().hasValue()) {
-            resultFile = options.getResult().orElse(Defaults.RESULT_FILE_PREFIX + "."
-                    + options.getResultFormat().orElse(Defaults.RESULT_FORMAT)).toLowerCase();
+            resultFile = options.getResult().orElse(
+                        Defaults.RESULT_FILE_PREFIX + "." +
+                                options.getResultFormat().orElse(Defaults.RESULT_FORMAT).toString().toLowerCase()
+                    );
             try {
                 FileUtils.touch(resultFile);
             } catch (IOException e) {