Skip to content

Commit 78b6302

Browse files
committed
fix various nits
1 parent 73047ce commit 78b6302

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexerTest.java

+15-16
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ void testParseOptions() throws ParseException {
191191

192192
private static class MyIndexChangeListener implements IndexChangedListener {
193193

194-
final Queue<String> files = new ConcurrentLinkedQueue<>();
194+
final Queue<String> addedFiles = new ConcurrentLinkedQueue<>();
195195
final Queue<String> removedFiles = new ConcurrentLinkedQueue<>();
196196

197197
@Override
@@ -200,7 +200,7 @@ public void fileAdd(String path, String analyzer) {
200200

201201
@Override
202202
public void fileAdded(String path, String analyzer) {
203-
files.add(path);
203+
addedFiles.add(path);
204204
}
205205

206206
@Override
@@ -217,7 +217,7 @@ public void fileRemoved(String path) {
217217
}
218218

219219
public void reset() {
220-
this.files.clear();
220+
this.addedFiles.clear();
221221
this.removedFiles.clear();
222222
}
223223
}
@@ -251,14 +251,14 @@ void testIndexWithSetIndexVersionedFilesOnly() throws Exception {
251251
MyIndexChangeListener listener = new MyIndexChangeListener();
252252
idb.addIndexChangedListener(listener);
253253
idb.update();
254-
assertEquals(2, listener.files.size());
254+
assertEquals(2, listener.addedFiles.size());
255255
repository.purgeData();
256256
RuntimeEnvironment.getInstance().setIndexVersionedFilesOnly(true);
257257
idb = new IndexDatabase(project);
258258
listener = new MyIndexChangeListener();
259259
idb.addIndexChangedListener(listener);
260260
idb.update();
261-
assertEquals(1, listener.files.size());
261+
assertEquals(1, listener.addedFiles.size());
262262
RuntimeEnvironment.getInstance().setIndexVersionedFilesOnly(false);
263263
} else {
264264
System.out.println("Skipping test. Repository for rfe2575 not found or an sccs I could use in path.");
@@ -422,7 +422,7 @@ void testBug3430() throws Exception {
422422
MyIndexChangeListener listener = new MyIndexChangeListener();
423423
idb.addIndexChangedListener(listener);
424424
idb.update();
425-
assertEquals(1, listener.files.size());
425+
assertEquals(1, listener.addedFiles.size());
426426
}
427427

428428
/**
@@ -449,21 +449,20 @@ void testIncrementalIndexAddRemoveFile() throws Exception {
449449
MyIndexChangeListener listener = new MyIndexChangeListener();
450450
idb.addIndexChangedListener(listener);
451451
idb.update();
452-
assertEquals(1, listener.files.size());
452+
assertEquals(1, listener.addedFiles.size());
453453
listener.reset();
454454
repository.addDummyFile(ppath);
455455
idb.update();
456-
assertEquals(1, listener.files.size(), "No new file added");
456+
assertEquals(1, listener.addedFiles.size(), "No new file added");
457457
repository.removeDummyFile(ppath);
458458
idb.update();
459-
assertEquals(1, listener.files.size(), "(added)files changed unexpectedly");
459+
assertEquals(1, listener.addedFiles.size(), "(added)files changed unexpectedly");
460460
assertEquals(1, listener.removedFiles.size(), "Didn't remove the dummy file");
461-
assertEquals(listener.files.peek(), listener.removedFiles.peek(), "Should have added then removed the same file");
461+
assertEquals(listener.addedFiles.peek(), listener.removedFiles.peek(), "Should have added then removed the same file");
462462
}
463463

464464
/**
465465
* Test that named pipes are not indexed.
466-
* @throws Exception
467466
*/
468467
@Test
469468
@EnabledIf("mkfifoInPath")
@@ -487,7 +486,7 @@ void testBug11896() throws Exception {
487486
idb.addIndexChangedListener(listener);
488487
System.out.println("Trying to index a special file - FIFO in this case.");
489488
idb.update();
490-
assertEquals(0, listener.files.size());
489+
assertEquals(0, listener.addedFiles.size());
491490
}
492491

493492
boolean mkfifoInPath() {
@@ -496,7 +495,6 @@ boolean mkfifoInPath() {
496495

497496
/**
498497
* Should include the existing project.
499-
* @throws Exception
500498
*/
501499
@Test
502500
void testDefaultProjectsSingleProject() throws Exception {
@@ -507,14 +505,14 @@ void testDefaultProjectsSingleProject() throws Exception {
507505
Indexer.getInstance().prepareIndexer(env, true, true,
508506
null, null);
509507
env.setDefaultProjectsFromNames(new TreeSet<>(Collections.singletonList("/c")));
508+
assertNotNull(env.getDefaultProjects());
510509
assertEquals(1, env.getDefaultProjects().size());
511510
assertEquals(new TreeSet<>(Collections.singletonList("c")),
512511
env.getDefaultProjects().stream().map(Project::getName).collect(Collectors.toSet()));
513512
}
514513

515514
/**
516-
* Should discard the non existing project.
517-
* @throws Exception
515+
* Should discard the non-existing project.
518516
*/
519517
@Test
520518
void testDefaultProjectsNonExistent() throws Exception {
@@ -532,14 +530,14 @@ void testDefaultProjectsNonExistent() throws Exception {
532530
Indexer.getInstance().prepareIndexer(env, true, true,
533531
null, null);
534532
env.setDefaultProjectsFromNames(projectSet);
533+
assertNotNull(env.getDefaultProjects());
535534
assertEquals(4, env.getDefaultProjects().size());
536535
assertEquals(new TreeSet<>(Arrays.asList("lisp", "pascal", "perl", "data")),
537536
env.getDefaultProjects().stream().map(Project::getName).collect(Collectors.toSet()));
538537
}
539538

540539
/**
541540
* Should include all projects in the source root.
542-
* @throws Exception
543541
*/
544542
@Test
545543
void testDefaultProjectsAll() throws Exception {
@@ -557,6 +555,7 @@ void testDefaultProjectsAll() throws Exception {
557555
null, null);
558556
env.setDefaultProjectsFromNames(defaultProjects);
559557
Set<String> projects = new TreeSet<>(Arrays.asList(new File(repository.getSourceRoot()).list()));
558+
assertNotNull(env.getDefaultProjects());
560559
assertEquals(projects.size(), env.getDefaultProjects().size());
561560
assertEquals(projects, env.getDefaultProjects().stream().map(Project::getName).collect(Collectors.toSet()));
562561
}

0 commit comments

Comments
 (0)