QPID-5037: Improve log viewer implementation

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529690 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 4 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java
index 6166e8afc1..e00a9889e6 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java
@@ -49,11 +49,11 @@ public class LogViewerTest extends QpidRestTestCase
 
     public void testGetLogFiles() throws Exception
     {
-        List<Map<String, Object>> logFiles = getRestTestHelper().getJsonAsList("/rest/logfiles");
+        List<Map<String, Object>> logFiles = getRestTestHelper().getJsonAsList("/rest/logfilenames");
         assertNotNull("Log files data cannot be null", logFiles);
 
         // 1 file appender is configured in QPID default log4j xml:
-        assertEquals("Unexpected number of log files", 1, logFiles.size());
+        assertTrue("Unexpected number of log files", logFiles.size() > 0);
 
         Map<String, Object> logFileDetails = logFiles.get(0);
         assertEquals("Unexpected log file name", _expectedLogFileName, logFileDetails.get("name"));
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java
index 5a2ebe3e8e..96ea5c92b3 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java
@@ -69,7 +69,7 @@ public class LogViewerACLTest extends QpidRestTestCase
     {
         getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
 
-        int responseCode = getRestTestHelper().submitRequest("/rest/logfiles", "GET", null);
+        int responseCode = getRestTestHelper().submitRequest("/rest/logfilenames", "GET", null);
         assertEquals("Access to log files should be allowed", 200, responseCode);
     }
 
@@ -77,7 +77,7 @@ public class LogViewerACLTest extends QpidRestTestCase
     {
         getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
 
-        int responseCode = getRestTestHelper().submitRequest("/rest/logfiles", "GET", null);
+        int responseCode = getRestTestHelper().submitRequest("/rest/logfilenames", "GET", null);
         assertEquals("Access to log files should be denied", 403, responseCode);
     }