diff --git a/.idea/libraries/mockito_core_1_9_5_srcs.xml b/.idea/libraries/mockito_core.xml
similarity index 71%
rename from .idea/libraries/mockito_core_1_9_5_srcs.xml
rename to .idea/libraries/mockito_core.xml
index 5f8682fa1d00b..32158ae882be6 100644
--- a/.idea/libraries/mockito_core_1_9_5_srcs.xml
+++ b/.idea/libraries/mockito_core.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/objenesis_1_0.xml b/.idea/libraries/objenesis.xml
similarity index 76%
rename from .idea/libraries/objenesis_1_0.xml
rename to .idea/libraries/objenesis.xml
index 5b3cc4663fb99..0373b1b9b5fdb 100644
--- a/.idea/libraries/objenesis_1_0.xml
+++ b/.idea/libraries/objenesis.xml
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/java/client/.classpath b/java/client/.classpath
index 87dd29ac72141..2b5cb615e6a2e 100644
--- a/java/client/.classpath
+++ b/java/client/.classpath
@@ -34,8 +34,8 @@
-
-
+
+
diff --git a/java/client/client.iml b/java/client/client.iml
index cdae88cee6b69..453fe1d9e67e8 100644
--- a/java/client/client.iml
+++ b/java/client/client.iml
@@ -40,8 +40,8 @@
-
-
+
+
diff --git a/java/server/.classpath b/java/server/.classpath
index 44f3a80b6ccec..c7e055fddacfc 100644
--- a/java/server/.classpath
+++ b/java/server/.classpath
@@ -15,7 +15,7 @@
-
+
diff --git a/java/server/server.iml b/java/server/server.iml
index 4d8ec80273a33..03ee9dc05ec31 100644
--- a/java/server/server.iml
+++ b/java/server/server.iml
@@ -20,8 +20,8 @@
-
-
+
+
diff --git a/java/server/test/org/openqa/selenium/remote/server/commandhandler/UploadFileTest.java b/java/server/test/org/openqa/selenium/remote/server/commandhandler/UploadFileTest.java
index b5a64605230b0..d1fdcbb00f72f 100644
--- a/java/server/test/org/openqa/selenium/remote/server/commandhandler/UploadFileTest.java
+++ b/java/server/test/org/openqa/selenium/remote/server/commandhandler/UploadFileTest.java
@@ -21,7 +21,7 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.stub;
+import static org.mockito.Mockito.when;
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableMap;
@@ -31,8 +31,6 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.io.TemporaryFilesystem;
import org.openqa.selenium.io.Zip;
@@ -50,7 +48,6 @@
import java.io.IOException;
import java.util.Map;
-@RunWith(JUnit4.class)
public class UploadFileTest {
private TemporaryFilesystem tempFs;
@@ -71,9 +68,9 @@ public void cleanUp() {
@Test
public void shouldWriteABase64EncodedZippedFileToDiskAndKeepName() throws Exception {
ActiveSession session = mock(ActiveSession.class);
- stub(session.getId()).toReturn(new SessionId("1234567"));
- stub(session.getFileSystem()).toReturn(tempFs);
- stub(session.getDownstreamDialect()).toReturn(Dialect.OSS);
+ when(session.getId()).thenReturn(new SessionId("1234567"));
+ when(session.getFileSystem()).thenReturn(tempFs);
+ when(session.getDownstreamDialect()).thenReturn(Dialect.OSS);
File tempFile = touch(null, "foo");
String encoded = Zip.zip(tempFile);
@@ -96,9 +93,9 @@ public void shouldWriteABase64EncodedZippedFileToDiskAndKeepName() throws Except
@Test
public void shouldThrowAnExceptionIfMoreThanOneFileIsSent() throws Exception {
ActiveSession session = mock(ActiveSession.class);
- stub(session.getId()).toReturn(new SessionId("1234567"));
- stub(session.getFileSystem()).toReturn(tempFs);
- stub(session.getDownstreamDialect()).toReturn(Dialect.OSS);
+ when(session.getId()).thenReturn(new SessionId("1234567"));
+ when(session.getFileSystem()).thenReturn(tempFs);
+ when(session.getDownstreamDialect()).thenReturn(Dialect.OSS);
File baseDir = Files.createTempDir();
touch(baseDir, "example");
diff --git a/third_party/java/mockito/BUCK b/third_party/java/mockito/BUCK
index 4be7eb2e04e57..378aa7c4b395e 100644
--- a/third_party/java/mockito/BUCK
+++ b/third_party/java/mockito/BUCK
@@ -9,6 +9,6 @@ java_library(
)
prebuilt_jar(name = 'core',
- binary_jar = 'mockito-core-1.9.5.jar',
- source_jar = 'mockito-core-1.9.5-srcs.jar',
+ binary_jar = 'mockito-core-2.12.0.jar',
+ source_jar = 'mockito-core-2.12.0-sources.jar',
)
diff --git a/third_party/java/mockito/mockito-core-1.9.5-srcs.jar b/third_party/java/mockito/mockito-core-1.9.5-srcs.jar
deleted file mode 100644
index c853445149eac..0000000000000
Binary files a/third_party/java/mockito/mockito-core-1.9.5-srcs.jar and /dev/null differ
diff --git a/third_party/java/mockito/mockito-core-1.9.5.jar b/third_party/java/mockito/mockito-core-1.9.5.jar
deleted file mode 100644
index df91508e53db3..0000000000000
Binary files a/third_party/java/mockito/mockito-core-1.9.5.jar and /dev/null differ
diff --git a/third_party/java/mockito/mockito-core-2.12.0-sources.jar b/third_party/java/mockito/mockito-core-2.12.0-sources.jar
new file mode 100644
index 0000000000000..cc721f77fe37a
Binary files /dev/null and b/third_party/java/mockito/mockito-core-2.12.0-sources.jar differ
diff --git a/third_party/java/mockito/mockito-core-2.12.0.jar b/third_party/java/mockito/mockito-core-2.12.0.jar
new file mode 100644
index 0000000000000..1393e3123a482
Binary files /dev/null and b/third_party/java/mockito/mockito-core-2.12.0.jar differ
diff --git a/third_party/java/objenesis/BUCK b/third_party/java/objenesis/BUCK
index 120e90826f638..2830606bbacb8 100644
--- a/third_party/java/objenesis/BUCK
+++ b/third_party/java/objenesis/BUCK
@@ -1,8 +1,8 @@
# BUILD FILE SYNTAX: SKYLARK
prebuilt_jar(name = 'objenesis',
- binary_jar = 'objenesis-1.0.jar',
+ binary_jar = 'objenesis-2.6.jar',
visibility = [
- '//third_party/java/...',
+ '//third_party/java/mockito:mockito',
],
)
diff --git a/third_party/java/objenesis/objenesis-1.0.jar b/third_party/java/objenesis/objenesis-1.0.jar
deleted file mode 100644
index 3a78df04ee4ea..0000000000000
Binary files a/third_party/java/objenesis/objenesis-1.0.jar and /dev/null differ
diff --git a/third_party/java/objenesis/objenesis-2.6.jar b/third_party/java/objenesis/objenesis-2.6.jar
new file mode 100644
index 0000000000000..b4b29d563bac5
Binary files /dev/null and b/third_party/java/objenesis/objenesis-2.6.jar differ