The branch, master has been updated
via a0e45a889c6180b29f853348ccbdf2eacca1bb55 (commit)
from bfb1e735c93af7672bb96511c68ac1a379f6eadc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=a0e45a889c6180b29f853348ccbdf2eacca1bb55
http://github.com/ceki/logback/commit/a0e45a889c6180b29f853348ccbdf2eacca1bb55
commit a0e45a889c6180b29f853348ccbdf2eacca1bb55
Author: Ceki Gulcu <[email protected]>
Date: Fri Nov 13 14:06:02 2009 +0100
- corrections in grouping code
diff --git
a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java
b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java
index 2e2e27a..4d1d697 100644
---
a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java
+++
b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java
@@ -148,7 +148,7 @@ public class TimeBasedRollingWithArchiveRemovalTest {
// rollover occurs on the last period, that the last period is still
accounted
// for
checkPatternCompliance(5 + 1 + slashCount,
- "\\d{4}-\\d{2}-\\d{2}-clean.(\\d)(.zip)?");
+ "\\d{4}-\\d{2}-\\d{2}-clean(\\.\\d)(.zip)?");
}
@Test
@@ -332,8 +332,9 @@ public class TimeBasedRollingWithArchiveRemovalTest {
}
// reduce file names differing by index number into the same group
- // for example, 2009-11-01-clean-0.zip, 2009-11-01-clean-1.zip and
+ // for example, 2009-11-01-clean.0.zip, 2009-11-01-clean.1.zip and
// 2009-11-01-clean-2 are reduced into the same string (group)
+ // 2009-11-01-clean
Set<String> groupByClass(List<File> fileList, String regex) {
Pattern p = Pattern.compile(regex);
Set<String> set = new HashSet<String>();
@@ -342,10 +343,10 @@ public class TimeBasedRollingWithArchiveRemovalTest {
Matcher m = p.matcher(n);
m.matches();
int begin = m.start(1);
- int end = m.end(1);
- String reduced = n.substring(0, begin) + n.substring(end);
+ String reduced = n.substring(0, begin);
set.add(reduced);
}
+ System.out.println(set);
return set;
}
-----------------------------------------------------------------------
Summary of changes:
.../TimeBasedRollingWithArchiveRemovalTest.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
Logback: the generic, reliable, fast and flexible logging framework.
_______________________________________________
logback-dev mailing list
[email protected]
http://qos.ch/mailman/listinfo/logback-dev
