[MRM-1145] RSS tests do not correctly check responses
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/31cc47c3 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/31cc47c3 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/31cc47c3 Branch: refs/heads/master Commit: 31cc47c3138e97d896ca435ed086b2e76cbab7fb Parents: 84d5a61 Author: Olivier Lamy <[email protected]> Authored: Tue Oct 14 15:45:31 2014 +1100 Committer: Olivier Lamy <[email protected]> Committed: Tue Oct 14 15:59:00 2014 +1100 ---------------------------------------------------------------------- .../java/org/apache/archiva/web/rss/RssFeedServletTest.java | 6 +----- .../java/org/apache/archiva/web/rss/SecuritySystemStub.java | 4 ++-- .../archiva-web-common/src/test/resources/log4j2-test.xml | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/31cc47c3/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java index 582a532..194583f 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java @@ -447,14 +447,10 @@ public class RssFeedServletTest } - @Ignore + @Test public void testInvalidAuthenticationRequest() throws Exception { - //RssFeedServlet servlet = - // (RssFeedServlet) client.newInvocation( "http://localhost/feeds/unauthorized-repo"; ).getServlet(); - - //WebRequest request = new GetMethodWebRequest( "http://localhost/feeds/unauthorized-repo"; ); MockHttpServletRequest request = new MockHttpServletRequest(); request.setRequestURI( "/feeds/unauthorized-repo" ); http://git-wip-us.apache.org/repos/asf/archiva/blob/31cc47c3/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java index 5a66698..53cfeb5 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java @@ -96,11 +96,11 @@ public class SecuritySystemStub } @Override - public AuthorizationResult authorize( SecuritySession arg0, String arg1, String arg2 ) + public AuthorizationResult authorize( SecuritySession arg0, String permission, String repositoryId ) throws AuthorizationException { - AuthorizationResult result = new AuthorizationResult( true, arg1, null ); + AuthorizationResult result = new AuthorizationResult( this.repoIds.contains( repositoryId ), permission, null ); return result; } http://git-wip-us.apache.org/repos/asf/archiva/blob/31cc47c3/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml index 17e6570..b80c0b0 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml @@ -19,7 +19,7 @@ --> -<configuration status="debug"> +<configuration> <!-- status="debug"> --> <appenders> <Console name="console" target="SYSTEM_OUT"> <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
