Skip to content

Commit 51a81d2

Browse files
tarzanektarzanek
authored
Merge pull request #2967 from idodeclare/feature/test_maintenance
Extract symbol-tokenizer test code
2 parents 8454cc2 + 787af92 commit 51a81d2

30 files changed

+227
-553
lines changed

‎opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/ada/AdaSymbolTokenizerTest.java

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@
1919

2020
/*
2121
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
22-
* Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
22+
* Portions Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
2323
*/
2424
package org.opengrok.indexer.analysis.ada;
2525

26-
import java.io.BufferedReader;
27-
import java.io.InputStream;
28-
import java.io.InputStreamReader;
29-
import java.util.ArrayList;
30-
import java.util.List;
3126
import static org.junit.Assert.assertNotNull;
32-
import org.junit.Test;
3327
import static org.opengrok.indexer.util.CustomAssertions.assertSymbolStream;
3428

29+
import org.junit.Test;
30+
import org.opengrok.indexer.util.StreamUtils;
31+
import java.io.InputStream;
32+
import java.util.List;
33+
3534
/**
3635
* Tests the {@link AdaSymbolTokenizer} class.
3736
*/
@@ -50,17 +49,8 @@ public void testPerlSymbolStream() throws Exception {
5049
"analysis/ada/samplesymbols.txt");
5150
assertNotNull("despite samplesymbols.txt as resource,", wdsres);
5251

53-
List<String> expectedSymbols = new ArrayList<>();
54-
try (BufferedReader wdsr = new BufferedReader(new InputStreamReader(
55-
wdsres, "UTF-8"))) {
56-
String line;
57-
while ((line = wdsr.readLine()) != null) {
58-
int hasho = line.indexOf('#');
59-
if (hasho != -1) line = line.substring(0, hasho);
60-
expectedSymbols.add(line.trim());
61-
}
62-
}
63-
52+
List<String> expectedSymbols = StreamUtils.readSampleSymbols(wdsres);
6453
assertSymbolStream(AdaSymbolTokenizer.class, adbres, expectedSymbols);
6554
}
55+
6656
}

‎opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/c/CSymbolTokenizerTest.java

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@
1919

2020
/*
2121
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
22-
* Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
22+
* Portions Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
2323
*/
2424

2525
package org.opengrok.indexer.analysis.c;
2626

27-
import java.io.BufferedReader;
28-
import java.io.InputStream;
29-
import java.io.InputStreamReader;
30-
import java.util.ArrayList;
31-
import java.util.List;
3227
import static org.junit.Assert.assertNotNull;
33-
import org.junit.Test;
3428
import static org.opengrok.indexer.util.CustomAssertions.assertSymbolStream;
29+
import static org.opengrok.indexer.util.StreamUtils.readSampleSymbols;
30+
31+
import org.junit.Test;
32+
import java.io.InputStream;
33+
import java.util.List;
3534

3635
/**
3736
* Tests the {@link CSymbolTokenizer} class.
@@ -51,17 +50,7 @@ public void testCSymbolStream() throws Exception {
5150
"analysis/c/samplesymbols_c.txt");
5251
assertNotNull("despite samplesymbols_c.txt as resource,", symres);
5352

54-
List<String> expectedSymbols = new ArrayList<>();
55-
try (BufferedReader wdsr = new BufferedReader(new InputStreamReader(
56-
symres, "UTF-8"))) {
57-
String line;
58-
while ((line = wdsr.readLine()) != null) {
59-
int hasho = line.indexOf('#');
60-
if (hasho != -1) line = line.substring(0, hasho);
61-
expectedSymbols.add(line.trim());
62-
}
63-
}
64-
53+
List<String> expectedSymbols = readSampleSymbols(symres);
6554
assertSymbolStream(CSymbolTokenizer.class, cres, expectedSymbols);
6655
}
6756
}

‎opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/c/CxxSymbolTokenizerTest.java

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@
1919

2020
/*
2121
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
22-
* Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
22+
* Portions Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
2323
*/
2424

2525
package org.opengrok.indexer.analysis.c;
2626

27-
import java.io.BufferedReader;
28-
import java.io.InputStream;
29-
import java.io.InputStreamReader;
30-
import java.util.ArrayList;
31-
import java.util.List;
3227
import static org.junit.Assert.assertNotNull;
33-
import org.junit.Test;
3428
import static org.opengrok.indexer.util.CustomAssertions.assertSymbolStream;
29+
import static org.opengrok.indexer.util.StreamUtils.readSampleSymbols;
30+
31+
import org.junit.Test;
32+
import java.io.InputStream;
33+
import java.util.List;
3534

