archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 04:24:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8165704: Convert LogStream internal tests to GTest

Browse source 
Reviewed-by: rehn, rprotacio
This commit is contained in:
Marcus Larsson 2016-09-08 15:51:33 +02:00
parent e544c70170
commit 430b8c3e25
3 changed files with 83 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

75
hotspot/src/share/vm/logging/log.cpp
View file

@ -270,81 +270,6 @@ void Test_logtarget() {
Test_logtarget_off();
}
static void Test_logstream_helper(outputStream* stream) {
TestLogFile log_file("log_stream");
TestLogSavedConfig tlsc(log_file.name(), "gc=debug");
// Try to log, but expect this to be filtered out.
stream->print("%d ", 3); stream->print("workers"); stream->cr();
FILE* fp = fopen(log_file.name(), "r");
assert(fp != NULL, "File read error");
char output[256 /* Large enough buffer */];
char* res = fgets(output, sizeof(output), fp);
assert(res != NULL, "assert");
assert(strstr(output, "3 workers") != NULL, "log line missing");
fclose(fp);
}
static void Test_logstream_log() {
Log(gc) log;
LogStream stream(log.debug());
Test_logstream_helper(&stream);
}
static void Test_logstream_logtarget() {
LogTarget(Debug, gc) log;
LogStream stream(log);
Test_logstream_helper(&stream);
}
static void Test_logstream_logstreamhandle() {
LogStreamHandle(Debug, gc) stream;
Test_logstream_helper(&stream);
}
static void Test_logstream_no_rm() {
ResourceMark rm;
outputStream* stream = LogTarget(Debug, gc)::stream();
Test_logstream_helper(stream);
}
static void Test_logstreamcheap_log() {
Log(gc) log;
LogStreamCHeap stream(log.debug());
Test_logstream_helper(&stream);
}
static void Test_logstreamcheap_logtarget() {
LogTarget(Debug, gc) log;
LogStreamCHeap stream(log);
Test_logstream_helper(&stream);
}
void Test_logstream() {
// Test LogStreams with embedded ResourceMark.
Test_logstream_log();
Test_logstream_logtarget();
Test_logstream_logstreamhandle();
// Test LogStreams without embedded ResourceMark.
Test_logstream_no_rm();
// Test LogStreams backed by CHeap memory.
Test_logstreamcheap_log();
Test_logstreamcheap_logtarget();
}
void Test_loghandle_on() {
TestLogFile log_file("log_handle");
TestLogSavedConfig tlsc(log_file.name(), "gc=debug");

1
hotspot/src/share/vm/utilities/internalVMTests.cpp
View file

@ -60,7 +60,6 @@ void InternalVMTests::run() {
run_unit_test(TestBitMap_test);
run_unit_test(ObjectMonitor_test);
run_unit_test(Test_logtarget);
run_unit_test(Test_logstream);
run_unit_test(Test_loghandle);
run_unit_test(Test_logtargethandle);
run_unit_test(Test_configure_stdout);

83
hotspot/test/native/logging/test_logStream.cpp Normal file
View file

@ -0,0 +1,83 @@
/*
* Copyright (c) 2016, 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.
*
*/
#include "precompiled.hpp"
#include "logTestFixture.hpp"
#include "logTestUtils.inline.hpp"
#include "logging/log.hpp"
#include "logging/logStream.hpp"
#include "unittest.hpp"
class LogStreamTest : public LogTestFixture {
protected:
void verify_stream(outputStream* stream);
};
void LogStreamTest::verify_stream(outputStream* stream) {
set_log_config(TestLogFileName, "gc=debug");
stream->print("%d ", 3);
stream->print("workers");
stream->cr();
EXPECT_TRUE(file_contains_substring(TestLogFileName, "3 workers\n"));
}
TEST_F(LogStreamTest, from_log) {
Log(gc) log;
LogStream stream(log.debug());
verify_stream(&stream);
}
TEST_F(LogStreamTest, from_logtarget) {
LogTarget(Debug, gc) log;
LogStream stream(log);
verify_stream(&stream);
}
TEST_F(LogStreamTest, handle) {
LogStreamHandle(Debug, gc) stream;
verify_stream(&stream);
}
TEST_F(LogStreamTest, no_rm) {
ResourceMark rm;
outputStream* stream = LogTarget(Debug, gc)::stream();
verify_stream(stream);
}
TEST_F(LogStreamTest, c_heap_stream) {
Log(gc) log;
LogStreamCHeap stream(log.debug());
verify_stream(&stream);
}
TEST_F(LogStreamTest, c_heap_stream_target) {
LogTarget(Debug, gc) log;
LogStreamCHeap stream(log);
verify_stream(&stream);
}