opendev/gerrit
Code Issues Proposed changes

Extract InMemorySecureStore to its own class

Browse Source 
Change-Id: Ie15a0900a82e42f919ef6c6f702e869c691a25cf
This commit is contained in:
Dave Borowitz 2018-11-19 08:39:58 -08:00
parent 20bb18b739
commit 314edaa07b
4 changed files with 72 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
java/com/google/gerrit/server/securestore/testing/BUILD Normal file
View File

@ -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",
],
)

59
java/com/google/gerrit/server/securestore/testing/InMemorySecureStore.java Normal file
View File

@ -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");
}
}

1
javatests/com/google/gerrit/pgm/BUILD
View File

@ -11,6 +11,7 @@ junit_tests(
"//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",

44
javatests/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java
View File

@ -31,15 +31,13 @@ import com.google.gerrit.pgm.init.api.ConsoleUI;
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 @@ public class UpgradeFrom2_0_xTest extends InitTestCase {
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");
}
}
}