Skip to content

Commit

Permalink
remove redundant modifiers
Browse files Browse the repository at this point in the history 
also fix some docs/messages
  • Loading branch information
@vladak
vladak committed Jul 21, 2022
1 parent 9b8f372 commit dcf1091
Showing 1 changed file with 44 additions and 46 deletions.
90 changes: 44 additions & 46 deletions ...grok-indexer/src/test/java/org/opengrok/indexer/configuration/RuntimeEnvironmentTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void setUp() {
}

@Test
public void testDataRoot() throws IOException {
void testDataRoot() throws IOException {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertNull(instance.getDataRootFile());
assertNull(instance.getDataRootPath());
Expand All @@ -104,7 +104,7 @@ public void testDataRoot() throws IOException {
}

@Test
public void testIncludeRoot() throws IOException {
void testIncludeRoot() throws IOException {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertNull(instance.getIncludeRootPath());

Expand All @@ -124,7 +124,7 @@ public void testIncludeRoot() throws IOException {
}

@Test
public void testSourceRoot() throws IOException {
void testSourceRoot() throws IOException {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertNull(instance.getSourceRootFile());
assertNull(instance.getSourceRootPath());
Expand All @@ -137,7 +137,7 @@ public void testSourceRoot() throws IOException {
}

@Test
public void testProjects() throws IOException {
void testProjects() throws IOException {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
instance.setProjectsEnabled(true);
assertFalse(instance.hasProjects());
Expand All @@ -158,7 +158,7 @@ public void testProjects() throws IOException {
}

@Test
public void testGroups() {
void testGroups() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertFalse(instance.hasGroups());
assertNotNull(instance.getGroups());
Expand All @@ -176,7 +176,7 @@ public void testGroups() {
}

@Test
public void testPerThreadConsistency() throws InterruptedException {
void testPerThreadConsistency() throws InterruptedException {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
String path = "/tmp/dataroot1";
instance.setDataRoot(path);
Expand All @@ -191,13 +191,13 @@ public void testPerThreadConsistency() throws InterruptedException {
}

@Test
public void testUrlPrefix() {
void testUrlPrefix() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertEquals("/source/s?", instance.getUrlPrefix());
}

@Test
public void testCtags() {
void testCtags() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
String instanceCtags = instance.getCtags();
assertNotNull(instanceCtags);
Expand All @@ -216,47 +216,47 @@ public void testCtags() {
}

@Test
public void testFetchHistoryWhenNotInCache() {
void testFetchHistoryWhenNotInCache() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertTrue(instance.isFetchHistoryWhenNotInCache());
instance.setFetchHistoryWhenNotInCache(false);
assertFalse(instance.isFetchHistoryWhenNotInCache());
}

@Test
public void testUseHistoryCache() {
void testUseHistoryCache() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertTrue(instance.useHistoryCache());
instance.setUseHistoryCache(false);
assertFalse(instance.useHistoryCache());
}

@Test
public void testGenerateHtml() {
void testGenerateHtml() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertTrue(instance.isGenerateHtml());
instance.setGenerateHtml(false);
assertFalse(instance.isGenerateHtml());
}

@Test
public void testCompressXref() {
void testCompressXref() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertTrue(instance.isCompressXref());
instance.setCompressXref(false);
assertFalse(instance.isCompressXref());
}

@Test
public void testQuickContextScan() {
void testQuickContextScan() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertTrue(instance.isQuickContextScan());
instance.setQuickContextScan(false);
assertFalse(instance.isQuickContextScan());
}

@Test
public void testRepositories() {
void testRepositories() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertNotNull(instance.getRepositories());
instance.removeRepositories();
Expand All @@ -267,31 +267,31 @@ public void testRepositories() {
}

@Test
public void testRamBufferSize() {
void testRamBufferSize() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertEquals(16, instance.getRamBufferSize(), 0); //default is 16
instance.setRamBufferSize(256);
assertEquals(256, instance.getRamBufferSize(), 0);
}

@Test
public void testAllowLeadingWildcard() {
void testAllowLeadingWildcard() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertTrue(instance.isAllowLeadingWildcard());
instance.setAllowLeadingWildcard(false);
assertFalse(instance.isAllowLeadingWildcard());
}

@Test
public void testIgnoredNames() {
void testIgnoredNames() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertNotNull(instance.getIgnoredNames());
instance.setIgnoredNames(null);
assertNull(instance.getIgnoredNames());
}

@Test
public void testUserPage() {
void testUserPage() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
String page = "http://www.myserver.org/viewProfile.jspa?username=";
assertNull(instance.getUserPage()); // default value is null
Expand All @@ -300,7 +300,7 @@ public void testUserPage() {
}

@Test
public void testBugPage() {
void testBugPage() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
String page = "http://bugs.myserver.org/bugdatabase/view_bug.do?bug_id=";
assertNull(instance.getBugPage()); // default value is null
Expand All @@ -309,7 +309,7 @@ public void testBugPage() {
}

@Test
public void testBugPattern() {
void testBugPattern() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
String[] tests = new String[]{
"\\b([12456789][0-9]{6})\\b",
Expand All @@ -324,7 +324,7 @@ public void testBugPattern() {
}

@Test
public void testInvalidBugPattern() {
void testInvalidBugPattern() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
String[] tests = new String[]{
"\\b([",
Expand All @@ -341,7 +341,7 @@ public void testInvalidBugPattern() {
}

@Test
public void testReviewPage() {
void testReviewPage() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
String page = "http://arc.myserver.org/caselog/PSARC/";
assertNull(instance.getReviewPage()); // default value is null
Expand All @@ -350,7 +350,7 @@ public void testReviewPage() {
}

@Test
public void testReviewPattern() {
void testReviewPattern() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
String[] tests = new String[]{
"\\b(\\d{4}/\\d{3})\\b",
Expand All @@ -365,7 +365,7 @@ public void testReviewPattern() {
}

@Test
public void testInvalidReviewPattern() {
void testInvalidReviewPattern() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
String[] tests = new String[]{
"\\b([",
Expand All @@ -382,15 +382,15 @@ public void testInvalidReviewPattern() {
}

@Test
public void testWebappLAF() {
void testWebappLAF() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertEquals("default", instance.getWebappLAF());
instance.setWebappLAF("foo");
assertEquals("foo", instance.getWebappLAF());
}

@Test
public void testRemoteScmSupported() {
void testRemoteScmSupported() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertEquals(Configuration.RemoteSCM.OFF, instance.getRemoteScmSupported());
instance.setRemoteScmSupported(Configuration.RemoteSCM.ON);
Expand All @@ -402,29 +402,29 @@ public void testRemoteScmSupported() {
}

@Test
public void testOptimizeDatabase() {
void testOptimizeDatabase() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertTrue(instance.isOptimizeDatabase());
instance.setOptimizeDatabase(false);
assertFalse(instance.isOptimizeDatabase());
}

@Test
public void testUsingLuceneLocking() {
void testUsingLuceneLocking() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertEquals(LuceneLockName.OFF, instance.getLuceneLocking());
}

@Test
public void testIndexVersionedFilesOnly() {
void testIndexVersionedFilesOnly() {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
assertFalse(instance.isIndexVersionedFilesOnly());
instance.setIndexVersionedFilesOnly(true);
assertTrue(instance.isIndexVersionedFilesOnly());
}

@Test
public void testXMLencdec() throws IOException {
void testXMLencdec() throws IOException {
Configuration c = new Configuration();
String m = c.getXMLRepresentationAsString();
Configuration o = Configuration.makeXMLStringAsConfiguration(m);
Expand All @@ -435,7 +435,7 @@ public void testXMLencdec() throws IOException {
}

@Test
public void testAuthorizationFlagDecode() throws IOException {
void testAuthorizationFlagDecode() throws IOException {
String confString = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ "<java class=\"java.beans.XMLDecoder\" version=\"1.8.0_121\">\n"
+ " <object class=\"org.opengrok.indexer.configuration.Configuration\">\n"
Expand Down Expand Up @@ -498,7 +498,7 @@ public void testAuthorizationFlagDecode() throws IOException {
}

@Test
public void testAuthorizationStackDecode() throws IOException {
void testAuthorizationStackDecode() throws IOException {
String confString = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ "<java class=\"java.beans.XMLDecoder\" version=\"1.8.0_121\">\n"
+ " <object class=\"org.opengrok.indexer.configuration.Configuration\">\n"
Expand Down Expand Up @@ -625,7 +625,7 @@ public void testAuthorizationStackDecode() throws IOException {
assertTrue(pluginConfiguration.getStack().get(2).getFlag().isRequisite());
assertEquals("Requisite", pluginConfiguration.getStack().get(2).getName());

/**
/*
* Third element is a stack which defines two nested plugins.
*/
assertTrue(pluginConfiguration.getStack().get(1) instanceof AuthorizationStack);
Expand All @@ -647,7 +647,7 @@ public void testAuthorizationStackDecode() throws IOException {
assertTrue(plugin.getSetup().get("plugin") instanceof AuthorizationPlugin);
assertEquals(pluginConfiguration.getStack().get(0), plugin.getSetup().get("plugin"));

/**
/*
* Fourth element is a stack slightly changed from the previous stack.
* Only the setup for the particular plugin is changed.
*/
Expand All @@ -670,7 +670,7 @@ public void testAuthorizationStackDecode() throws IOException {
assertTrue(plugin.getSetup().get("plugin") instanceof AuthorizationPlugin);
assertEquals(pluginConfiguration.getStack().get(0), plugin.getSetup().get("plugin"));

/**
/*
* Fifth element is a direct copy of the first stack.
*/
assertTrue(pluginConfiguration.getStack().get(4) instanceof AuthorizationStack);
Expand Down Expand Up @@ -699,7 +699,7 @@ public void testAuthorizationStackDecode() throws IOException {
* @throws IOException I/O exception
*/
@Test
public void testAuthorizationFlagDecodeInvalid() throws IOException {
void testAuthorizationFlagDecodeInvalid() throws IOException {
String confString = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ "<java class=\"java.beans.XMLDecoder\" version=\"1.8.0_121\">\n"
+ " <object class=\"org.opengrok.indexer.configuration.Configuration\">\n"
Expand All @@ -722,8 +722,6 @@ public void testAuthorizationFlagDecodeInvalid() throws IOException {

/**
* Testing invalid class names for authorization checks.
*
* @throws IOException I/O exception
*/
@Test
void testAuthorizationDecodeInvalid() {
Expand All @@ -748,7 +746,7 @@ void testAuthorizationDecodeInvalid() {
}

@Test
public void testBug3095() throws IOException {
void testBug3095() throws IOException {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
File file = new File("foobar");
assertTrue(file.createNewFile());
Expand All @@ -762,7 +760,7 @@ public void testBug3095() throws IOException {
}

@Test
public void testBug3154() throws IOException {
void testBug3154() throws IOException {
RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
File file = File.createTempFile("dataroot", null);
assertTrue(file.delete());
Expand All @@ -775,7 +773,7 @@ public void testBug3154() throws IOException {
}

@Test
public void testObfuscateEMail() throws IOException {
void testObfuscateEMail() throws IOException {
RuntimeEnvironment env = RuntimeEnvironment.getInstance();

// By default, don't obfuscate.
Expand Down Expand Up @@ -809,7 +807,7 @@ private void assertObfuscated(boolean expected, RuntimeEnvironment env)
}

@Test
public void isChattyStatusPage() {
void isChattyStatusPage() {
RuntimeEnvironment env = RuntimeEnvironment.getInstance();

// By default, status page should not be chatty.
Expand All @@ -829,8 +827,8 @@ public void isChattyStatusPage() {
* @throws ForbiddenSymlinkException forbidden symlink exception
*/
@Test
public void testGetPathRelativeToSourceRoot() throws IOException,
ForbiddenSymlinkException {
void testGetPathRelativeToSourceRoot() throws IOException, ForbiddenSymlinkException {

RuntimeEnvironment env = RuntimeEnvironment.getInstance();

// Create and set source root.
Expand Down Expand Up @@ -861,7 +859,7 @@ public void testGetPathRelativeToSourceRoot() throws IOException,
expex = e;
}
assertNotNull(expex, "getPathRelativeToSourceRoot() should have thrown " +
"IOexception for symlink that is not allowed");
"IOException for symlink that is not allowed");

// Allow the symlink and retest.
env.setAllowedSymlinks(new HashSet<>(Arrays.asList(symlink.getPath())));
Expand All @@ -874,7 +872,7 @@ public void testGetPathRelativeToSourceRoot() throws IOException,
}

@Test
public void testPopulateGroupsMultipleTimes() {
void testPopulateGroupsMultipleTimes() {
// create a structure with two repositories
final RuntimeEnvironment env = RuntimeEnvironment.getInstance();
Project project1 = new Project("bar", "/bar");
Expand Down

0 comments on commit dcf1091

Please sign in to comment.