Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3713 - Emit warning when invoking deprecated method in Jetty XML. 

Improved test case to test for log lines with deprecation warnings.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2019-06-03 16:08:33 +02:00
parent 8dc9f745ff
commit 4058abd7c7
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
View File

@ -19,13 +19,21 @@
package org.eclipse.jetty.xml;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.log.StdErrLog;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@ -991,7 +999,27 @@ public class XmlConfigurationTest
" <Call name=\"setDeprecated\"><Arg><Get name=\"deprecated\" /></Arg></Call>" +
"</Configure>");
ByteArrayOutputStream logBytes = null;
Logger logger = Log.getLogger(XmlConfiguration.class);
if (logger instanceof StdErrLog)
{
StdErrLog stdErrLog = (StdErrLog)logger;
logBytes = new ByteArrayOutputStream();
stdErrLog.setStdErrStream(new PrintStream(logBytes));
}
xmlConfiguration.configure();
// Cannot test that the warnings are logged.
if (logBytes != null)
{
List<String> warnings = Arrays.stream(logBytes.toString("UTF-8").split(System.lineSeparator()))
.filter(line -> line.contains(":WARN:") && line.contains("AnnotatedTestConfiguration"))
.collect(Collectors.toList());
// 1. Deprecated constructor
// 2. Deprecated <Set>
// 3. Deprecated <Get>
// 4. Deprecated <Call>
assertEquals(4, warnings.size());
}
}
}