Merge "Extract InMemorySecureStore to its own class"
diff --git a/java/com/google/gerrit/server/securestore/testing/BUILD b/java/com/google/gerrit/server/securestore/testing/BUILD
new file mode 100644
index 0000000..793f8ec
--- /dev/null
+++ b/java/com/google/gerrit/server/securestore/testing/BUILD
@@ -0,0 +1,11 @@
+package(default_testonly = 1)
+
+java_library(
+ name = "testing",
+ srcs = glob(["*.java"]),
+ visibility = ["//visibility:public"],
+ deps = [
+ "//java/com/google/gerrit/server",
+ "//lib/jgit/org.eclipse.jgit:jgit",
+ ],
+)
diff --git a/java/com/google/gerrit/server/securestore/testing/InMemorySecureStore.java b/java/com/google/gerrit/server/securestore/testing/InMemorySecureStore.java
new file mode 100644
index 0000000..23894c1
--- /dev/null
+++ b/java/com/google/gerrit/server/securestore/testing/InMemorySecureStore.java
@@ -0,0 +1,59 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed 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 com.google.gerrit.server.securestore.testing;
+
+import com.google.gerrit.server.securestore.SecureStore;
+import java.util.List;
+import org.eclipse.jgit.lib.Config;
+
+public class InMemorySecureStore extends SecureStore {
+ private final Config cfg = new Config();
+
+ @Override
+ public String[] getList(String section, String subsection, String name) {
+ return cfg.getStringList(section, subsection, name);
+ }
+
+ @Override
+ public String[] getListForPlugin(
+ String pluginName, String section, String subsection, String name) {
+ throw new UnsupportedOperationException("not used by tests");
+ }
+
+ @Override
+ public void setList(String section, String subsection, String name, List<String> values) {
+ cfg.setStringList(section, subsection, name, values);
+ }
+
+ @Override
+ public void unset(String section, String subsection, String name) {
+ cfg.unset(section, subsection, name);
+ }
+
+ @Override
+ public Iterable<EntryKey> list() {
+ throw new UnsupportedOperationException("not used by tests");
+ }
+
+ @Override
+ public boolean isOutdated() {
+ throw new UnsupportedOperationException("not used by tests");
+ }
+
+ @Override
+ public void reload() {
+ throw new UnsupportedOperationException("not used by tests");
+ }
+}
diff --git a/javatests/com/google/gerrit/pgm/BUILD b/javatests/com/google/gerrit/pgm/BUILD
index e4afae2..01ebb0e 100644
--- a/javatests/com/google/gerrit/pgm/BUILD
+++ b/javatests/com/google/gerrit/pgm/BUILD
@@ -11,6 +11,7 @@
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/server",
+ "//java/com/google/gerrit/server/securestore/testing",
"//lib:guava",
"//lib:junit",
"//lib/easymock",
diff --git a/javatests/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java b/javatests/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java
index 7721fca..4d3d6df 100644
--- a/javatests/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java
+++ b/javatests/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java
@@ -31,15 +31,13 @@
import com.google.gerrit.pgm.init.api.InitFlags;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
-import com.google.gerrit.server.securestore.SecureStore;
+import com.google.gerrit.server.securestore.testing.InMemorySecureStore;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
-import java.util.List;
import org.eclipse.jgit.errors.ConfigInvalidException;
-import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.util.FS;
import org.junit.Test;
@@ -110,44 +108,4 @@
u.run();
}
-
- private static class InMemorySecureStore extends SecureStore {
- private final Config cfg = new Config();
-
- @Override
- public String[] getList(String section, String subsection, String name) {
- return cfg.getStringList(section, subsection, name);
- }
-
- @Override
- public String[] getListForPlugin(
- String pluginName, String section, String subsection, String name) {
- throw new UnsupportedOperationException("not used by tests");
- }
-
- @Override
- public void setList(String section, String subsection, String name, List<String> values) {
- cfg.setStringList(section, subsection, name, values);
- }
-
- @Override
- public void unset(String section, String subsection, String name) {
- cfg.unset(section, subsection, name);
- }
-
- @Override
- public Iterable<EntryKey> list() {
- throw new UnsupportedOperationException("not used by tests");
- }
-
- @Override
- public boolean isOutdated() {
- throw new UnsupportedOperationException("not used by tests");
- }
-
- @Override
- public void reload() {
- throw new UnsupportedOperationException("not used by tests");
- }
- }
}
