From 69c6b594b1bc761527157b3a8970d6e64e582ea9 Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Mon, 5 Jun 2017 22:31:48 +0200 Subject: [PATCH] Updating tests for WebDriver and jetty backend --- .../archiva-web/archiva-webapp-test/pom.xml | 267 ++++++++++++++---- .../archiva/web/test/WebDriverBrowseTest.java | 72 +++-- .../archiva/web/test/WebDriverTest.java | 52 ++-- .../web/test/parent/AbstractSeleniumTest.java | 18 +- ...Initializer.java => WebdriverUtility.java} | 88 +++++- .../src/test/resources/log4j.xml | 41 --- .../src/test/resources/log4j2-test.xml | 3 +- .../src/test/resources/logging/log4j.xml | 70 ----- .../test/resources/logging/log4j2-test.xml | 4 +- 9 files changed, 356 insertions(+), 259 deletions(-) rename archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/{WebdriverInitializer.java => WebdriverUtility.java} (56%) delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/log4j.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/logging/log4j.xml diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml index ad2b77fed..db11a19b1 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml @@ -30,14 +30,14 @@ Archiva Web :: Javascript Application Tests - ${project.build.directory}/tomcat7x/webapps/archiva - 0 - ${project.build.directory}/tomcat-port.properties + ${project.build.directory}/container/webapps/archiva + ${project.build.directory}/container-port.properties 10000 - 3.4.0 3.2.0 0.13.2 + + @@ -67,6 +67,8 @@ + + org.seleniumhq.selenium selenium-java @@ -81,39 +83,29 @@ javax.servlet javax.servlet-api - - - - org.seleniumhq.selenium.client-drivers - selenium-java-client-driver - test - - commons-logging - commons-logging + org.eclipse.jetty + jetty-io - javax.servlet - javax.servlet-api + org.eclipse.jetty.websocket + websocket-client - - - - org.seleniumhq.selenium - selenium-remote-driver - test - ${selenium-server.version} - - commons-logging - commons-logging + org.eclipse.jetty + jetty-util - javax.servlet - javax.servlet-api + org.eclipse.jetty.websocket + websocket-api + + + org.eclipse.jetty.websocket + websocket-common + org.seleniumhq.selenium selenium-leg-rc @@ -124,22 +116,38 @@ org.testng testng + + commons-logging + commons-logging + javax.servlet javax.servlet-api + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty.websocket + websocket-client + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.websocket + websocket-api + + + org.eclipse.jetty.websocket + websocket-common + - - org.apache.commons - commons-exec - 1.3 - - - org.seleniumhq.selenium - htmlunit-driver - 2.26 - + + org.seleniumhq.selenium @@ -155,6 +163,26 @@ javax.servlet javax.servlet-api + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.websocket + websocket-client + + + org.eclipse.jetty.websocket + websocket-api + + + org.eclipse.jetty.websocket + websocket-common + @@ -179,6 +207,8 @@ test + + xerces xercesImpl @@ -233,9 +263,36 @@ log4j-1.2-api + + + org.eclipse.jetty + jetty-io + ${jettyVersion} + + + org.eclipse.jetty + jetty-util + ${jettyVersion} + test + + + org.eclipse.jetty.websocket + websocket-api + ${jettyVersion} + test + + + org.eclipse.jetty.websocket + websocket-client + ${jettyVersion} + test + + + + src/test/resources @@ -264,6 +321,27 @@ + + + org.codehaus.mojo + build-helper-maven-plugin + + + container.http.port + container.stop.port + + + + + reserve-port + pre-integration-test + + reserve-network-port + + + + + maven-resources-plugin @@ -288,17 +366,19 @@ org.apache.maven.plugins - maven-surefire-plugin + maven-failsafe-plugin false alphabetical + + **/*Test.java + integration-tests - integration-test - test + integration-test @@ -308,11 +388,19 @@ ${maxWaitTimeInMs} ${seleniumHost} ${seleniumPort} - ${seleniumRemote} - ${tomcat.propertiesPortFilePath} + ${container.propertiesPortFilePath} + ${container.http.port} + + + verify + + verify + + + @@ -402,7 +490,82 @@ + + + org.eclipse.jetty + jetty-maven-plugin + 9.4.5.v20170502 + + archivastop + ${container.stop.port} + 30 + + ${container.http.port} + + + + + org.apache.derby + derby + ${derbyVersion} + + + javax.mail + mail + ${javaxMailVersion} + + + + + + jetty-run + + deploy-war + + pre-integration-test + + true + + /archiva + ${project.build.testOutputDirectory}/jetty/jetty-env.xml + + ${webappDirectory} + + + appserver.base + ${project.build.directory}/appserver-base + + + appserver.home + ${project.build.directory}/appserver-base + + + derby.system.home + ${project.build.directory} + + + archiva.devMode + true + + + openjpa.Log + ${openjpa.Log} + + + + + + jetty-shutdown + + stop + + post-integration-test + + + + + @@ -463,20 +626,10 @@ - http://localhost:${container.test.port}/archiva/index.html?request_lang=en - - - - start-selenium - - - !seleniumHost - - - - false + http://localhost:${container.http.port}/archiva + htmlunit diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java index 7f83b3464..6838cc22c 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java @@ -18,10 +18,11 @@ package org.apache.archiva.web.test; * under the License. */ -import junit.framework.Assert; -import org.apache.archiva.web.test.tools.WebdriverInitializer; +import org.fluentlenium.configuration.ConfigurationProperties; +import org.fluentlenium.configuration.FluentConfiguration; +import org.junit.Assert; +import org.apache.archiva.web.test.tools.WebdriverUtility; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; import org.fluentlenium.adapter.junit.FluentTest; import org.fluentlenium.core.domain.FluentList; import org.fluentlenium.core.domain.FluentWebElement; @@ -29,11 +30,16 @@ import org.junit.Before; import org.junit.Test; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Properties; import java.util.concurrent.TimeUnit; @@ -42,90 +48,75 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Olivier Lamy */ +@FluentConfiguration(driverLifecycle = ConfigurationProperties.DriverLifecycle.CLASS) public class WebDriverBrowseTest - extends FluentTest + extends FluentTest { + final Logger log = LoggerFactory.getLogger( WebDriverBrowseTest.class ); + @Override public void takeScreenShot( String fileName ) { - File fileNameHTML = new File( "target", "errorshtmlsnap" ); - try - { - // save html to have a minimum feedback if jenkins firefox not up - fileNameHTML = new File( fileNameHTML, fileName ); - FileUtils.writeStringToFile( new File ( new File( "target", "errorshtmlsnap" ) , fileName + ".html"), getDriver().getPageSource() ); - - } - catch ( IOException e ) - { - e.printStackTrace(); - } - super.takeScreenShot( fileNameHTML.getAbsolutePath() ); - + WebdriverUtility.takeScreenShot( fileName, getDriver(), (a)->super.takeScreenShot( a ) ); } @Before public void init() { - setScreenshotMode( TriggerMode.AUTOMATIC_ON_FAIL); + setScreenshotMode( TriggerMode.AUTOMATIC_ON_FAIL ); setDriverLifecycle( DriverLifecycle.CLASS ); } @Test public void simpletest() - throws Exception + throws Exception { Properties p = new Properties(); p.load( this.getClass().getClassLoader().getResourceAsStream( "test.properties" ) ); - Properties tomcatPortProperties = new Properties(); - tomcatPortProperties.load( - new FileInputStream( new File( System.getProperty( "tomcat.propertiesPortFilePath" ) ) ) ); - - int tomcatPort = Integer.parseInt( tomcatPortProperties.getProperty( "tomcat.maven.http.port" ) ); - - goTo( "http://localhost:" + tomcatPort + "/archiva/index.html?request_lang=en" ); + String baseUrl = WebdriverUtility.getBaseUrl(); + String url = baseUrl + "/index.html?request_lang=en"; + goTo( url ); // wait until topbar-menu-container is feeded - await().atMost( 5, TimeUnit.SECONDS ).until( $("#topbar-menu" )).present(); + await().atMost( 5, TimeUnit.SECONDS ).untilPredicate( ( fl ) -> $( "#topbar-menu" ).present() ); FluentList elements = find( "#create-admin-link-a" ); - if ( !elements.isEmpty() && elements.get( 0 ).displayed() ) { WebElement webElement = elements.get( 0 ).getElement(); Assert.assertEquals( "Create Admin User", webElement.getText() ); webElement.click(); - await().atMost( 2, TimeUnit.SECONDS ).until($( "#user-create" )).present(); + await().atMost( 2, TimeUnit.SECONDS ).untilPredicate( ( fl ) -> $( "#user-create" ).present() ); assertThat( find( "#username" ).value().equals( "admin" ) ); assertThat( find( "#password" ).value().isEmpty() ); assertThat( find( "#confirmPassword" ).value().isEmpty() ); assertThat( find( "#email" ).value().isEmpty() ); - $("#fullname").fill().with( p.getProperty( "ADMIN_FULLNAME" ) ); - $("#email").fill().with( p.getProperty( "ADMIN_EMAIL" ) ); - $("#password").fill().with( p.getProperty( "ADMIN_PASSWORD" ) ); - $("#confirmPassword").fill().with( p.getProperty( "ADMIN_PASSWORD" ) ); + $( "#fullname" ).fill().with( p.getProperty( "ADMIN_FULLNAME" ) ); + $( "#email" ).fill().with( p.getProperty( "ADMIN_EMAIL" ) ); + $( "#password" ).fill().with( p.getProperty( "ADMIN_PASSWORD" ) ); + $( "#confirmPassword" ).fill().with( p.getProperty( "ADMIN_PASSWORD" ) ); find( "#user-create-form-register-button" ).click(); - await().atMost( 2, TimeUnit.SECONDS ).until($("#logout-link" )).present(); + await().atMost( 2, TimeUnit.SECONDS ).untilPredicate( ( fl ) -> $( "#logout-link" ).present() ); FluentList elementss = find( "#menu-find-browse-a" ); WebElement webElsement = elementss.get( 0 ).getElement(); webElsement.click(); - await().atMost( 2, TimeUnit.SECONDS ).until($("#main_browse_result" )).present(); + await().atMost( 5, TimeUnit.SECONDS ).untilPredicate( ( fl ) -> $( "#main_browse_result" ).present() ); // give me search page :( not browse page takeScreenShot( "search.png" ); - goTo( "http://localhost:" + tomcatPort + "/archiva/index.html#browse?request_lang=en" ); + goTo( baseUrl + "/index.html#browse?request_lang=en" ); takeScreenShot( "browse.png" ); // give me a browse page - + } else { @@ -137,7 +128,8 @@ public class WebDriverBrowseTest } @Override - public WebDriver newWebDriver() { - return WebdriverInitializer.newWebDriver(); + public WebDriver newWebDriver() + { + return WebdriverUtility.newWebDriver(); } } diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java index 5a020e265..c2980e9ac 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java @@ -18,53 +18,41 @@ package org.apache.archiva.web.test; * under the License. */ -import junit.framework.Assert; -import org.apache.archiva.web.test.tools.WebdriverInitializer; +import org.junit.Assert; +import org.apache.archiva.web.test.tools.WebdriverUtility; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; import org.fluentlenium.adapter.junit.FluentTest; +import org.fluentlenium.configuration.ConfigurationProperties; +import org.fluentlenium.configuration.FluentConfiguration; import org.fluentlenium.core.domain.FluentList; import org.fluentlenium.core.domain.FluentWebElement; import org.junit.Before; import org.junit.Test; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; -import org.openqa.selenium.chrome.ChromeDriver; -import org.openqa.selenium.firefox.FirefoxDriver; -import org.openqa.selenium.ie.InternetExplorerDriver; -import org.openqa.selenium.remote.DesiredCapabilities; -import org.openqa.selenium.remote.RemoteWebDriver; -import org.openqa.selenium.safari.SafariDriver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Properties; -import java.util.concurrent.TimeUnit; /** * @author Olivier Lamy */ +@FluentConfiguration(driverLifecycle = ConfigurationProperties.DriverLifecycle.CLASS) public class WebDriverTest extends FluentTest { - + final Logger log = LoggerFactory.getLogger( WebDriver.class ); @Override - public void takeScreenShot(String fileName) { - try { - // save html to have a minimum feedback if jenkins firefox not up - File fileNameHTML = new File(fileName + ".html"); - FileUtils.writeStringToFile(fileNameHTML, getDriver().getPageSource()); - } catch (IOException e) { - System.out.print(e.getMessage()); - e.printStackTrace(); - } - super.takeScreenShot(fileName); + public void takeScreenShot( String fileName ) + { + WebdriverUtility.takeScreenShot( fileName, getDriver(), (a)->super.takeScreenShot( a ) ); } @@ -79,18 +67,12 @@ public class WebDriverTest public void simpletest() throws Exception { - Properties tomcatPortProperties = new Properties(); - tomcatPortProperties.load( - new FileInputStream(new File(System.getProperty("tomcat.propertiesPortFilePath")))); - - int tomcatPort = Integer.parseInt(tomcatPortProperties.getProperty("tomcat.maven.http.port")); - String url = "http://localhost:" + tomcatPort + "/archiva/index.html?request_lang=en"; - System.err.println("URL: "+url); + String url = WebdriverUtility.getBaseUrl()+ "/index.html?request_lang=en"; goTo(url); // wait until topbar-menu-container is feeded - await().atMost(10, TimeUnit.SECONDS).until($("#topbar-menu")).present(); - + //await().atMost(20, TimeUnit.SECONDS).until($("#topbar-menu")).present(); + await().untilPredicate((fl) ->$("#topbar-menu").present()); FluentList elements = find("#create-admin-link-a"); if (!elements.isEmpty() && elements.get(0).displayed()) { @@ -106,6 +88,6 @@ public class WebDriverTest @Override public WebDriver newWebDriver() { - return WebdriverInitializer.newWebDriver(); + return WebdriverUtility.newWebDriver(); } } diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java index a8403cd58..daec10bb3 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java @@ -19,12 +19,11 @@ package org.apache.archiva.web.test.parent; * under the License. */ -import com.thoughtworks.selenium.DefaultSelenium; import com.thoughtworks.selenium.Selenium; +//import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium; import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium; import org.apache.archiva.web.test.tools.ArchivaSeleniumExecutionRule; -import org.apache.archiva.web.test.tools.WebdriverInitializer; -import org.apache.xpath.operations.Bool; +import org.apache.archiva.web.test.tools.WebdriverUtility; import org.junit.Assert; import org.junit.Rule; @@ -84,13 +83,7 @@ public abstract class AbstractSeleniumTest p = new Properties(); p.load( this.getClass().getClassLoader().getResourceAsStream( "test.properties" ) ); - Properties tomcatPortProperties = new Properties(); - tomcatPortProperties.load( - new FileInputStream( new File( System.getProperty( "tomcat.propertiesPortFilePath" ) ) ) ); - - int tomcatPort = Integer.parseInt( tomcatPortProperties.getProperty( "tomcat.maven.http.port" ) ); - - baseUrl = "http://localhost:" + tomcatPort + "/archiva/index.html?request_lang=en"; + baseUrl = WebdriverUtility.getBaseUrl()+"/index.html?request_lang=en"; open( baseUrl, browser, seleniumHost, seleniumPort, maxWaitTimeInMs, remoteSelenium ); archivaSeleniumExecutionRule.selenium = selenium; @@ -118,8 +111,9 @@ public abstract class AbstractSeleniumTest { if ( getSelenium() == null ) { - WebDriver driver = WebdriverInitializer.newWebDriver(browser, seleniumHost, seleniumPort, remoteSelenium); - selenium = new WebDriverBackedSelenium(driver, baseUrl); + WebDriver driver = WebdriverUtility.newWebDriver(browser, seleniumHost, seleniumPort, remoteSelenium); + WebDriverBackedSelenium selenium = new WebDriverBackedSelenium(driver, baseUrl); + selenium.getWrappedDriver(); selenium.start(); selenium.setTimeout( Integer.toString( maxWaitTimeInMs ) ); } diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/WebdriverInitializer.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/WebdriverUtility.java similarity index 56% rename from archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/WebdriverInitializer.java rename to archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/WebdriverUtility.java index c3ddc1a64..0011dc649 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/WebdriverInitializer.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/WebdriverUtility.java @@ -18,8 +18,10 @@ package org.apache.archiva.web.test.tools; * under the License. */ +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.Capabilities; +import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.firefox.FirefoxDriver; @@ -28,16 +30,30 @@ import org.openqa.selenium.ie.InternetExplorerDriver; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.RemoteWebDriver; import org.openqa.selenium.safari.SafariDriver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Properties; +import java.util.function.Consumer; +import java.util.function.Function; /** * Created by martin_s on 04.06.17. */ -public class WebdriverInitializer +public class WebdriverUtility { + static final Logger log = LoggerFactory.getLogger( WebdriverUtility.class ); + public static WebDriver newWebDriver() { String seleniumBrowser = System.getProperty("selenium.browser"); String seleniumHost = System.getProperty("seleniumHost", "localhost"); @@ -115,4 +131,74 @@ public class WebdriverInitializer } } + + public static String getBaseUrl() { + + if (System.getProperties().containsKey( "baseUrl" )) { + return System.getProperty("baseUrl"); + } + int containerPort = 7777; + if (System.getProperties().containsKey("container.http.port")) { + containerPort = Integer.parseInt(System.getProperty("container.http.port")); + } else if (System.getProperties().containsKey("container.propertiesPortFilePath")) + { + Properties portProperties = new Properties(); + try (InputStream inputStream = Files.newInputStream(Paths.get(System.getProperty("container.propertiesPortFilePath")))) + { + portProperties.load(inputStream); + } + catch ( IOException e ) + { + log.error("Error during property loading with containger.propertiesPortFilePath"); + } + if ( portProperties.containsKey( "tomcat.maven.http.port" ) ) + { + containerPort = Integer.parseInt( portProperties.getProperty( "tomcat.maven.http.port" ) ); + } + else + { + containerPort = Integer.parseInt( portProperties.getProperty( "container.http.port" ) ); + } + } + return "http://localhost:" + containerPort+"/archiva"; + } + + public static void takeScreenShot( String fileName, WebDriver driver, Consumer screenShotFunction) { + try + { + Path snapDir = Paths.get( "target", "errorshtmlsnap" ); + if ( !Files.exists( snapDir ) ) + { + Files.createDirectories( snapDir ); + } + Path htmlFile = snapDir.resolve( fileName + ".html" ); + Path screenShotFile = snapDir.resolve( fileName ); + String pageSource=null; + String encoding="ISO-8859-1"; + try + { + pageSource = ( (JavascriptExecutor) driver ).executeScript( "return document.documentElement.outerHTML;" ).toString(); + } catch (Exception e) { + log.info("Could not create html source by javascript"); + pageSource = driver.getPageSource(); + } + if (pageSource.contains("encoding=\"")) { + encoding = pageSource.replaceFirst( ".*encoding=\"([^\"]+)\".*", "$1" ); + } + FileUtils.writeStringToFile( htmlFile.toFile(), pageSource, encoding); + try + { + screenShotFunction.accept( screenShotFile.toAbsolutePath().toString() ); + } + catch ( Exception e ) + { + log.info( "Could not create screenshot: " + e.getMessage() ); + } + + } + catch ( IOException e ) + { + log.info( "Creating screenshot failed " + e.getMessage() ); + } + } } diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/log4j.xml deleted file mode 100644 index 4957e2d89..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/log4j.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/log4j2-test.xml index dec6d75a8..61f9f0122 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/log4j2-test.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/log4j2-test.xml @@ -19,7 +19,7 @@ --> - + @@ -30,7 +30,6 @@ - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/logging/log4j.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/logging/log4j.xml deleted file mode 100644 index 8ddcde5e9..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/logging/log4j.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/logging/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/logging/log4j2-test.xml index e9a65a586..6d550a8b0 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/logging/log4j2-test.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/logging/log4j2-test.xml @@ -19,7 +19,7 @@ --> - + @@ -39,6 +39,8 @@ + + -- 2.39.5