--- /dev/null	2013-05-27 09:16:24.088852603 +0200
+++ new/test/gc/g1/TestSummarizeRSetStatsTime.java	2013-05-28 10:04:43.588576158 +0200
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test TestSummarizeRSetStatsTime.java
+ * @bug 8014078
+ * @library /testlibrary
+ * @build TestSummarizeRSetStatsTime TestSummarizeRSetStatsTools
+ * @summary Verify output of -XX:+G1SummarizeRSetStats in combination with -XX:G1SummarizeRSetStatsTime
+ * @run main TestSummarizeRSetStatsTime
+ *
+ * Test the output of G1SummarizeRSetStats in conjunction with G1SummarizeRSetStatsTime.
+ */
+
+public class TestSummarizeRSetStatsTime {
+
+    private static void expectStatistics(String result, int expectedCumulative, int expectedPeriodicBefore, int expectedPeriodicAfter) throws Exception {
+        TestSummarizeRSetStatsTools.expectStatistics(result, expectedCumulative, expectedPeriodicBefore + expectedPeriodicAfter);
+        int actualBefore = result.split("Before GC RS summary").length - 1;
+        int actualAfter = result.split("After GC RS summary").length - 1;
+
+        if (expectedPeriodicBefore != actualBefore) {
+            throw new Exception("Incorrect amount of RSet summaries before GC. Expected " + expectedPeriodicBefore + ", got " + actualBefore);
+        }
+        if (expectedPeriodicAfter != actualAfter) {
+            throw new Exception("Incorrect amount of RSet summaries after GC. Expected " + expectedPeriodicAfter + ", got " + actualAfter);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        String result;
+
+        // single RSet statistics output
+        result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1", "-XX:G1SummarizeRSetStatsTime=2" }, 0);
+        expectStatistics(result, 1, 0, 0);
+
+        // single RSet statistics output
+        result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1", "-XX:G1SummarizeRSetStatsTime=3" }, 0);
+        expectStatistics(result, 1, 0, 0);
+
+        // two times RSet statistics output
+        result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1", "-XX:G1SummarizeRSetStatsTime=2" }, 1);
+        expectStatistics(result, 1, 1, 0);
+
+        // seven times RSet statistics output
+        result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1", "-XX:G1SummarizeRSetStatsTime=3" }, 3);
+        expectStatistics(result, 1, 3, 3);
+
+        // five times RSet statistics output
+        result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=2", "-XX:G1SummarizeRSetStatsTime=3" }, 3);
+        expectStatistics(result, 1, 2, 2);
+    }
+}