Skip to content

logging: clean up test #1720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pongad merged 3 commits into from
Mar 9, 2017
Merged

logging: clean up test #1720

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eea697f
logging: clean up test
pongad Mar 9, 2017
918a606
Merge branch 'master' into logging-clean-test
pongad Mar 9, 2017
c8c3597
s/DEFAULT_OPTION/&S/g
pongad Mar 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 28 additions & 39 deletions google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ public class LoggingHandlerTest {
.append("com.google.cloud.logging.LoggingHandler.synchronicity=SYNC")
.append(System.lineSeparator())
.toString();
private static final WriteOption[] DEFAULT_OPTIONS =
new WriteOption[] {WriteOption.logName(LOG_NAME), WriteOption.resource(DEFAULT_RESOURCE)};

private Logging logging;
private LoggingOptions options;
Expand Down Expand Up @@ -200,7 +202,7 @@ public void setUp() {
public void afterClass() {
EasyMock.verify(logging, options);
}


private static LogRecord newLogRecord(Level level, String message) {
LogRecord record = new LogRecord(level, message);
Expand All @@ -212,44 +214,31 @@ private static LogRecord newLogRecord(Level level, String message) {
public void testPublishLevels() {
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
EasyMock.expect(options.getService()).andReturn(logging);
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(FINER_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(FINER_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(FINE_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(FINE_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(CONFIG_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(CONFIG_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(INFO_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(INFO_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(WARNING_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(WARNING_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(SEVERE_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(SEVERE_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(DEBUG_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(DEBUG_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(NOTICE_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(NOTICE_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(ERROR_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(ERROR_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(CRITICAL_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(CRITICAL_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(ALERT_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(ALERT_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.writeAsync(ImmutableList.of(EMERGENCY_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(EMERGENCY_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
EasyMock.replay(options, logging);
Handler handler = new LoggingHandler(LOG_NAME, options);
Expand Down Expand Up @@ -313,14 +302,13 @@ public void enhanceLogEntry(Builder builder, LogRecord record) {
handler.setFormatter(new TestFormatter());
handler.publish(newLogRecord(Level.FINEST, MESSAGE));
}

@Test
public void testReportFlushError() {
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
EasyMock.expect(options.getService()).andReturn(logging);
RuntimeException ex = new RuntimeException();
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andThrow(ex);
EasyMock.replay(options, logging);
ErrorManager errorManager = EasyMock.createStrictMock(ErrorManager.class);
Expand Down Expand Up @@ -359,8 +347,10 @@ public void testReportFormatError() {
public void testFlushSize() {
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
EasyMock.expect(options.getService()).andReturn(logging);
logging.writeAsync(ImmutableList.of(FINEST_ENTRY, FINER_ENTRY, FINE_ENTRY, CONFIG_ENTRY, INFO_ENTRY,
WARNING_ENTRY), WriteOption.logName(LOG_NAME), WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(
ImmutableList.of(
FINEST_ENTRY, FINER_ENTRY, FINE_ENTRY, CONFIG_ENTRY, INFO_ENTRY, WARNING_ENTRY),
DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
EasyMock.replay(options, logging);
LoggingHandler handler = new LoggingHandler(LOG_NAME, options);
Expand All @@ -379,9 +369,10 @@ public void testFlushSize() {
public void testFlushLevel() {
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
EasyMock.expect(options.getService()).andReturn(logging);
logging.writeAsync(ImmutableList.of(FINEST_ENTRY, FINER_ENTRY, FINE_ENTRY, CONFIG_ENTRY, INFO_ENTRY,
WARNING_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(
ImmutableList.of(
FINEST_ENTRY, FINER_ENTRY, FINE_ENTRY, CONFIG_ENTRY, INFO_ENTRY, WARNING_ENTRY),
DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
EasyMock.replay(options, logging);
LoggingHandler handler = new LoggingHandler(LOG_NAME, options);
Expand Down Expand Up @@ -426,8 +417,7 @@ public void testSyncWrite() {
public void testAddHandler() {
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
EasyMock.expect(options.getService()).andReturn(logging);
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
EasyMock.replay(options, logging);
LoggingHandler handler = new LoggingHandler(LOG_NAME, options) {
Expand Down Expand Up @@ -490,8 +480,7 @@ public void testPropertiesFile() throws IOException, InterruptedException {
public void testClose() throws Exception {
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
EasyMock.expect(options.getService()).andReturn(logging);
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), WriteOption.logName(LOG_NAME),
WriteOption.resource(DEFAULT_RESOURCE));
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), DEFAULT_OPTIONS);
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
logging.close();
EasyMock.expectLastCall().once();
Expand Down