Skip to content
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

Jump to bottom

fix unit test failed #770

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix unit test failed #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8cd9aa
update license in some old files not part of the ditributed binary
ceki Jan 5, 2024
1c749f7
fix unit test failed
xuwenping123 Jan 19, 2024
af751f6
fix unit test failed
xuwenping123 Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions logback-access/src/main/java/ch/qos/logback/access/pattern/DateConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import java.time.ZoneId;
import java.util.List;
import java.util.Locale;

import ch.qos.logback.access.spi.IAccessEvent;
import ch.qos.logback.core.CoreConstants;
Expand Down Expand Up @@ -44,13 +45,18 @@ public void start() {
zoneId = ZoneId.of(zoneIdString);
}

Locale locale = null;
if (optionList != null && optionList.size() > 2) {
String localeIdStr = optionList.get(2);
locale = Locale.forLanguageTag(localeIdStr);
}

try {
cachingDateFormatter = new CachingDateFormatter(datePattern, zoneId);
// maximumCacheValidity = CachedDateFormat.getMaximumCacheValidity(pattern);
cachingDateFormatter = new CachingDateFormatter(datePattern, zoneId, locale);
} catch (IllegalArgumentException e) {
addWarn("Could not instantiate SimpleDateFormat with pattern " + datePattern, e);
addWarn("Defaulting to " + CoreConstants.CLF_DATE_PATTERN);
cachingDateFormatter = new CachingDateFormatter(CoreConstants.CLF_DATE_PATTERN, zoneId);
cachingDateFormatter = new CachingDateFormatter(CoreConstants.CLF_DATE_PATTERN, zoneId, locale);
}

}
Expand Down
2 changes: 1 addition & 1 deletion logback-access/src/test/java/ch/qos/logback/access/pattern/ConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void testDateConverter() {
@Test
public void testDateConverter_AU_locale() {
DateConverter converter = new DateConverter();
List<String> optionsList = Lists.list(CoreConstants.CLF_DATE_PATTERN, "Australia/Sydney", "en-AU");
List<String> optionsList = Lists.list(CoreConstants.CLF_DATE_PATTERN, "Australia/Sydney", "en_AU");

converter.setOptionList(optionsList);
converter.start();
Expand Down
14 changes: 9 additions & 5 deletions logback-classic/performance/src/java/ch/qos/logback/classic/LoggerCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
/**
* LOGBack: the reliable, fast and flexible logging library for Java.
* Logback: the reliable, generic, fast and flexible logging framework.
* Copyright (C) 1999-2024, QOS.ch. All rights reserved.
*
* Copyright (C) 1999-2005, QOS.ch, LOGBack.com
* This program and the accompanying materials are dual-licensed under
* either the terms of the Eclipse Public License v1.0 as published by
* the Eclipse Foundation
*
* This library is free software, you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation.
* or (per the licensee's choosing)
*
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
package ch.qos.logback.classic;

Expand Down
13 changes: 13 additions & 0 deletions logback-classic/performance/src/java/ch/qos/logback/classic/LoggerEventCreationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
/**
* Logback: the reliable, generic, fast and flexible logging framework.
* Copyright (C) 1999-2022, QOS.ch. All rights reserved.
*
* This program and the accompanying materials are dual-licensed under
* either the terms of the Eclipse Public License v1.0 as published by
* the Eclipse Foundation
*
* or (per the licensee's choosing)
*
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
package ch.qos.logback.classic;

import org.slf4j.LoggerFactory;
Expand Down
14 changes: 9 additions & 5 deletions ...k-classic/performance/src/java/ch/qos/logback/classic/RetreivalOfExistingLoggerSpeed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
/**
* LOGBack: the reliable, fast and flexible logging library for Java.
* Logback: the reliable, generic, fast and flexible logging framework.
* Copyright (C) 1999-2022, QOS.ch. All rights reserved.
*
* Copyright (C) 1999-2005, QOS.ch, LOGBack.com
* This program and the accompanying materials are dual-licensed under
* either the terms of the Eclipse Public License v1.0 as published by
* the Eclipse Foundation
*
* This library is free software, you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation.
* or (per the licensee's choosing)
*
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
package ch.qos.logback.classic;

Expand Down
14 changes: 9 additions & 5 deletions logback-classic/performance/src/java/ch/qos/logback/classic/SpeedOfDisabledDebug.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
/**
* LOGBack: the reliable, fast and flexible logging library for Java.
* Logback: the reliable, generic, fast and flexible logging framework.
* Copyright (C) 1999-2022, QOS.ch. All rights reserved.
*
* Copyright (C) 1999-2005, QOS.ch, LOGBack.com
* This program and the accompanying materials are dual-licensed under
* either the terms of the Eclipse Public License v1.0 as published by
* the Eclipse Foundation
*
* This library is free software, you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation.
* or (per the licensee's choosing)
*
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
package ch.qos.logback.classic;

Expand Down
14 changes: 9 additions & 5 deletions ...lassic/performance/src/java/ch/qos/logback/classic/pattern/ClassNameAbbreviatorSpeed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
/**
* LOGBack: the reliable, fast and flexible logging library for Java.
* Logback: the reliable, generic, fast and flexible logging framework.
* Copyright (C) 1999-2022, QOS.ch. All rights reserved.
*
* Copyright (C) 1999-2006, QOS.ch
* This program and the accompanying materials are dual-licensed under
* either the terms of the Eclipse Public License v1.0 as published by
* the Eclipse Foundation
*
* This library is free software, you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation.
* or (per the licensee's choosing)
*
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
package ch.qos.logback.classic.pattern;

Expand Down
14 changes: 9 additions & 5 deletions logback-classic/performance/src/java/ch/qos/logback/classic/pattern/WriteSpeed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
/**
* LOGBack: the reliable, fast and flexible logging library for Java.
* Logback: the reliable, generic, fast and flexible logging framework.
* Copyright (C) 1999-2022, QOS.ch. All rights reserved.
*
* Copyright (C) 1999-2005, QOS.ch, LOGBack.com
* This program and the accompanying materials are dual-licensed under
* either the terms of the Eclipse Public License v1.0 as published by
* the Eclipse Foundation
*
* This library is free software, you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation.
* or (per the licensee's choosing)
*
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
package ch.qos.logback.classic.pattern;

Expand Down
13 changes: 13 additions & 0 deletions logback-classic/performance/src/java/ch/qos/logback/reflect/Fruit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
/**
* Logback: the reliable, generic, fast and flexible logging framework.
* Copyright (C) 1999-2022, QOS.ch. All rights reserved.
*
* This program and the accompanying materials are dual-licensed under
* either the terms of the Eclipse Public License v1.0 as published by
* the Eclipse Foundation
*
* or (per the licensee's choosing)
*
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
package ch.qos.logback.reflect;

public class Fruit {
Expand Down
13 changes: 13 additions & 0 deletions logback-classic/performance/src/java/ch/qos/logback/reflect/JEXLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
/**
* Logback: the reliable, generic, fast and flexible logging framework.
* Copyright (C) 1999-2022, QOS.ch. All rights reserved.
*
* This program and the accompanying materials are dual-licensed under
* either the terms of the Eclipse Public License v1.0 as published by
* the Eclipse Foundation
*
* or (per the licensee's choosing)
*
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
package ch.qos.logback.reflect;

import org.apache.commons.jexl.Expression;
Expand Down
13 changes: 13 additions & 0 deletions logback-classic/performance/src/java/ch/qos/logback/reflect/JaninoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
/**
* Logback: the reliable, generic, fast and flexible logging framework.
* Copyright (C) 1999-2022, QOS.ch. All rights reserved.
*
* This program and the accompanying materials are dual-licensed under
* either the terms of the Eclipse Public License v1.0 as published by
* the Eclipse Foundation
*
* or (per the licensee's choosing)
*
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
package ch.qos.logback.reflect;

import org.codehaus.janino.ExpressionEvaluator;
Expand Down
13 changes: 13 additions & 0 deletions logback-classic/performance/src/java/ch/qos/logback/reflect/ReflectionSpeed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
/**
* Logback: the reliable, generic, fast and flexible logging framework.
* Copyright (C) 1999-2022, QOS.ch. All rights reserved.
*
* This program and the accompanying materials are dual-licensed under
* either the terms of the Eclipse Public License v1.0 as published by
* the Eclipse Foundation
*
* or (per the licensee's choosing)
*
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
package ch.qos.logback.reflect;

import java.lang.reflect.InvocationTargetException;
Expand Down
8 changes: 0 additions & 8 deletions logback-core/src/test/input/compress3.copy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@

LOGBack: the generic, reliable, fast and flexible logging framework.

Copyright (C) 1999-2006, QOS.ch

This library is free software, you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free
Software Foundation.
<?xml version="1.0"?>
<document>

Expand Down
2 changes: 1 addition & 1 deletion ...re/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemoval_Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public void dailySizeBasedRolloverWithSizeCap() {
// 2016-03-05 00:14:39 CET
long simulatedTime = 1457133279186L;
ConfigParameters params = new ConfigParameters(simulatedTime);
String fileNamePattern = randomOutputDir + "/%d{" + DAILY_DATE_PATTERN + "}-clean.%i";
String fileNamePattern = randomOutputDir + "/%d{" + DAILY_DATE_PATTERN + ", CET}-clean.%i";
params.maxHistory(60).fileNamePattern(fileNamePattern).simulatedNumberOfPeriods(10).sizeCap(sizeCap);
logOverMultiplePeriods(params);

Expand Down