Skip to content

Commit daaa5be

Browse files
pongadpongad
authored
---
yaml --- r: 7887 b: refs/heads/tswast-patch-1 c: e7f2a14 h: refs/heads/master i: 7885: 4e6cade 7883: e2972bb 7879: e3e83a0 7871: 1431a6e
1 parent d29f8c0 commit daaa5be

2 files changed

Lines changed: 29 additions & 40 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 38694e7a0080298955ae5d7539426235d11429cb
60+
refs/heads/tswast-patch-1: e7f2a14f3a6cf156a4391a4238a85e1b7534593c
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java‎

Lines changed: 28 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ public class LoggingHandlerTest {
159159
.append("com.google.cloud.logging.LoggingHandler.synchronicity=SYNC")
160160
.append(System.lineSeparator())
161161
.toString();
162+
private static final WriteOption[] DEFAULT_OPTIONS =
163+
new WriteOption[] {WriteOption.logName(LOG_NAME), WriteOption.resource(DEFAULT_RESOURCE)};
162164

163165
private Logging logging;
164166
private LoggingOptions options;
@@ -200,7 +202,7 @@ public void setUp() {
200202
public void afterClass() {
201203
EasyMock.verify(logging, options);
202204
}
203-
205+
204206

205207
private static LogRecord newLogRecord(Level level, String message) {
206208
LogRecord record = new LogRecord(level, message);
@@ -212,44 +214,31 @@ private static LogRecord newLogRecord(Level level, String message) {
212214
public void testPublishLevels() {
213215
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
214216
EasyMock.expect(options.getService()).andReturn(logging);
215-
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), WriteOption.logName(LOG_NAME),
216-
WriteOption.resource(DEFAULT_RESOURCE));
217+
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), DEFAULT_OPTIONS);
217218
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
218-
logging.writeAsync(ImmutableList.of(FINER_ENTRY), WriteOption.logName(LOG_NAME),
219-
WriteOption.resource(DEFAULT_RESOURCE));
219+
logging.writeAsync(ImmutableList.of(FINER_ENTRY), DEFAULT_OPTIONS);
220220
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
221-
logging.writeAsync(ImmutableList.of(FINE_ENTRY), WriteOption.logName(LOG_NAME),
222-
WriteOption.resource(DEFAULT_RESOURCE));
221+
logging.writeAsync(ImmutableList.of(FINE_ENTRY), DEFAULT_OPTIONS);
223222
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
224-
logging.writeAsync(ImmutableList.of(CONFIG_ENTRY), WriteOption.logName(LOG_NAME),
225-
WriteOption.resource(DEFAULT_RESOURCE));
223+
logging.writeAsync(ImmutableList.of(CONFIG_ENTRY), DEFAULT_OPTIONS);
226224
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
227-
logging.writeAsync(ImmutableList.of(INFO_ENTRY), WriteOption.logName(LOG_NAME),
228-
WriteOption.resource(DEFAULT_RESOURCE));
225+
logging.writeAsync(ImmutableList.of(INFO_ENTRY), DEFAULT_OPTIONS);
229226
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
230-
logging.writeAsync(ImmutableList.of(WARNING_ENTRY), WriteOption.logName(LOG_NAME),
231-
WriteOption.resource(DEFAULT_RESOURCE));
227+
logging.writeAsync(ImmutableList.of(WARNING_ENTRY), DEFAULT_OPTIONS);
232228
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
233-
logging.writeAsync(ImmutableList.of(SEVERE_ENTRY), WriteOption.logName(LOG_NAME),
234-
WriteOption.resource(DEFAULT_RESOURCE));
229+
logging.writeAsync(ImmutableList.of(SEVERE_ENTRY), DEFAULT_OPTIONS);
235230
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
236-
logging.writeAsync(ImmutableList.of(DEBUG_ENTRY), WriteOption.logName(LOG_NAME),
237-
WriteOption.resource(DEFAULT_RESOURCE));
231+
logging.writeAsync(ImmutableList.of(DEBUG_ENTRY), DEFAULT_OPTIONS);
238232
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
239-
logging.writeAsync(ImmutableList.of(NOTICE_ENTRY), WriteOption.logName(LOG_NAME),
240-
WriteOption.resource(DEFAULT_RESOURCE));
233+
logging.writeAsync(ImmutableList.of(NOTICE_ENTRY), DEFAULT_OPTIONS);
241234
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
242-
logging.writeAsync(ImmutableList.of(ERROR_ENTRY), WriteOption.logName(LOG_NAME),
243-
WriteOption.resource(DEFAULT_RESOURCE));
235+
logging.writeAsync(ImmutableList.of(ERROR_ENTRY), DEFAULT_OPTIONS);
244236
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
245-
logging.writeAsync(ImmutableList.of(CRITICAL_ENTRY), WriteOption.logName(LOG_NAME),
246-
WriteOption.resource(DEFAULT_RESOURCE));
237+
logging.writeAsync(ImmutableList.of(CRITICAL_ENTRY), DEFAULT_OPTIONS);
247238
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
248-
logging.writeAsync(ImmutableList.of(ALERT_ENTRY), WriteOption.logName(LOG_NAME),
249-
WriteOption.resource(DEFAULT_RESOURCE));
239+
logging.writeAsync(ImmutableList.of(ALERT_ENTRY), DEFAULT_OPTIONS);
250240
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
251-
logging.writeAsync(ImmutableList.of(EMERGENCY_ENTRY), WriteOption.logName(LOG_NAME),
252-
WriteOption.resource(DEFAULT_RESOURCE));
241+
logging.writeAsync(ImmutableList.of(EMERGENCY_ENTRY), DEFAULT_OPTIONS);
253242
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
254243
EasyMock.replay(options, logging);
255244
Handler handler = new LoggingHandler(LOG_NAME, options);
@@ -313,14 +302,13 @@ public void enhanceLogEntry(Builder builder, LogRecord record) {
313302
handler.setFormatter(new TestFormatter());
314303
handler.publish(newLogRecord(Level.FINEST, MESSAGE));
315304
}
316-
305+
317306
@Test
318307
public void testReportFlushError() {
319308
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
320309
EasyMock.expect(options.getService()).andReturn(logging);
321310
RuntimeException ex = new RuntimeException();
322-
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), WriteOption.logName(LOG_NAME),
323-
WriteOption.resource(DEFAULT_RESOURCE));
311+
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), DEFAULT_OPTIONS);
324312
EasyMock.expectLastCall().andThrow(ex);
325313
EasyMock.replay(options, logging);
326314
ErrorManager errorManager = EasyMock.createStrictMock(ErrorManager.class);
@@ -359,8 +347,10 @@ public void testReportFormatError() {
359347
public void testFlushSize() {
360348
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
361349
EasyMock.expect(options.getService()).andReturn(logging);
362-
logging.writeAsync(ImmutableList.of(FINEST_ENTRY, FINER_ENTRY, FINE_ENTRY, CONFIG_ENTRY, INFO_ENTRY,
363-
WARNING_ENTRY), WriteOption.logName(LOG_NAME), WriteOption.resource(DEFAULT_RESOURCE));
350+
logging.writeAsync(
351+
ImmutableList.of(
352+
FINEST_ENTRY, FINER_ENTRY, FINE_ENTRY, CONFIG_ENTRY, INFO_ENTRY, WARNING_ENTRY),
353+
DEFAULT_OPTIONS);
364354
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
365355
EasyMock.replay(options, logging);
366356
LoggingHandler handler = new LoggingHandler(LOG_NAME, options);
@@ -379,9 +369,10 @@ public void testFlushSize() {
379369
public void testFlushLevel() {
380370
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
381371
EasyMock.expect(options.getService()).andReturn(logging);
382-
logging.writeAsync(ImmutableList.of(FINEST_ENTRY, FINER_ENTRY, FINE_ENTRY, CONFIG_ENTRY, INFO_ENTRY,
383-
WARNING_ENTRY), WriteOption.logName(LOG_NAME),
384-
WriteOption.resource(DEFAULT_RESOURCE));
372+
logging.writeAsync(
373+
ImmutableList.of(
374+
FINEST_ENTRY, FINER_ENTRY, FINE_ENTRY, CONFIG_ENTRY, INFO_ENTRY, WARNING_ENTRY),
375+
DEFAULT_OPTIONS);
385376
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
386377
EasyMock.replay(options, logging);
387378
LoggingHandler handler = new LoggingHandler(LOG_NAME, options);
@@ -426,8 +417,7 @@ public void testSyncWrite() {
426417
public void testAddHandler() {
427418
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
428419
EasyMock.expect(options.getService()).andReturn(logging);
429-
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), WriteOption.logName(LOG_NAME),
430-
WriteOption.resource(DEFAULT_RESOURCE));
420+
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), DEFAULT_OPTIONS);
431421
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
432422
EasyMock.replay(options, logging);
433423
LoggingHandler handler = new LoggingHandler(LOG_NAME, options) {
@@ -490,8 +480,7 @@ public void testPropertiesFile() throws IOException, InterruptedException {
490480
public void testClose() throws Exception {
491481
EasyMock.expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
492482
EasyMock.expect(options.getService()).andReturn(logging);
493-
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), WriteOption.logName(LOG_NAME),
494-
WriteOption.resource(DEFAULT_RESOURCE));
483+
logging.writeAsync(ImmutableList.of(FINEST_ENTRY), DEFAULT_OPTIONS);
495484
EasyMock.expectLastCall().andReturn(ApiFutures.immediateFuture(null));
496485
logging.close();
497486
EasyMock.expectLastCall().once();

0 commit comments

Comments
 (0)