Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Andy Wilkinson 2019-03-07 09:25:17 +00:00
commit 83216c34e5

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2018 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -140,8 +140,9 @@ public class LogbackLoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
public void testBasicConfigLocation() { public void defaultConfigConfiguresAConsoleAppender() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
this.loggingSystem.initialize(this.initializationContext, null, null);
assertThat(getConsoleAppender()).isNotNull(); assertThat(getConsoleAppender()).isNotNull();
} }