RemoteLogs unit tests.

java/client/test/org/openqa/selenium/remote/RemoteClientTests.java

@@ -27,6 +27,7 @@
     AugmenterTest.class,
     ErrorHandlerTest.class,
     CircularOutputStreamTest.class,
+    RemoteLogsTest.class,
     RemoteWebDriverInitializationTest.class
 })
 public class RemoteClientTests {

java/client/test/org/openqa/selenium/remote/RemoteLogsTest.java

@@ -0,0 +1,133 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.remote;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.openqa.selenium.logging.LocalLogs;
+import org.openqa.selenium.logging.LogEntries;
+import org.openqa.selenium.logging.LogEntry;
+import org.openqa.selenium.logging.LogType;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+
+@RunWith(JUnit4.class)
+public class RemoteLogsTest {
+  @Mock
+  private ExecuteMethod executeMethod;
+
+  @Mock
+  private LocalLogs localLogs;
+
+  private RemoteLogs remoteLogs;
+
+  @Before
+  public void createMocksAndRemoteLogs() {
+    MockitoAnnotations.initMocks(this);
+    remoteLogs = new RemoteLogs(executeMethod, localLogs);
+  }
+
+  @Test
+  public void canGetProfilerLogs() {
+    List<LogEntry> entries = new ArrayList<LogEntry>();
+    entries.add(new LogEntry(Level.INFO, 0, "hello"));
+    when(localLogs.get(LogType.PROFILER)).thenReturn(new LogEntries(entries));
+
+    when(
+        executeMethod.execute(
+            DriverCommand.GET_LOG, ImmutableMap.of(RemoteLogs.TYPE_KEY, LogType.PROFILER)))
+        .thenReturn(ImmutableList.of(
+            ImmutableMap.of("level", Level.INFO.getName(), "timestamp", 1L, "message", "world")));
+
+    LogEntries logEntries = remoteLogs.get(LogType.PROFILER);
+    List<LogEntry> allLogEntries = logEntries.getAll();
+    assertEquals(2, allLogEntries.size());
+    assertEquals("hello", allLogEntries.get(0).getMessage());
+    assertEquals("world", allLogEntries.get(1).getMessage());
+  }
+
+  @Test
+  public void canGetClientLogs() {
+    List<LogEntry> entries = new ArrayList<LogEntry>();
+    entries.add(new LogEntry(Level.SEVERE, 0, "hello"));
+    when(localLogs.get(LogType.CLIENT)).thenReturn(new LogEntries(entries));
+
+    LogEntries logEntries = remoteLogs.get(LogType.CLIENT);
+    assertEquals(1, logEntries.getAll().size());
+    assertEquals("hello", logEntries.getAll().get(0).getMessage());
+
+    // Client logs should not retrieve remote logs.
+    verifyNoMoreInteractions(executeMethod);
+  }
+
+  @Test
+  public void canGetServerLogs() {
+    when(
+        executeMethod.execute(
+            DriverCommand.GET_LOG, ImmutableMap.of(RemoteLogs.TYPE_KEY, LogType.SERVER)))
+        .thenReturn(ImmutableList.of(
+            ImmutableMap.of("level", Level.INFO.getName(), "timestamp", 0L, "message", "world")));
+
+    LogEntries logEntries = remoteLogs.get(LogType.SERVER);
+    assertEquals(1, logEntries.getAll().size());
+    assertEquals("world", logEntries.getAll().get(0).getMessage());
+
+    // Server logs should not retrieve local logs.
+    verifyNoMoreInteractions(localLogs);
+  }
+
+  @Test
+  public void canGetAvailableLogTypes() {
+    List<String> remoteAvailableLogTypes = new ArrayList<String>();
+    remoteAvailableLogTypes.add(LogType.PROFILER);
+    remoteAvailableLogTypes.add(LogType.SERVER);
+
+    when(executeMethod.execute(DriverCommand.GET_AVAILABLE_LOG_TYPES, null))
+        .thenReturn(remoteAvailableLogTypes);
+
+    Set<String> localAvailableLogTypes = new HashSet<String>();
+    localAvailableLogTypes.add(LogType.PROFILER);
+    localAvailableLogTypes.add(LogType.CLIENT);
+
+    when(localLogs.getAvailableLogTypes()).thenReturn(localAvailableLogTypes);
+
+    Set<String> expected = new HashSet<String>();
+    expected.add(LogType.CLIENT);
+    expected.add(LogType.PROFILER);
+    expected.add(LogType.SERVER);
+
+    Set<String> availableLogTypes = remoteLogs.getAvailableLogTypes();
+
+    assertEquals(expected, availableLogTypes);
+  }
+}

java/client/test/org/openqa/selenium/remote/build.desc

@@ -24,14 +24,18 @@ java_test(name = "client-tests",
     "ErrorHandlerTest.java",
     "JdkAugmenterTest.java",
     "RemoteClientTests.java",
+    "RemoteLogsTest.java",
     "RemoteWebDriverInitializationTest.java",
     "internal/CircularOutputStreamTest.java",
     "internal/WebElementToJsonConverterTest.java",
   ],
   deps = [
+    "//java/client/src/org/openqa/selenium/logging",
+    "//java/client/src/org/openqa/selenium/logging:api",
     "//java/client/src/org/openqa/selenium/remote",
     "//java/client/test/org/openqa/selenium:tests",
     "//third_party/java/junit",
+    "//third_party/java/mockito",
   ])
 
 java_test(name = "remote-driver-tests",