3635
/**
3736
* Tests the {@link CxxSymbolTokenizer} class.
@@ -51,17 +50,7 @@ public void testCxxSymbolStream() throws Exception {
5150
"analysis/c/samplesymbols_cc.txt");
5251
assertNotNull("despite samplesymbols_cc.txt as resource,", symres);
5352

54-
List<String> expectedSymbols = new ArrayList<>();
55-
try (BufferedReader wdsr = new BufferedReader(new InputStreamReader(
56-
symres, "UTF-8"))) {
57-
String line;
58-
while ((line = wdsr.readLine()) != null) {
59-
int hasho = line.indexOf('#');
60-
if (hasho != -1) line = line.substring(0, hasho);
61-
expectedSymbols.add(line.trim());
62-
}
63-
}
64-
53+
List<String> expectedSymbols = readSampleSymbols(symres);
6554
assertSymbolStream(CxxSymbolTokenizer.class, ccres, expectedSymbols);
6655
}
6756
}

‎opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/clojure/ClojureSymbolTokenizerTest.java

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@
1919

2020
/*
2121
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
22-
* Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
22+
* Portions Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
2323
*/
2424

2525
package org.opengrok.indexer.analysis.clojure;
2626

27-
import java.io.BufferedReader;
28-
import java.io.InputStream;
29-
import java.io.InputStreamReader;
30-
import java.util.ArrayList;
31-
import java.util.List;
3227
import static org.junit.Assert.assertNotNull;
33-
import org.junit.Test;
3428
import static org.opengrok.indexer.util.CustomAssertions.assertSymbolStream;
29+
import static org.opengrok.indexer.util.StreamUtils.readSampleSymbols;
30+
31+
import org.junit.Test;
32+
import java.io.InputStream;
33+
import java.util.List;
3534

3635
/**
3736
* Tests the {@link ClojureSymbolTokenizer} class.
@@ -51,18 +50,7 @@ public void testClojureSymbolStream() throws Exception {
5150
"analysis/clojure/samplesymbols.txt");
5251
assertNotNull("despite samplesymbols.txt as resource,", wdsres);
5352

54-
List<String> expectedSymbols = new ArrayList<>();
55-
try (BufferedReader wdsr = new BufferedReader(new InputStreamReader(
56-
wdsres, "UTF-8"))) {
57-
String line;
58-
while ((line = wdsr.readLine()) != null) {
59-
int hasho = line.indexOf('#');
60-
if (hasho != -1) line = line.substring(0, hasho);
61-
expectedSymbols.add(line.trim());
62-
}
63-
}
64-
65-
assertSymbolStream(ClojureSymbolTokenizer.class, cljres,
66-
expectedSymbols);
53+
List<String> expectedSymbols = readSampleSymbols(wdsres);
54+
assertSymbolStream(ClojureSymbolTokenizer.class, cljres, expectedSymbols);
6755
}
6856
}

‎opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/csharp/CSharpSymbolTokenizerTest.java

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@
1919

2020
/*
2121
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
22-
* Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
22+
* Portions Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
2323
*/
2424

2525
package org.opengrok.indexer.analysis.csharp;
2626

27-
import java.io.BufferedReader;
28-
import java.io.InputStream;
29-
import java.io.InputStreamReader;
30-
import java.util.ArrayList;
31-
import java.util.List;
3227
import static org.junit.Assert.assertNotNull;
33-
import org.junit.Test;
3428
import static org.opengrok.indexer.util.CustomAssertions.assertSymbolStream;
29+
import static org.opengrok.indexer.util.StreamUtils.readSampleSymbols;
30+
31+
import org.junit.Test;
32+
import java.io.InputStream;
33+
import java.util.List;
3534

3635
/**
3736
* Tests the {@link CSharpSymbolTokenizer} class.
@@ -51,18 +50,7 @@ public void testCSharpSymbolStream() throws Exception {
5150
"analysis/csharp/samplesymbols.txt");
5251
assertNotNull("despite samplesymbols.txt as resource,", symres);
5352

54-
List<String> expectedSymbols = new ArrayList<>();
55-
try (BufferedReader wdsr = new BufferedReader(new InputStreamReader(
56-
symres, "UTF-8"))) {
57-
String line;
58-
while ((line = wdsr.readLine()) != null) {
59-
int hasho = line.indexOf('#');
60-
if (hasho != -1) line = line.substring(0, hasho);
61-
expectedSymbols.add(line.trim());
62-
}
63-
}
64-
65-
assertSymbolStream(CSharpSymbolTokenizer.class, csres,
66-
expectedSymbols);
53+
List<String> expectedSymbols = readSampleSymbols(symres);
54+
assertSymbolStream(CSharpSymbolTokenizer.class, csres, expectedSymbols);
6755
}
6856
}

‎opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/eiffel/EiffelSymbolTokenizerTest.java

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@
1919

2020
/*
2121
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
22-
* Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
22+
* Portions Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
2323
*/
2424

2525
package org.opengrok.indexer.analysis.eiffel;
2626

27-
import java.io.BufferedReader;
28-
import java.io.InputStream;
29-
import java.io.InputStreamReader;
30-
import java.util.ArrayList;
31-
import java.util.List;
3227
import static org.junit.Assert.assertNotNull;
33-
import org.junit.Test;
3428
import static org.opengrok.indexer.util.CustomAssertions.assertSymbolStream;
29+
import static org.opengrok.indexer.util.StreamUtils.readSampleSymbols;
30+
31+
import org.junit.Test;
32+
import java.io.InputStream;
33+
import java.util.List;
3534

3635
/**
3736
* Tests the {@link EiffelSymbolTokenizer} class.
@@ -51,18 +50,7 @@ public void testEiffelSymbolStream() throws Exception {
5150
"analysis/eiffel/samplesymbols.txt");
5251
assertNotNull("despite samplesymbols.txt as resource,", symres);
5352

54-
List<String> expectedSymbols = new ArrayList<>();
55-
try (BufferedReader wdsr = new BufferedReader(new InputStreamReader(
56-
symres, "UTF-8"))) {
57-
String line;
58-
while ((line = wdsr.readLine()) != null) {
59-
int hasho = line.indexOf('#');
60-
if (hasho != -1) line = line.substring(0, hasho);
61-
expectedSymbols.add(line.trim());
62-
}
63-
}
64-
65-
assertSymbolStream(EiffelSymbolTokenizer.class, eres,
66-
expectedSymbols);
53+
List<String> expectedSymbols = readSampleSymbols(symres);
54+
assertSymbolStream(EiffelSymbolTokenizer.class, eres, expectedSymbols);
6755
}
6856
}

‎opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/erlang/ErlangSymbolTokenizerTest.java

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@
1919

2020
/*
2121
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
22-
* Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
22+
* Portions Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
2323
*/
2424

2525
package org.opengrok.indexer.analysis.erlang;
2626

27-
import java.io.BufferedReader;
28-
import java.io.InputStream;
29-
import java.io.InputStreamReader;
30-
import java.util.ArrayList;
31-
import java.util.List;
3227
import static org.junit.Assert.assertNotNull;
33-
import org.junit.Test;
3428
import static org.opengrok.indexer.util.CustomAssertions.assertSymbolStream;
29+
import static org.opengrok.indexer.util.StreamUtils.readSampleSymbols;
30+
31+
import org.junit.Test;
32+
import java.io.InputStream;
33+
import java.util.List;
3534

3635
/**
3736
* Tests the {@link ErlangSymbolTokenizer} class.
@@ -51,18 +50,7 @@ public void testErlangSymbolStream() throws Exception {
5150
"analysis/erlang/samplesymbols.txt");
5251
assertNotNull("despite samplesymbols.txt as resource,", symres);
5352

54-
List<String> expectedSymbols = new ArrayList<>();
55-
try (BufferedReader wdsr = new BufferedReader(new InputStreamReader(
56-
symres, "UTF-8"))) {
57-
String line;
58-
while ((line = wdsr.readLine()) != null) {
59-
int hasho = line.indexOf('#');
60-
if (hasho != -1) line = line.substring(0, hasho);
61-
expectedSymbols.add(line.trim());
62-
}
63-
}
64-
65-
assertSymbolStream(ErlangSymbolTokenizer.class, erlres,
66-
expectedSymbols);
53+
List<String> expectedSymbols = readSampleSymbols(symres);
54+
assertSymbolStream(ErlangSymbolTokenizer.class, erlres, expectedSymbols);
6755
}
6856
}

‎opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/fortran/FortranSymbolTokenizerTest.java

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@
1919

2020
/*
2121
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
22-
* Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
22+
* Portions Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
2323
*/
2424

2525
package org.opengrok.indexer.analysis.fortran;
2626

27-
import java.io.BufferedReader;
28-
import java.io.InputStream;
29-
import java.io.InputStreamReader;
30-
import java.util.ArrayList;
31-
import java.util.List;
3227
import static org.junit.Assert.assertNotNull;
33-
import org.junit.Test;
3428
import static org.opengrok.indexer.util.CustomAssertions.assertSymbolStream;
29+
import static org.opengrok.indexer.util.StreamUtils.readSampleSymbols;
30+
31+
import org.junit.Test;
32+
import java.io.InputStream;
33+
import java.util.List;
3534

3635
/**
3736
* Tests the {@link FortranSymbolTokenizer} class.
@@ -51,18 +50,7 @@ public void testFortranSymbolStream() throws Exception {
5150
"analysis/fortran/samplesymbols.txt");
5251
assertNotNull("despite samplesymbols.txt as resource,", wdsres);
5352

54-
List<String> expectedSymbols = new ArrayList<>();
55-
try (BufferedReader wdsr = new BufferedReader(new InputStreamReader(
56-
wdsres, "UTF-8"))) {
57-
String line;
58-
while ((line = wdsr.readLine()) != null) {
59-
int hasho = line.indexOf('#');
60-
if (hasho != -1) line = line.substring(0, hasho);
61-
expectedSymbols.add(line.trim());
62-
}
63-
}
64-
65-
assertSymbolStream(FortranSymbolTokenizer.class, fres,
66-
expectedSymbols);
53+
List<String> expectedSymbols = readSampleSymbols(wdsres);
54+
assertSymbolStream(FortranSymbolTokenizer.class, fres, expectedSymbols);
6755
}
6856
}

0 commit comments

Comments
 (0)