[tor-commits] [metrics-lib/release] Replace all @Test() with @Test.
karsten at torproject.org
karsten at torproject.org
Fri Jun 16 15:30:39 UTC 2017
commit c7a4ffe6ccd1989ff1cd6eddd5beb141798600b5
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Mon Jun 12 10:10:04 2017 +0200
Replace all @Test() with @Test.
---
.../descriptor/DescriptorSourceFactoryTest.java | 6 +-
.../descriptor/impl/BridgeNetworkStatusTest.java | 6 +-
.../impl/DescriptorCollectorImplTest.java | 12 +-
.../descriptor/impl/ExitListImplTest.java | 6 +-
.../impl/ExtraInfoDescriptorImplTest.java | 130 +++++++++---------
.../descriptor/impl/MicrodescriptorImplTest.java | 2 +-
.../impl/RelayNetworkStatusConsensusImplTest.java | 88 ++++++-------
.../impl/RelayNetworkStatusImplTest.java | 2 +-
.../impl/RelayNetworkStatusVoteImplTest.java | 54 ++++----
.../descriptor/impl/ServerDescriptorImplTest.java | 146 ++++++++++-----------
.../descriptor/impl/TorperfResultImplTest.java | 10 +-
.../index/DescriptorIndexCollectorTest.java | 14 +-
.../descriptor/index/DirectoryNodeTest.java | 4 +-
.../torproject/descriptor/index/FileNodeTest.java | 2 +-
.../torproject/descriptor/index/IndexNodeTest.java | 12 +-
15 files changed, 247 insertions(+), 247 deletions(-)
diff --git a/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java
index 9e0b5ff..8eee1ef 100644
--- a/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java
+++ b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java
@@ -33,7 +33,7 @@ public class DescriptorSourceFactoryTest {
private static final String[] defaults = new String[] { COLLECTOR_DEFAULT,
DOWNLOADER_DEFAULT, PARSER_DEFAULT, READER_DEFAULT };
- @Test()
+ @Test
public void testDefaults() {
setProperties(defaults);
DescriptorCollector dc =
@@ -61,7 +61,7 @@ public class DescriptorSourceFactoryTest {
DescriptorSourceFactory.createDescriptorCollector();
}
- @Test()
+ @Test
public void testUnknownPropertyException() {
setProperties(defaults);
try {
@@ -81,7 +81,7 @@ public class DescriptorSourceFactoryTest {
}
}
- @Test()
+ @Test
public void testProperties() {
setProperties(new String[] {
"org.torproject.descriptor.DummyCollectorImplementation",
diff --git a/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java b/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java
index 25db3d0..3739e5d 100644
--- a/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java
+++ b/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java
@@ -126,7 +126,7 @@ public class BridgeNetworkStatusTest {
}
}
- @Test()
+ @Test
public void testSampleStatus() throws DescriptorParseException {
StatusBuilder sb = new StatusBuilder();
BridgeNetworkStatus status = sb.buildStatus(true);
@@ -145,14 +145,14 @@ public class BridgeNetworkStatusTest {
assertTrue(status.getUnrecognizedLines().isEmpty());
}
- @Test()
+ @Test
public void testPublishedNoLine() throws DescriptorParseException {
BridgeNetworkStatus status =
StatusBuilder.createWithPublishedLine(null);
assertEquals(1448127576000L, status.getPublishedMillis());
}
- @Test()
+ @Test
public void testFlagThresholdsNoLine() throws DescriptorParseException {
BridgeNetworkStatus status =
StatusBuilder.createWithFlagThresholdsLine(null);
diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java
index 45752b2..c2f9674 100644
--- a/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java
+++ b/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java
@@ -18,7 +18,7 @@ public class DescriptorCollectorImplTest {
private static final String REMOTE_DIRECTORY_CONSENSUSES =
"/recent/relay-descriptors/consensuses/";
- @Test()
+ @Test
public void testOneFile() {
String remoteFilename = "2015-05-24-12-00-00-consensus";
String directoryListing = "<tr><td valign=\"top\">"
@@ -38,7 +38,7 @@ public class DescriptorCollectorImplTest {
remoteFiles.get(remoteFiles.firstKey()));
}
- @Test()
+ @Test
public void testSameFileTwoTimestampsLastWins() {
String remoteFilename = "2015-05-24-12-00-00-consensus";
String firstTimestamp = "2015-05-24 12:04";
@@ -61,7 +61,7 @@ public class DescriptorCollectorImplTest {
remoteFiles.get(remoteFiles.firstKey()));
}
- @Test()
+ @Test
public void testSubDirectoryOnly() {
String directoryListing = "<tr><td valign=\"top\">"
+ "<img src=\"/icons/folder.gif\" alt=\"[DIR]\"></td><td>"
@@ -75,7 +75,7 @@ public class DescriptorCollectorImplTest {
assertTrue(remoteFiles.isEmpty());
}
- @Test()
+ @Test
public void testParentDirectoryOnly() {
String directoryListing = "<tr><td valign=\"top\">"
+ "<img src=\"/icons/back.gif\" alt=\"[DIR]\"></td><td>"
@@ -89,7 +89,7 @@ public class DescriptorCollectorImplTest {
assertTrue(remoteFiles.isEmpty());
}
- @Test()
+ @Test
public void testUnexpectedDateFormat() {
String directoryListing = "<tr><td valign=\"top\">"
+ "<img src=\"/icons/unknown.gif\" alt=\"[ ]\"></td><td>"
@@ -104,7 +104,7 @@ public class DescriptorCollectorImplTest {
assertTrue(remoteFiles.isEmpty());
}
- @Test()
+ @Test
public void testInvalidDate() {
String directoryListing = "<tr><td valign=\"top\">"
+ "<img src=\"/icons/unknown.gif\" alt=\"[ ]\"></td><td>"
diff --git a/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java
index 5a67d53..74417d9 100644
--- a/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java
+++ b/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java
@@ -21,7 +21,7 @@ public class ExitListImplTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
- @Test()
+ @Test
public void testAnnotatedInput() throws Exception {
ExitListImpl result = new ExitListImpl((tordnselAnnotation + input)
.getBytes("US-ASCII"), fileName, false);
@@ -38,7 +38,7 @@ public class ExitListImplTest {
result.getEntries().size());
}
- @Test()
+ @Test
public void testMultipleOldExitAddresses() throws Exception {
ExitListImpl result = new ExitListImpl(
(tordnselAnnotation + multiExitAddressInput)
@@ -64,7 +64,7 @@ public class ExitListImplTest {
assertTrue("Map: " + testMap, testMap.isEmpty());
}
- @Test()
+ @Test
public void testMultipleExitAddresses() throws Exception {
ExitListImpl result = new ExitListImpl(
(tordnselAnnotation + multiExitAddressInput)
diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java
index e10fa7b..7b62393 100644
--- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java
+++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java
@@ -951,7 +951,7 @@ public class ExtraInfoDescriptorImplTest {
}
}
- @Test()
+ @Test
public void testSampleDescriptor() throws DescriptorParseException {
DescriptorBuilder db = new DescriptorBuilder();
ExtraInfoDescriptor descriptor = db.buildDescriptor(true);
@@ -978,7 +978,7 @@ public class ExtraInfoDescriptorImplTest {
DescriptorBuilder.createWithExtraInfoLine(null);
}
- @Test()
+ @Test
public void testExtraInfoOpt() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
.createWithExtraInfoLine("opt extra-info chaoscomputerclub5 "
@@ -988,7 +988,7 @@ public class ExtraInfoDescriptorImplTest {
descriptor.getFingerprint());
}
- @Test()
+ @Test
public void testExtraInfoNicknameTwoSpaces()
throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
@@ -1077,14 +1077,14 @@ public class ExtraInfoDescriptorImplTest {
DescriptorBuilder.createWithPublishedLine(null);
}
- @Test()
+ @Test
public void testPublishedOpt() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
.createWithPublishedLine("opt published 2012-02-11 09:08:36");
assertEquals(1328951316000L, descriptor.getPublishedMillis());
}
- @Test()
+ @Test
public void testPublishedMillis() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
.createWithPublishedLine("opt published 2012-02-11 09:08:36.123");
@@ -1103,7 +1103,7 @@ public class ExtraInfoDescriptorImplTest {
+ "-4713350144,-4723824640,-4710717440,-4572675072");
}
- @Test()
+ @Test
public void testReadHistoryTabInterval()
throws DescriptorParseException {
DescriptorBuilder.createWithReadHistoryLine("read-history "
@@ -1111,7 +1111,7 @@ public class ExtraInfoDescriptorImplTest {
+ "4707695616,4699666432,4650004480,4489718784");
}
- @Test()
+ @Test
public void testReadHistoryTabIntervalBytes()
throws DescriptorParseException {
DescriptorBuilder.createWithReadHistoryLine("read-history "
@@ -1131,7 +1131,7 @@ public class ExtraInfoDescriptorImplTest {
+ "4707695616,4699666432,4650004480,4489718784");
}
- @Test()
+ @Test
public void testReadHistoryNonStandardInterval()
throws DescriptorParseException {
DescriptorBuilder.createWithReadHistoryLine("read-history "
@@ -1163,7 +1163,7 @@ public class ExtraInfoDescriptorImplTest {
+ "81281024,,60625920,67922944");
}
- @Test()
+ @Test
public void testDirreqWriteHistoryExtraArg() throws DescriptorParseException {
DescriptorBuilder.createWithDirreqWriteHistoryLine(
"dirreq-write-history "
@@ -1183,7 +1183,7 @@ public class ExtraInfoDescriptorImplTest {
+ "17074176,16235520,16005120,");
}
- @Test()
+ @Test
public void testGeoipDbDigestValid() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
.createWithGeoipDbDigestLine("geoip-db-digest "
@@ -1221,7 +1221,7 @@ public class ExtraInfoDescriptorImplTest {
DescriptorBuilder.createWithGeoipDbDigestLine("geoip-db-digest");
}
- @Test()
+ @Test
public void testGeoipDbDigestExtraArg() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
.createWithGeoip6DbDigestLine("geoip-db-digest "
@@ -1232,7 +1232,7 @@ public class ExtraInfoDescriptorImplTest {
descriptor.getGeoipDbDigest());
}
- @Test()
+ @Test
public void testGeoip6DbDigestValid() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
.createWithGeoip6DbDigestLine("geoip6-db-digest "
@@ -1241,7 +1241,7 @@ public class ExtraInfoDescriptorImplTest {
descriptor.getGeoip6DbDigestSha1Hex());
}
- @Test()
+ @Test
public void testGeoip6DbDigestExtraArg() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
.createWithGeoip6DbDigestLine("geoip6-db-digest "
@@ -1252,7 +1252,7 @@ public class ExtraInfoDescriptorImplTest {
descriptor.getGeoip6DbDigest());
}
- @Test()
+ @Test
public void testGeoipStatsValid() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = GeoipStatsBuilder
.createWithDefaultLines();
@@ -1322,7 +1322,7 @@ public class ExtraInfoDescriptorImplTest {
+ "gb=208,other=200");
}
- @Test()
+ @Test
public void testGeoipClientOriginsQuestionMarks()
throws DescriptorParseException {
GeoipStatsBuilder.createWithGeoipClientOriginsLine(
@@ -1330,7 +1330,7 @@ public class ExtraInfoDescriptorImplTest {
+ "gb=208,??=200");
}
- @Test()
+ @Test
public void testGeoipClientOriginsCapital()
throws DescriptorParseException {
GeoipStatsBuilder.createWithGeoipClientOriginsLine(
@@ -1386,7 +1386,7 @@ public class ExtraInfoDescriptorImplTest {
+ "ru=352,fr=208,gb=208,ir=200");
}
- @Test()
+ @Test
public void testGeoipClientOriginsExtraArg()
throws DescriptorParseException {
GeoipStatsBuilder.createWithGeoipClientOriginsLine(
@@ -1394,7 +1394,7 @@ public class ExtraInfoDescriptorImplTest {
+ "gb=208 ir=200");
}
- @Test()
+ @Test
public void testDirreqStatsValid() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DirreqStatsBuilder
.createWithDefaultLines();
@@ -1425,14 +1425,14 @@ public class ExtraInfoDescriptorImplTest {
assertEquals(0, dl.get("complete").intValue());
}
- @Test()
+ @Test
public void testDirreqStatsIntervalTwoDays()
throws DescriptorParseException {
DirreqStatsBuilder.createWithDirreqStatsEndLine("dirreq-stats-end "
+ "2012-02-11 00:59:53 (172800 s)");
}
- @Test()
+ @Test
public void testDirreqStatsExtraArg()
throws DescriptorParseException {
DirreqStatsBuilder.createWithDirreqStatsEndLine("dirreq-stats-end "
@@ -1449,14 +1449,14 @@ public class ExtraInfoDescriptorImplTest {
+ "usa=1544");
}
- @Test()
+ @Test
public void testDirreqV3IpsExtraArg()
throws DescriptorParseException {
DirreqStatsBuilder.createWithDirreqV3IpsLine("dirreq-v3-ips "
+ "ab=12,cd=34 ef=56");
}
- @Test()
+ @Test
public void testDirreqV2IpsDigitCountry()
throws DescriptorParseException {
DirreqStatsBuilder.createWithDirreqV2IpsLine("dirreq-v2-ips 00=8");
@@ -1472,7 +1472,7 @@ public class ExtraInfoDescriptorImplTest {
+ "u=1744");
}
- @Test()
+ @Test
public void testDirreqV3ReqsNull() throws DescriptorParseException {
ExtraInfoDescriptor eid =
DirreqStatsBuilder.createWithDirreqV3ReqsLine(null);
@@ -1498,7 +1498,7 @@ public class ExtraInfoDescriptorImplTest {
+ "ok==10848");
}
- @Test()
+ @Test
public void testDirreqV3RespEmptyString()
throws DescriptorParseException {
this.thrown.expect(DescriptorParseException.class);
@@ -1508,7 +1508,7 @@ public class ExtraInfoDescriptorImplTest {
DirreqStatsBuilder.createWithDirreqV3RespLine("dirreq-v3-resp =10848");
}
- @Test()
+ @Test
public void testDirreqV3RespExtraArg()
throws DescriptorParseException {
DirreqStatsBuilder.createWithDirreqV3RespLine("dirreq-v3-resp "
@@ -1541,7 +1541,7 @@ public class ExtraInfoDescriptorImplTest {
+ "0.37");
}
- @Test()
+ @Test
public void testDirreqV3ShareExtraArg()
throws DescriptorParseException {
DirreqStatsBuilder.createWithDirreqV3ShareLine("dirreq-v3-share "
@@ -1557,7 +1557,7 @@ public class ExtraInfoDescriptorImplTest {
"dirreq-v3-direct-dl complete 36");
}
- @Test()
+ @Test
public void testDirreqV2DirectDlNegative()
throws DescriptorParseException {
DirreqStatsBuilder.createWithDirreqV2DirectDlLine(
@@ -1582,14 +1582,14 @@ public class ExtraInfoDescriptorImplTest {
"dirreq-v2-tunneled-dl complete=0.001");
}
- @Test()
+ @Test
public void testDirreqV3TunneledDlExtraArg()
throws DescriptorParseException {
DirreqStatsBuilder.createWithDirreqV2TunneledDlLine(
"dirreq-v2-tunneled-dl complete=-8 incomplete=1/-8");
}
- @Test()
+ @Test
public void testEntryStatsValid() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = EntryStatsBuilder
.createWithDefaultLines();
@@ -1619,7 +1619,7 @@ public class ExtraInfoDescriptorImplTest {
+ "ir=25368;us=15744");
}
- @Test()
+ @Test
public void testCellStatsValid() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = CellStatsBuilder
.createWithDefaultLines();
@@ -1688,14 +1688,14 @@ public class ExtraInfoDescriptorImplTest {
"cell-circuits-per-decile -866");
}
- @Test()
+ @Test
public void testCellCircuitsPerDecileExtraArg()
throws DescriptorParseException {
CellStatsBuilder.createWithCellCircuitsPerDecileLine(
"cell-circuits-per-decile 866 866 866 866 866");
}
- @Test()
+ @Test
public void testConnBiDirectValid()
throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
@@ -1719,14 +1719,14 @@ public class ExtraInfoDescriptorImplTest {
+ "2012-02-11 01:59:39 (86400 s) 42173,1591,1310,1744,42");
}
- @Test()
+ @Test
public void testConnBiDirectStatsExtraArg()
throws DescriptorParseException {
DescriptorBuilder.createWithConnBiDirectLine("conn-bi-direct "
+ "2012-02-11 01:59:39 (86400 s) 42173,1591,1310,1744 +1");
}
- @Test()
+ @Test
public void testExitStatsValid() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = ExitStatsBuilder
.createWithDefaultLines();
@@ -1788,7 +1788,7 @@ public class ExtraInfoDescriptorImplTest {
"exit-kibibytes-written unknown=74647");
}
- @Test()
+ @Test
public void testExitStatsWrittenEmptyString()
throws DescriptorParseException {
this.thrown.expect(DescriptorParseException.class);
@@ -1808,27 +1808,27 @@ public class ExtraInfoDescriptorImplTest {
"exit-kibibytes-read 25=-35562");
}
- @Test()
+ @Test
public void testExitStatsReadTooLarge()
throws DescriptorParseException {
ExitStatsBuilder.createWithExitKibibytesReadLine(
"exit-kibibytes-read other=2282907805");
}
- @Test()
+ @Test
public void testExitStatsStreamsTooLarge()
throws DescriptorParseException {
ExitStatsBuilder.createWithExitStreamsOpenedLine(
"exit-streams-opened 25=2147483648");
}
- @Test()
+ @Test
public void testExitStatsStreamsExtraArg() throws DescriptorParseException {
ExitStatsBuilder.createWithExitStreamsOpenedLine(
"exit-streams-opened 25=21474 3648");
}
- @Test()
+ @Test
public void testBridgeStatsValid() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = BridgeStatsBuilder
.createWithDefaultLines();
@@ -1861,7 +1861,7 @@ public class ExtraInfoDescriptorImplTest {
+ "2012-02-11 01:59:39 (0 s)");
}
- @Test()
+ @Test
public void testBridgeStatsEndExtraArg()
throws DescriptorParseException {
BridgeStatsBuilder.createWithBridgeStatsEndLine("bridge-stats-end "
@@ -1889,7 +1889,7 @@ public class ExtraInfoDescriptorImplTest {
0x69, 0x70, 0x73 }, false); // "ips" (no newline)
}
- @Test()
+ @Test
public void testBridgeIpsExtraArg()
throws DescriptorParseException {
BridgeStatsBuilder.createWithBridgeIpsLine("bridge-ips ir=24 5");
@@ -1905,7 +1905,7 @@ public class ExtraInfoDescriptorImplTest {
"bridge-ip-versions v4=24.5");
}
- @Test()
+ @Test
public void testBridgeIpVersionsExtraArg()
throws DescriptorParseException {
BridgeStatsBuilder.createWithBridgeIpVersionsLine(
@@ -1922,21 +1922,21 @@ public class ExtraInfoDescriptorImplTest {
"bridge-ip-transports obfs2=24.5");
}
- @Test()
+ @Test
public void testBridgeIpTransportsUnderscore()
throws DescriptorParseException {
BridgeStatsBuilder.createWithBridgeIpTransportsLine(
"bridge-ip-transports meek=32,obfs3_websocket=8,websocket=64");
}
- @Test()
+ @Test
public void testBridgeIpTransportsExtraArg()
throws DescriptorParseException {
BridgeStatsBuilder.createWithBridgeIpTransportsLine(
"bridge-ip-transports obfs2=24 5");
}
- @Test()
+ @Test
public void testPaddingCountsValid()
throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
@@ -1953,7 +1953,7 @@ public class ExtraInfoDescriptorImplTest {
0L, 0L, 0L, 0L, 0L});
}
- @Test()
+ @Test
public void testPaddingOtherCountsValid()
throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
@@ -1981,7 +1981,7 @@ public class ExtraInfoDescriptorImplTest {
}
}
- @Test()
+ @Test
public void testPaddingCountsValidFutureProof()
throws DescriptorParseException {
ExtraInfoDescriptor descriptor = DescriptorBuilder
@@ -2007,7 +2007,7 @@ public class ExtraInfoDescriptorImplTest {
+ "(86400 s) bin-size=10000 write-drop=10000");
}
- @Test()
+ @Test
public void testPaddingCountsNoInterval() throws DescriptorParseException {
this.thrown.expect(DescriptorParseException.class);
this.thrown.expectMessage(Matchers
@@ -2018,7 +2018,7 @@ public class ExtraInfoDescriptorImplTest {
+ "01:48:43 bin-size=10000 write-drop=10000");
}
- @Test()
+ @Test
public void testPaddingCountsNoKey() throws DescriptorParseException {
this.thrown.expect(DescriptorParseException.class);
this.thrown.expectMessage(Matchers
@@ -2028,7 +2028,7 @@ public class ExtraInfoDescriptorImplTest {
+ "01:48:43 (86400 s) write-total=9 write-drop=10000 =7 x=8");
}
- @Test()
+ @Test
public void testPaddingCountsNoValue() throws DescriptorParseException {
this.thrown.expect(DescriptorParseException.class);
this.thrown.expectMessage(Matchers
@@ -2038,7 +2038,7 @@ public class ExtraInfoDescriptorImplTest {
+ "01:48:43 (86400 s) write-total=7 write-drop= bin-size=10000 ");
}
- @Test()
+ @Test
public void testPaddingCountsKeyRepeated() throws DescriptorParseException {
this.thrown.expect(DescriptorParseException.class);
this.thrown.expectMessage(Matchers
@@ -2048,7 +2048,7 @@ public class ExtraInfoDescriptorImplTest {
+ "01:48:43 (86400 s) a=1 b=2 a=3 b=4");
}
- @Test()
+ @Test
public void testPaddingCountsCommaSeparatedList()
throws DescriptorParseException {
this.thrown.expect(DescriptorParseException.class);
@@ -2059,7 +2059,7 @@ public class ExtraInfoDescriptorImplTest {
+ "01:48:43 (86400 s) bin-size=10000,write-drop=10000");
}
- @Test()
+ @Test
public void testPaddingCountsNoList() throws DescriptorParseException {
this.thrown.expect(DescriptorParseException.class);
this.thrown.expectMessage(Matchers
@@ -2069,7 +2069,7 @@ public class ExtraInfoDescriptorImplTest {
+ "(86400 s)");
}
- @Test()
+ @Test
public void testHidservStatsValid() throws DescriptorParseException {
ExtraInfoDescriptor descriptor = HidservStatsBuilder
.createWithDefaultLines();
@@ -2097,7 +2097,7 @@ public class ExtraInfoDescriptorImplTest {
assertTrue(params.isEmpty());
}
- @Test()
+ @Test
public void testHidservStatsEndLineMissing()
throws DescriptorParseException {
ExtraInfoDescriptor descriptor =
@@ -2106,7 +2106,7 @@ public class ExtraInfoDescriptorImplTest {
assertEquals(-1L, descriptor.getHidservStatsIntervalLength());
}
- @Test()
+ @Test
public void testHidservRendRelayedCellsNoParams()
throws DescriptorParseException {
ExtraInfoDescriptor descriptor =
@@ -2140,7 +2140,7 @@ public class ExtraInfoDescriptorImplTest {
"hidserv-dir-onions-seen -3 delta_f=A epsilon=B bin_size=C");
}
- @Test()
+ @Test
public void testHidservDirOnionsSeenExtraArg()
throws DescriptorParseException {
HidservStatsBuilder.createWithHidservDirOnionsSeenLine(
@@ -2170,7 +2170,7 @@ public class ExtraInfoDescriptorImplTest {
DescriptorBuilder.createWithUnrecognizedLine(unrecognizedLine, true);
}
- @Test()
+ @Test
public void testUnrecognizedLineIgnore()
throws DescriptorParseException {
String unrecognizedLine = "unrecognized-line 1";
@@ -2197,7 +2197,7 @@ public class ExtraInfoDescriptorImplTest {
"router-sig-ed25519 y7WF9T2GFwkSDPZEhB55HgquIFOl5uXUFMYJPq3CXXUTKeJ"
+ "kSrtaZUB5s34fWdHQNtl84mH4dVaFMunHnwgYAw";
- @Test()
+ @Test
public void testEd25519() throws DescriptorParseException {
ExtraInfoDescriptor descriptor =
DescriptorBuilder.createWithEd25519Lines(IDENTITY_ED25519_LINES,
@@ -2224,7 +2224,7 @@ public class ExtraInfoDescriptorImplTest {
ROUTER_SIG_ED25519_LINE);
}
- @Test()
+ @Test
public void testEd25519IdentityMissing()
throws DescriptorParseException {
DescriptorBuilder.createWithEd25519Lines(null,
@@ -2253,7 +2253,7 @@ public class ExtraInfoDescriptorImplTest {
MASTER_KEY_ED25519_LINE, ROUTER_SIG_ED25519_LINE);
}
- @Test()
+ @Test
public void testEd25519MasterKeyMissing()
throws DescriptorParseException {
ExtraInfoDescriptor descriptor =
@@ -2275,7 +2275,7 @@ public class ExtraInfoDescriptorImplTest {
ROUTER_SIG_ED25519_LINE);
}
- @Test()
+ @Test
public void testEd25519RouterSigMissing()
throws DescriptorParseException {
DescriptorBuilder.createWithEd25519Lines(IDENTITY_ED25519_LINES,
@@ -2304,7 +2304,7 @@ public class ExtraInfoDescriptorImplTest {
+ "\nunrecognized-line 1");
}
- @Test()
+ @Test
public void testExtraInfoDigestSha256Relay()
throws DescriptorParseException {
byte[] descriptorBytes = ("extra-info Unnamed "
@@ -2337,7 +2337,7 @@ public class ExtraInfoDescriptorImplTest {
descriptor.getDigestSha256Base64());
}
- @Test()
+ @Test
public void testExtraInfoDigestSha256Bridge()
throws DescriptorParseException {
byte[] descriptorBytes = ("extra-info idideditheconfig "
@@ -2362,7 +2362,7 @@ public class ExtraInfoDescriptorImplTest {
descriptor.getDigestSha256Base64());
}
- @Test()
+ @Test
public void testExtraInfoDigestsNoRouterDigestLines()
throws DescriptorParseException {
byte[] descriptorBytes = ("extra-info idideditheconfig "
diff --git a/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java
index 7167de9..b1d6474 100644
--- a/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java
+++ b/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java
@@ -71,7 +71,7 @@ public class MicrodescriptorImplTest {
}
}
- @Test()
+ @Test
public void testDefaults() throws DescriptorParseException {
Microdescriptor micro = DescriptorBuilder.createWithDefaultLines();
assertEquals("ER1AC4KqT//o3pJDrqlmej5G2qW1EQYEr/IrMQHNc6I",
diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java
index dcd3663..90128c2 100644
--- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java
+++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java
@@ -352,7 +352,7 @@ public class RelayNetworkStatusConsensusImplTest {
}
}
- @Test()
+ @Test
public void testSampleConsensus() throws DescriptorParseException {
ConsensusBuilder cb = new ConsensusBuilder();
RelayNetworkStatusConsensus consensus = cb.buildConsensus(true);
@@ -424,7 +424,7 @@ public class RelayNetworkStatusConsensusImplTest {
"network-status-version 3\n ");
}
- @Test()
+ @Test
public void testNetworkStatusVersionPrefixLineAtChar()
throws DescriptorParseException {
ConsensusBuilder.createWithNetworkStatusVersionLine(
@@ -532,7 +532,7 @@ public class RelayNetworkStatusConsensusImplTest {
ConsensusBuilder.createWithVoteStatusLine("vote-status ");
}
- @Test()
+ @Test
public void testVoteStatusConsensusOneSpace()
throws DescriptorParseException {
ConsensusBuilder.createWithVoteStatusLine("vote-status consensus ");
@@ -736,7 +736,7 @@ public class RelayNetworkStatusConsensusImplTest {
ConsensusBuilder.createWithVotingDelayLine("voting-delay one two");
}
- @Test()
+ @Test
public void testClientServerVersionsNoLine()
throws DescriptorParseException {
ConsensusBuilder cb = new ConsensusBuilder();
@@ -747,7 +747,7 @@ public class RelayNetworkStatusConsensusImplTest {
assertNull(consensus.getRecommendedServerVersions());
}
- @Test()
+ @Test
public void testServerVersionsNoLine() throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
ConsensusBuilder.createWithServerVersionsLine(null);
@@ -755,7 +755,7 @@ public class RelayNetworkStatusConsensusImplTest {
assertNull(consensus.getRecommendedServerVersions());
}
- @Test()
+ @Test
public void testClientVersionsNoLine() throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
ConsensusBuilder.createWithClientVersionsLine(null);
@@ -763,7 +763,7 @@ public class RelayNetworkStatusConsensusImplTest {
assertNotNull(consensus.getRecommendedServerVersions());
}
- @Test()
+ @Test
public void testClientVersionsNoSpace()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
@@ -772,7 +772,7 @@ public class RelayNetworkStatusConsensusImplTest {
assertTrue(consensus.getRecommendedClientVersions().isEmpty());
}
- @Test()
+ @Test
public void testClientVersionsOneSpace()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
@@ -798,7 +798,7 @@ public class RelayNetworkStatusConsensusImplTest {
"client-versions ,0.2.2.34");
}
- @Test()
+ @Test
public void testRecommendedClientProtocols123()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus = ConsensusBuilder
@@ -808,7 +808,7 @@ public class RelayNetworkStatusConsensusImplTest {
consensus.getRecommendedClientProtocols().get("Cons"));
}
- @Test()
+ @Test
public void testRecommendedRelayProtocols134()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus = ConsensusBuilder
@@ -818,7 +818,7 @@ public class RelayNetworkStatusConsensusImplTest {
consensus.getRecommendedRelayProtocols().get("Cons"));
}
- @Test()
+ @Test
public void testRequiredClientProtocols1425()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus = ConsensusBuilder
@@ -829,7 +829,7 @@ public class RelayNetworkStatusConsensusImplTest {
consensus.getRequiredClientProtocols().get("Cons"));
}
- @Test()
+ @Test
public void testRequiredRelayProtocols1111()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus = ConsensusBuilder
@@ -849,14 +849,14 @@ public class RelayNetworkStatusConsensusImplTest {
"required-relay-protocols Cons=1\nrequired-relay-protocols Cons=1");
}
- @Test()
+ @Test
public void testPackageNone() throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
ConsensusBuilder.createWithPackageLines(null);
assertNull(consensus.getPackageLines());
}
- @Test()
+ @Test
public void testPackageOne() throws DescriptorParseException {
String packageLine = "package shouldbesecond 0 http digest=digest";
RelayNetworkStatusConsensus consensus =
@@ -865,7 +865,7 @@ public class RelayNetworkStatusConsensusImplTest {
consensus.getPackageLines().get(0));
}
- @Test()
+ @Test
public void testPackageTwo() throws DescriptorParseException {
List<String> packageLines = Arrays.asList(
"package shouldbesecond 0 http digest=digest",
@@ -910,14 +910,14 @@ public class RelayNetworkStatusConsensusImplTest {
ConsensusBuilder.createWithKnownFlagsLine("known-flags ");
}
- @Test()
+ @Test
public void testParamsNoLine() throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
ConsensusBuilder.createWithParamsLine(null);
assertNull(consensus.getConsensusParams());
}
- @Test()
+ @Test
public void testParamsNoSpace() throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
ConsensusBuilder.createWithParamsLine("params");
@@ -925,7 +925,7 @@ public class RelayNetworkStatusConsensusImplTest {
assertTrue(consensus.getConsensusParams().isEmpty());
}
- @Test()
+ @Test
public void testParamsOneSpace() throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
ConsensusBuilder.createWithParamsLine("params ");
@@ -933,7 +933,7 @@ public class RelayNetworkStatusConsensusImplTest {
assertTrue(consensus.getConsensusParams().isEmpty());
}
- @Test()
+ @Test
public void testParamsThreeSpaces() throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
ConsensusBuilder.createWithParamsLine("params ");
@@ -958,7 +958,7 @@ public class RelayNetworkStatusConsensusImplTest {
ConsensusBuilder.createWithParamsLine("params min=-2147483649");
}
- @Test()
+ @Test
public void testParamsLargestNegative()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
@@ -968,7 +968,7 @@ public class RelayNetworkStatusConsensusImplTest {
(int) consensus.getConsensusParams().get("min"));
}
- @Test()
+ @Test
public void testParamsLargestPositive()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
@@ -1008,7 +1008,7 @@ public class RelayNetworkStatusConsensusImplTest {
+ "D88plxd8YeLfCIVAR9gjiFlWB1WqpC53kWr350o1pzw= -1.0");
}
- @Test()
+ @Test
public void testDirSourceLegacyNickname()
throws DescriptorParseException {
DirSourceBuilder dsb = new DirSourceBuilder();
@@ -1121,7 +1121,7 @@ public class RelayNetworkStatusConsensusImplTest {
DirSourceBuilder.createWithOrPort("onions");
}
- @Test()
+ @Test
public void testDirSourceContactNoLine()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
@@ -1130,7 +1130,7 @@ public class RelayNetworkStatusConsensusImplTest {
"ED03BB616EB2F60BEC80151114BB25CEF515B226").getContactLine());
}
- @Test()
+ @Test
public void testDirSourceContactLineNoSpace()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
@@ -1139,7 +1139,7 @@ public class RelayNetworkStatusConsensusImplTest {
"ED03BB616EB2F60BEC80151114BB25CEF515B226").getContactLine());
}
- @Test()
+ @Test
public void testDirSourceContactLineOneSpace()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
@@ -1338,7 +1338,7 @@ public class RelayNetworkStatusConsensusImplTest {
StatusEntryBuilder.createWithDirPort("zero");
}
- @Test()
+ @Test
public void testSLineNoSpace() throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
StatusEntryBuilder.createWithSLine("s");
@@ -1346,7 +1346,7 @@ public class RelayNetworkStatusConsensusImplTest {
"00343A8024F70E214728F0C5AF7ACE0C1508F073").getFlags().isEmpty());
}
- @Test()
+ @Test
public void testSLineOneSpace() throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
StatusEntryBuilder.createWithSLine("s ");
@@ -1390,7 +1390,7 @@ public class RelayNetworkStatusConsensusImplTest {
StatusEntryBuilder.createWithWLine("w ");
}
- @Test()
+ @Test
public void testWLineWarpSeven() throws DescriptorParseException {
StatusEntryBuilder.createWithWLine("w Warp=7");
}
@@ -1406,7 +1406,7 @@ public class RelayNetworkStatusConsensusImplTest {
cb.buildConsensus(true);
}
- @Test()
+ @Test
public void testWLineUnmeasured() throws DescriptorParseException {
StatusEntryBuilder sb = new StatusEntryBuilder();
sb.wLine = "w Bandwidth=42424242 Unmeasured=1";
@@ -1420,7 +1420,7 @@ public class RelayNetworkStatusConsensusImplTest {
}
}
- @Test()
+ @Test
public void testWLineNotUnmeasured() throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
StatusEntryBuilder.createWithWLine("w Bandwidth=20");
@@ -1468,7 +1468,7 @@ public class RelayNetworkStatusConsensusImplTest {
cb.buildConsensus(true);
}
- @Test()
+ @Test
public void testNoStatusEntries() throws DescriptorParseException {
ConsensusBuilder cb = new ConsensusBuilder();
cb.statusEntries.clear();
@@ -1490,7 +1490,7 @@ public class RelayNetworkStatusConsensusImplTest {
ConsensusBuilder.createWithDirectoryFooterLine(null);
}
- @Test()
+ @Test
public void testDirectoryFooterMissing()
throws DescriptorParseException {
ConsensusBuilder cb = new ConsensusBuilder();
@@ -1502,13 +1502,13 @@ public class RelayNetworkStatusConsensusImplTest {
assertNull(consensus.getBandwidthWeights());
}
- @Test()
+ @Test
public void testDirectoryFooterLineSpace()
throws DescriptorParseException {
ConsensusBuilder.createWithDirectoryFooterLine("directory-footer ");
}
- @Test()
+ @Test
public void testBandwidthWeightsNoLine()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus =
@@ -1516,7 +1516,7 @@ public class RelayNetworkStatusConsensusImplTest {
assertNull(consensus.getBandwidthWeights());
}
- @Test()
+ @Test
public void testBandwidthWeightsLineNoSpace()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus = ConsensusBuilder
@@ -1524,7 +1524,7 @@ public class RelayNetworkStatusConsensusImplTest {
assertNotNull(consensus.getBandwidthWeights());
}
- @Test()
+ @Test
public void testBandwidthWeightsLineOneSpace()
throws DescriptorParseException {
RelayNetworkStatusConsensus consensus = ConsensusBuilder
@@ -1551,7 +1551,7 @@ public class RelayNetworkStatusConsensusImplTest {
DirectorySignatureBuilder.createWithIdentity("ED03BB616EB2F60");
}
- @Test()
+ @Test
public void testDirectorySignatureIdentityTooLong()
throws DescriptorParseException {
/* This hex string has an unusual length of 58 hex characters, but
@@ -1562,7 +1562,7 @@ public class RelayNetworkStatusConsensusImplTest {
"ED03BB616EB2F60BEC80151114BB25CEF515B226ED03BB616EB2F60BEC");
}
- @Test()
+ @Test
public void testDirectorySignatureSigningKeyTooShort()
throws DescriptorParseException {
/* See above, we accept this hex string even though it's unusually
@@ -1581,7 +1581,7 @@ public class RelayNetworkStatusConsensusImplTest {
DirectorySignatureBuilder.createWithSigningKey("845");
}
- @Test()
+ @Test
public void testDirectorySignatureSigningKeyTooLong()
throws DescriptorParseException {
/* See above, we accept this hex string even though it's unusually
@@ -1627,7 +1627,7 @@ public class RelayNetworkStatusConsensusImplTest {
true);
}
- @Test()
+ @Test
public void testUnrecognizedHeaderLineIgnore()
throws DescriptorParseException {
String unrecognizedLine = "unrecognized-line 1";
@@ -1649,7 +1649,7 @@ public class RelayNetworkStatusConsensusImplTest {
true);
}
- @Test()
+ @Test
public void testUnrecognizedDirSourceLineIgnore()
throws DescriptorParseException {
String unrecognizedLine = "unrecognized-line 1";
@@ -1671,7 +1671,7 @@ public class RelayNetworkStatusConsensusImplTest {
unrecognizedLine, true);
}
- @Test()
+ @Test
public void testUnrecognizedStatusEntryLineIgnore()
throws DescriptorParseException {
String unrecognizedLine = "unrecognized-line 1";
@@ -1693,7 +1693,7 @@ public class RelayNetworkStatusConsensusImplTest {
true);
}
- @Test()
+ @Test
public void testUnrecognizedDirectoryFooterLineIgnore()
throws DescriptorParseException {
String unrecognizedLine = "unrecognized-line 1";
@@ -1715,7 +1715,7 @@ public class RelayNetworkStatusConsensusImplTest {
unrecognizedLine, true);
}
- @Test()
+ @Test
public void testUnrecognizedDirectorySignatureLineIgnore()
throws DescriptorParseException {
String unrecognizedLine = "unrecognized-line 1";
diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java
index efca978..e69a26b 100644
--- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java
+++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java
@@ -52,7 +52,7 @@ public class RelayNetworkStatusImplTest {
true);
}
- @Test()
+ @Test
public void testValidHeader() throws DescriptorParseException {
byte[] statusBytes = validStatus.getBytes();
RelayNetworkStatusImpl rnsi = new RelayNetworkStatusImpl(statusBytes,
diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java
index 1997c46..1152626 100644
--- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java
+++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java
@@ -700,7 +700,7 @@ public class RelayNetworkStatusVoteImplTest {
}
}
- @Test()
+ @Test
public void testSampleVote() throws DescriptorParseException {
VoteBuilder vb = new VoteBuilder();
RelayNetworkStatusVote vote = vb.buildVote(true);
@@ -777,7 +777,7 @@ public class RelayNetworkStatusVoteImplTest {
"network-status-version 3\n ");
}
- @Test()
+ @Test
public void testNetworkStatusVersionPrefixLineAtChar()
throws DescriptorParseException {
VoteBuilder.createWithNetworkStatusVersionLine(
@@ -883,7 +883,7 @@ public class RelayNetworkStatusVoteImplTest {
VoteBuilder.createWithVoteStatusLine("vote-status ");
}
- @Test()
+ @Test
public void testVoteStatusVoteOneSpace()
throws DescriptorParseException {
VoteBuilder.createWithVoteStatusLine("vote-status vote ");
@@ -907,7 +907,7 @@ public class RelayNetworkStatusVoteImplTest {
"vote-status TheMagicVoteStatus");
}
- @Test()
+ @Test
public void testConsensusMethodNoLine()
throws DescriptorParseException {
RelayNetworkStatusVote vote =
@@ -1121,7 +1121,7 @@ public class RelayNetworkStatusVoteImplTest {
"recommended-client-protocols Cons=2-1");
}
- @Test()
+ @Test
public void testRecommendedRelayProtocols0()
throws DescriptorParseException {
RelayNetworkStatusVote vote =
@@ -1151,14 +1151,14 @@ public class RelayNetworkStatusVoteImplTest {
"recommended-client-protocols Cons=-1");
}
- @Test()
+ @Test
public void testPackageNone() throws DescriptorParseException {
RelayNetworkStatusVote vote =
VoteBuilder.createWithPackageLines(null);
assertNull(vote.getPackageLines());
}
- @Test()
+ @Test
public void testPackageOne() throws DescriptorParseException {
String packageLine = "package shouldbesecond 0 http digest=digest";
RelayNetworkStatusVote vote =
@@ -1167,7 +1167,7 @@ public class RelayNetworkStatusVoteImplTest {
vote.getPackageLines().get(0));
}
- @Test()
+ @Test
public void testPackageTwo() throws DescriptorParseException {
List<String> packageLines = Arrays.asList(
"package shouldbesecond 0 http digest=digest",
@@ -1212,7 +1212,7 @@ public class RelayNetworkStatusVoteImplTest {
VoteBuilder.createWithKnownFlagsLine("known-flags ");
}
- @Test()
+ @Test
public void testFlagThresholdsLine() throws DescriptorParseException {
VoteBuilder vb = new VoteBuilder();
RelayNetworkStatusVote vote = vb.buildVote(true);
@@ -1226,7 +1226,7 @@ public class RelayNetworkStatusVoteImplTest {
assertEquals(1, vote.getEnoughMtbfInfo());
}
- @Test()
+ @Test
public void testFlagThresholdsNoLine() throws DescriptorParseException {
RelayNetworkStatusVote vote =
VoteBuilder.createWithFlagThresholdsLine(null);
@@ -1240,7 +1240,7 @@ public class RelayNetworkStatusVoteImplTest {
assertEquals(-1, vote.getEnoughMtbfInfo());
}
- @Test()
+ @Test
public void testFlagThresholdsAllZeroes()
throws DescriptorParseException {
RelayNetworkStatusVote vote =
@@ -1320,7 +1320,7 @@ public class RelayNetworkStatusVoteImplTest {
+ "208.83.223.34 443 80");
}
- @Test()
+ @Test
public void testFingerprintLowerCase() throws DescriptorParseException {
VoteBuilder.createWithDirSourceLine("dir-source urras "
+ "80550987e1d626e3eba5e5e75a458de0626d088c 208.83.223.34 "
@@ -1371,7 +1371,7 @@ public class RelayNetworkStatusVoteImplTest {
+ " 208.83.223.34 208.83.223.34 443 80");
}
- @Test()
+ @Test
public void testHostname256()
throws DescriptorParseException {
/* This test doesn't fail, because we're not parsing the hostname. */
@@ -1442,7 +1442,7 @@ public class RelayNetworkStatusVoteImplTest {
+ "208.83.223.34 four-four-three 80");
}
- @Test()
+ @Test
public void testDirPort0() throws DescriptorParseException {
/* This test doesn't fail, because we're accepting DirPort 0, even
* though it doesn't make sense from Tor's view. */
@@ -1461,7 +1461,7 @@ public class RelayNetworkStatusVoteImplTest {
+ "208.83.223.34 443 ");
}
- @Test()
+ @Test
public void testDirPortOrPortIdentical()
throws DescriptorParseException {
/* This test doesn't fail, even though identical OR and Dir port don't
@@ -1493,7 +1493,7 @@ public class RelayNetworkStatusVoteImplTest {
+ "208.83.223.34 443 80");
}
- @Test()
+ @Test
public void testContactLineMissing()
throws DescriptorParseException {
VoteBuilder.createWithContactLine(null);
@@ -1530,7 +1530,7 @@ public class RelayNetworkStatusVoteImplTest {
"shared-rand-participate 1");
}
- @Test()
+ @Test
public void testSharedRandCommitLinesEmpty() throws DescriptorParseException {
RelayNetworkStatusVote vote =
VoteBuilder.createWithSharedRandCommitLines(null);
@@ -1559,7 +1559,7 @@ public class RelayNetworkStatusVoteImplTest {
+ "D88plxd8YeLfCIVAR9gjiFlWB1WqpC53kWr350o1pzw=");
}
- @Test()
+ @Test
public void testLegacyDirKeyLine() throws DescriptorParseException {
RelayNetworkStatusVote vote = VoteBuilder.createWithLegacyDirKeyLine(
"legacy-dir-key 81349FC1F2DBA2C2C11B45CB9706637D480AB913");
@@ -1710,7 +1710,7 @@ public class RelayNetworkStatusVoteImplTest {
VoteBuilder.createWithDirSigningKeyLines(null);
}
- @Test()
+ @Test
public void testDirKeyCrosscertLinesMissing()
throws DescriptorParseException {
VoteBuilder.createWithDirKeyCrosscertLines(null);
@@ -1725,7 +1725,7 @@ public class RelayNetworkStatusVoteImplTest {
VoteBuilder.createWithDirKeyCertificationLines(null);
}
- @Test()
+ @Test
public void testDirectoryFooterLineMissing()
throws DescriptorParseException {
VoteBuilder.createWithDirectoryFooterLine(null);
@@ -1740,7 +1740,7 @@ public class RelayNetworkStatusVoteImplTest {
VoteBuilder.createWithDirectorySignatureLines(null);
}
- @Test()
+ @Test
public void testDirectorySignaturesLinesTwoAlgorithms()
throws DescriptorParseException {
String identitySha256 = "32519E5CB7254AB5A94CC9925EC7676E53D5D52EEAB7"
@@ -1785,7 +1785,7 @@ public class RelayNetworkStatusVoteImplTest {
vote.getDigestSha1Hex());
}
- @Test()
+ @Test
public void testDirectorySignaturesLinesTwoAlgorithmsSameDigests()
throws DescriptorParseException {
String signaturesLines = "directory-signature 00 00\n"
@@ -1807,7 +1807,7 @@ public class RelayNetworkStatusVoteImplTest {
VoteBuilder.createWithUnrecognizedHeaderLine(unrecognizedLine, true);
}
- @Test()
+ @Test
public void testUnrecognizedHeaderLineIgnore()
throws DescriptorParseException {
String unrecognizedLine = "unrecognized-line 1";
@@ -1829,7 +1829,7 @@ public class RelayNetworkStatusVoteImplTest {
true);
}
- @Test()
+ @Test
public void testUnrecognizedDirSourceLineIgnore()
throws DescriptorParseException {
String unrecognizedLine = "unrecognized-line 1";
@@ -1850,7 +1850,7 @@ public class RelayNetworkStatusVoteImplTest {
VoteBuilder.createWithUnrecognizedFooterLine(unrecognizedLine, true);
}
- @Test()
+ @Test
public void testUnrecognizedFooterLineIgnore()
throws DescriptorParseException {
String unrecognizedLine = "unrecognized-line 1";
@@ -1861,7 +1861,7 @@ public class RelayNetworkStatusVoteImplTest {
assertEquals(unrecognizedLines, vote.getUnrecognizedLines());
}
- @Test()
+ @Test
public void testIdEd25519MasterKey()
throws DescriptorParseException {
String masterKey25519 = "8RH34kO07Pp+XYwzdoATVyCibIvmbslUjRkAm7J4IA8";
@@ -1877,7 +1877,7 @@ public class RelayNetworkStatusVoteImplTest {
vote.getStatusEntry(fingerprint).getMasterKeyEd25519());
}
- @Test()
+ @Test
public void testIdEd25519None()
throws DescriptorParseException {
List<String> statusEntries = new ArrayList<>();
diff --git a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java
index 70a25a0..9533de3 100644
--- a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java
+++ b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java
@@ -461,7 +461,7 @@ public class ServerDescriptorImplTest {
}
}
- @Test()
+ @Test
public void testSampleDescriptor() throws DescriptorParseException {
DescriptorBuilder db = new DescriptorBuilder();
ServerDescriptor descriptor = db.buildDescriptor(true);
@@ -513,7 +513,7 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithRouterLine(null);
}
- @Test()
+ @Test
public void testRouterOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithRouterLine("opt router saberrider2008 "
@@ -562,7 +562,7 @@ public class ServerDescriptorImplTest {
+ "saberrider2008ReallyLongNickname 94.134.192.243 9001 0 0");
}
- @Test()
+ @Test
public void testNicknameTwoSpaces() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithRouterLine("router saberrider2008 "
@@ -643,14 +643,14 @@ public class ServerDescriptorImplTest {
+ "94.134.192.243 9001 0 ");
}
- @Test()
+ @Test
public void testPlatformMissing() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithPlatformLine(null);
assertNull(descriptor.getPlatform());
}
- @Test()
+ @Test
public void testPlatformOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithPlatformLine("opt platform Tor 0.2.2.35 "
@@ -659,21 +659,21 @@ public class ServerDescriptorImplTest {
descriptor.getPlatform());
}
- @Test()
+ @Test
public void testPlatformNoSpace() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithPlatformLine("platform");
assertEquals("", descriptor.getPlatform());
}
- @Test()
+ @Test
public void testPlatformSpace() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithPlatformLine("platform ");
assertEquals("", descriptor.getPlatform());
}
- @Test()
+ @Test
public void testProtocolsOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithProtocolsLine("opt protocols Link 1 2 Circuit 1");
@@ -683,7 +683,7 @@ public class ServerDescriptorImplTest {
descriptor.getCircuitProtocolVersions());
}
- @Test()
+ @Test
public void testProtocolsNoOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithProtocolsLine("protocols Link 1 2 Circuit 1");
@@ -710,7 +710,7 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithProtocolsLine("opt protocols Link 1 2");
}
- @Test()
+ @Test
public void testProtoGreenPurple() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithProtoLine("proto Green=23 Purple=42");
@@ -735,7 +735,7 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithPublishedLine(null);
}
- @Test()
+ @Test
public void testPublishedOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithPublishedLine("opt published 2012-01-01 04:03:19");
@@ -777,14 +777,14 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithPublishedLine("published 2012-01-01");
}
- @Test()
+ @Test
public void testPublishedMillis() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithPublishedLine("opt published 2012-01-01 04:03:19.123");
assertEquals(1325390599000L, descriptor.getPublishedMillis());
}
- @Test()
+ @Test
public void testFingerprintNoOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithFingerprintLine("fingerprint D873 3048 FC8E C910 2466 "
@@ -829,14 +829,14 @@ public class ServerDescriptorImplTest {
+ "D8733048FC8EC9102466AD8F3098622BF1BF71FD");
}
- @Test()
+ @Test
public void testUptimeMissing() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithUptimeLine(null);
assertNull(descriptor.getUptime());
}
- @Test()
+ @Test
public void testUptimeOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithUptimeLine("opt uptime 48");
@@ -850,7 +850,7 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithUptimeLine("uptime fourty-eight");
}
- @Test()
+ @Test
public void testUptimeMinusOne() throws DescriptorParseException {
DescriptorBuilder.createWithUptimeLine("uptime -1");
}
@@ -876,7 +876,7 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithUptimeLine("uptime 4 8");
}
- @Test()
+ @Test
public void testBandwidthOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithBandwidthLine("opt bandwidth 51200 51200 53470");
@@ -901,7 +901,7 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithBandwidthLine("bandwidth 51200");
}
- @Test()
+ @Test
public void testBandwidthTwoValues() throws DescriptorParseException {
/* This is allowed, because Tor versions 0.0.8 and older only wrote
* bandwidth lines with rate and burst values, but no observed
@@ -930,7 +930,7 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithBandwidthLine("bandwidth -1 -2 -3");
}
- @Test()
+ @Test
public void testExtraInfoDigestNoOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithExtraInfoDigestLine("extra-info-digest "
@@ -969,7 +969,7 @@ public class ServerDescriptorImplTest {
+ "1469D1550738A25B1E7B47CDDBCD7B2899F51B741469");
}
- @Test()
+ @Test
public void testExtraInfoDigestMissing()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -977,7 +977,7 @@ public class ServerDescriptorImplTest {
assertNull(descriptor.getExtraInfoDigestSha1Hex());
}
- @Test()
+ @Test
public void testExtraInfoDigestAdditionalDigest()
throws DescriptorParseException {
String extraInfoDigest = "0879DB7B765218D7B3AE7557669D20307BB21CAA";
@@ -990,7 +990,7 @@ public class ServerDescriptorImplTest {
assertEquals(extraInfoDigest, descriptor.getExtraInfoDigestSha1Hex());
}
- @Test()
+ @Test
public void testOnionKeyOpt() throws DescriptorParseException {
DescriptorBuilder.createWithOnionKeyLines("opt onion-key\n"
+ "-----BEGIN RSA PUBLIC KEY-----\n"
@@ -1001,7 +1001,7 @@ public class ServerDescriptorImplTest {
+ "-----END RSA PUBLIC KEY-----");
}
- @Test()
+ @Test
public void testSigningKeyOpt() throws DescriptorParseException {
DescriptorBuilder.createWithSigningKeyLines("opt signing-key\n"
+ "-----BEGIN RSA PUBLIC KEY-----\n"
@@ -1012,7 +1012,7 @@ public class ServerDescriptorImplTest {
+ "-----END RSA PUBLIC KEY-----");
}
- @Test()
+ @Test
public void testHiddenServiceDirMissing()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1020,7 +1020,7 @@ public class ServerDescriptorImplTest {
assertNull(descriptor.getHiddenServiceDirVersions());
}
- @Test()
+ @Test
public void testHiddenServiceDirNoOpt()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1029,7 +1029,7 @@ public class ServerDescriptorImplTest {
descriptor.getHiddenServiceDirVersions());
}
- @Test()
+ @Test
public void testHiddenServiceDirVersions2And3()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1038,14 +1038,14 @@ public class ServerDescriptorImplTest {
descriptor.getHiddenServiceDirVersions());
}
- @Test()
+ @Test
public void testContactMissing() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithContactLine(null);
assertNull(descriptor.getContact());
}
- @Test()
+ @Test
public void testContactOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithContactLine("opt contact Random Person");
@@ -1061,14 +1061,14 @@ public class ServerDescriptorImplTest {
+ "Person\ncontact Random Person");
}
- @Test()
+ @Test
public void testContactNoSpace() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithContactLine("contact");
assertEquals("", descriptor.getContact());
}
- @Test()
+ @Test
public void testContactCarriageReturn()
throws DescriptorParseException {
String contactString = "Random "
@@ -1083,7 +1083,7 @@ public class ServerDescriptorImplTest {
assertEquals(contactString, descriptor.getContact());
}
- @Test()
+ @Test
public void testExitPolicyRejectAllAcceptAll()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1092,7 +1092,7 @@ public class ServerDescriptorImplTest {
descriptor.getExitPolicyLines());
}
- @Test()
+ @Test
public void testExitPolicyOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithExitPolicyLines("opt reject *:*");
@@ -1108,7 +1108,7 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithExitPolicyLines("reject *");
}
- @Test()
+ @Test
public void testExitPolicyAccept80RejectAll()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1151,7 +1151,7 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithExitPolicyLines(null);
}
- @Test()
+ @Test
public void testExitPolicyMaskTypes() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithExitPolicyLines("reject 192.168.0.0/16:*\n"
@@ -1185,21 +1185,21 @@ public class ServerDescriptorImplTest {
+ "-----END SIGNATURE-----\ncontact me");
}
- @Test()
+ @Test
public void testHibernatingOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithHibernatingLine("opt hibernating 1");
assertTrue(descriptor.isHibernating());
}
- @Test()
+ @Test
public void testHibernatingFalse() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithHibernatingLine("hibernating 0");
assertFalse(descriptor.isHibernating());
}
- @Test()
+ @Test
public void testHibernatingTrue() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithHibernatingLine("hibernating 1");
@@ -1220,7 +1220,7 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithHibernatingLine("hibernating");
}
- @Test()
+ @Test
public void testFamilyOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithFamilyLine("opt family saberrider2008");
@@ -1228,7 +1228,7 @@ public class ServerDescriptorImplTest {
descriptor.getFamilyEntries());
}
- @Test()
+ @Test
public void testFamilyFingerprint() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithFamilyLine("family "
@@ -1238,7 +1238,7 @@ public class ServerDescriptorImplTest {
descriptor.getFamilyEntries());
}
- @Test()
+ @Test
public void testFamilyNickname() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithFamilyLine("family saberrider2008");
@@ -1273,7 +1273,7 @@ public class ServerDescriptorImplTest {
+ "D8733048FC8EC9102466AD8F3098622BF1BF71FD");
}
- @Test()
+ @Test
public void testFamilyFingerprintNicknameNamed()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1284,7 +1284,7 @@ public class ServerDescriptorImplTest {
descriptor.getFamilyEntries());
}
- @Test()
+ @Test
public void testFamilyFingerprintNicknameUnnamed()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1295,7 +1295,7 @@ public class ServerDescriptorImplTest {
descriptor.getFamilyEntries());
}
- @Test()
+ @Test
public void testWriteHistory() throws DescriptorParseException {
String writeHistoryLine = "write-history 2012-01-01 03:51:44 (900 s) "
+ "4345856,261120,7591936,1748992";
@@ -1316,7 +1316,7 @@ public class ServerDescriptorImplTest {
assertTrue(bandwidthValues.isEmpty());
}
- @Test()
+ @Test
public void testWriteHistoryOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithWriteHistoryLine("opt write-history 2012-01-01 "
@@ -1386,7 +1386,7 @@ public class ServerDescriptorImplTest {
+ "2012-01-01 03:51:44 (900 s) one,two,three");
}
- @Test()
+ @Test
public void testWriteHistoryNoValuesSpace()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1398,7 +1398,7 @@ public class ServerDescriptorImplTest {
.isEmpty());
}
- @Test()
+ @Test
public void testWriteHistoryNoValuesNoSpace()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1419,14 +1419,14 @@ public class ServerDescriptorImplTest {
"write-history 2012-01-01 03:51:44 (900 ");
}
- @Test()
+ @Test
public void testWriteHistoryExtraArg()
throws DescriptorParseException {
DescriptorBuilder.createWithWriteHistoryLine("write-history "
+ "2012-01-01 03:51:44 (900 s) 4345856 bin_size=1024");
}
- @Test()
+ @Test
public void testWriteHistory1800Seconds()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1436,7 +1436,7 @@ public class ServerDescriptorImplTest {
.getIntervalLength());
}
- @Test()
+ @Test
public void testReadHistory() throws DescriptorParseException {
String readHistoryLine = "read-history 2012-01-01 03:51:44 (900 s) "
+ "4268032,139264,7797760,1415168";
@@ -1457,7 +1457,7 @@ public class ServerDescriptorImplTest {
assertTrue(bandwidthValues.isEmpty());
}
- @Test()
+ @Test
public void testReadHistoryTwoSpaces() throws DescriptorParseException {
/* There are some server descriptors from older Tor versions that
* contain "opt read-history " lines. */
@@ -1466,21 +1466,21 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithReadHistoryLine(readHistoryLine);
}
- @Test()
+ @Test
public void testEventdnsOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithEventdnsLine("opt eventdns 1");
assertTrue(descriptor.getUsesEnhancedDnsLogic());
}
- @Test()
+ @Test
public void testEventdns1() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithEventdnsLine("eventdns 1");
assertTrue(descriptor.getUsesEnhancedDnsLogic());
}
- @Test()
+ @Test
public void testEventdns0() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithEventdnsLine("eventdns 0");
@@ -1501,14 +1501,14 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithEventdnsLine("eventdns no");
}
- @Test()
+ @Test
public void testCachesExtraInfoOpt() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithCachesExtraInfoLine("opt caches-extra-info");
assertTrue(descriptor.getCachesExtraInfo());
}
- @Test()
+ @Test
public void testCachesExtraInfoNoSpace()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1524,7 +1524,7 @@ public class ServerDescriptorImplTest {
+ "true");
}
- @Test()
+ @Test
public void testAllowSingleHopExitsOpt()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1532,7 +1532,7 @@ public class ServerDescriptorImplTest {
assertTrue(descriptor.getAllowSingleHopExits());
}
- @Test()
+ @Test
public void testAllowSingleHopExitsNoSpace()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1565,7 +1565,7 @@ public class ServerDescriptorImplTest {
false);
}
- @Test()
+ @Test
public void testIpv6PolicyLine() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithIpv6PolicyLine("ipv6-policy accept 80,1194,1220,1293");
@@ -1615,7 +1615,7 @@ public class ServerDescriptorImplTest {
+ "ipv6-policy accept 80,1194,1220,1293");
}
- @Test()
+ @Test
public void testNtorOnionKeyLine() throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
.createWithNtorOnionKeyLine("ntor-onion-key "
@@ -1624,7 +1624,7 @@ public class ServerDescriptorImplTest {
descriptor.getNtorOnionKey());
}
- @Test()
+ @Test
public void testNtorOnionKeyLineNoPadding()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1663,7 +1663,7 @@ public class ServerDescriptorImplTest {
+ "Y/XgaHcPIJVa4D55kir9QLH8rEYAaLXuv3c3sm8jYhY\n");
}
- @Test()
+ @Test
public void testTunnelledDirServerTrue()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1671,7 +1671,7 @@ public class ServerDescriptorImplTest {
assertTrue(descriptor.getTunnelledDirServer());
}
- @Test()
+ @Test
public void testTunnelledDirServerFalse()
throws DescriptorParseException {
ServerDescriptor descriptor = DescriptorBuilder
@@ -1718,7 +1718,7 @@ public class ServerDescriptorImplTest {
DescriptorBuilder.createWithUnrecognizedLine(unrecognizedLine, true);
}
- @Test()
+ @Test
public void testUnrecognizedLineIgnore()
throws DescriptorParseException {
String unrecognizedLine = "unrecognized-line 1";
@@ -1729,7 +1729,7 @@ public class ServerDescriptorImplTest {
assertEquals(unrecognizedLines, descriptor.getUnrecognizedLines());
}
- @Test()
+ @Test
public void testSomeOtherKey() throws DescriptorParseException {
List<String> unrecognizedLines = new ArrayList<>();
unrecognizedLines.add("some-other-key");
@@ -1750,7 +1750,7 @@ public class ServerDescriptorImplTest {
assertEquals(unrecognizedLines, descriptor.getUnrecognizedLines());
}
- @Test()
+ @Test
public void testUnrecognizedCryptoBlockNoKeyword()
throws DescriptorParseException {
List<String> unrecognizedLines = new ArrayList<>();
@@ -1787,7 +1787,7 @@ public class ServerDescriptorImplTest {
"router-sig-ed25519 y7WF9T2GFwkSDPZEhB55HgquIFOl5uXUFMYJPq3CXXUTKeJ"
+ "kSrtaZUB5s34fWdHQNtl84mH4dVaFMunHnwgYAw";
- @Test()
+ @Test
public void testEd25519() throws DescriptorParseException {
ServerDescriptor descriptor =
DescriptorBuilder.createWithEd25519Lines(IDENTITY_ED25519_LINES,
@@ -1814,7 +1814,7 @@ public class ServerDescriptorImplTest {
ROUTER_SIG_ED25519_LINE);
}
- @Test()
+ @Test
public void testEd25519IdentityMissing()
throws DescriptorParseException {
DescriptorBuilder.createWithEd25519Lines(null,
@@ -1843,7 +1843,7 @@ public class ServerDescriptorImplTest {
MASTER_KEY_ED25519_LINE, ROUTER_SIG_ED25519_LINE);
}
- @Test()
+ @Test
public void testEd25519MasterKeyMissing()
throws DescriptorParseException {
ServerDescriptor descriptor =
@@ -1865,7 +1865,7 @@ public class ServerDescriptorImplTest {
ROUTER_SIG_ED25519_LINE);
}
- @Test()
+ @Test
public void testEd25519RouterSigMissing()
throws DescriptorParseException {
DescriptorBuilder.createWithEd25519Lines(IDENTITY_ED25519_LINES,
@@ -1910,7 +1910,7 @@ public class ServerDescriptorImplTest {
+ "Ka\nErPtMuiEqAc=\n"
+ "-----END ED25519 CERT-----";
- @Test()
+ @Test
public void testOnionKeyCrosscert() throws DescriptorParseException {
ServerDescriptor descriptor =
DescriptorBuilder.createWithOnionKeyCrosscertLines(
@@ -1930,7 +1930,7 @@ public class ServerDescriptorImplTest {
ONION_KEY_CROSSCERT_LINES + "\n" + ONION_KEY_CROSSCERT_LINES);
}
- @Test()
+ @Test
public void testNtorOnionKeyCrosscert()
throws DescriptorParseException {
ServerDescriptor descriptor =
@@ -1953,7 +1953,7 @@ public class ServerDescriptorImplTest {
+ NTOR_ONION_KEY_CROSSCERT_LINES);
}
- @Test()
+ @Test
public void testBridgeDescriptorDigestsRouterDigestLines()
throws DescriptorParseException {
DescriptorBuilder db = new DescriptorBuilder();
@@ -1968,7 +1968,7 @@ public class ServerDescriptorImplTest {
assertEquals(digestSha256Base64, descriptor.getDigestSha256Base64());
}
- @Test()
+ @Test
public void testBridgeDescriptorDigestsNoRouterDigestLines()
throws DescriptorParseException {
DescriptorBuilder db = new DescriptorBuilder();
diff --git a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java
index 640b8a3..122e301 100644
--- a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java
+++ b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java
@@ -16,7 +16,7 @@ import java.util.List;
public class TorperfResultImplTest {
- @Test()
+ @Test
public void testAnnotatedInput() throws Exception {
TorperfResultImpl result = (TorperfResultImpl)
(TorperfResultImpl.parseTorperfResults((torperfAnnotation + input)
@@ -32,7 +32,7 @@ public class TorperfResultImplTest {
}
}
- @Test()
+ @Test
public void testPartiallyAnnotatedInput() throws Exception {
byte[] asciiBytes = (torperfAnnotation
+ input + input + input).getBytes("US-ASCII");
@@ -47,7 +47,7 @@ public class TorperfResultImplTest {
((TorperfResultImpl)(result.get(2))).getAnnotations().size());
}
- @Test()
+ @Test
public void testAllAnnotatedInput() throws Exception {
byte[] asciiBytes = (torperfAnnotation + input
+ torperfAnnotation + input
@@ -87,7 +87,7 @@ public class TorperfResultImplTest {
+ "SOCKET=1441065601.86 SOURCE=moria START=1441065601.86 "
+ "TIMEOUT=1500 USED_AT=1441065603.40 USED_BY=2475 WRITEBYTES=75\n";
- @Test()
+ @Test
public void testDatapercNonNumeric() throws Exception {
List<Descriptor> result = TorperfResultImpl.parseTorperfResults(
("DATAPERMILLE=2.0 " + input).getBytes(), false);
@@ -121,7 +121,7 @@ public class TorperfResultImplTest {
+ "START=1493397365.14 TIMEOUT=1500 USED_AT=1493397368.14 "
+ "USED_BY=17429 WRITEBYTES=54";
- @Test()
+ @Test
public void testEndpointsHostnamesSourceAddress()
throws DescriptorParseException {
List<Descriptor> result = TorperfResultImpl.parseTorperfResults(
diff --git a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java
index 142d883..d7f602f 100644
--- a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java
+++ b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java
@@ -32,7 +32,7 @@ public class DescriptorIndexCollectorTest {
@Rule
public TemporaryFolder tmpf = new TemporaryFolder();
- @Test()
+ @Test
public void testNormalCollecting() throws Exception {
// create local file structure
File localFolder = tmpf.newFolder();
@@ -135,7 +135,7 @@ public class DescriptorIndexCollectorTest {
return indexFile;
}
- @Test()
+ @Test
public void testNormalCollectingWithDeletion() throws Exception {
File localFolder = tmpf.newFolder();
makeStructure(localFolder, "1");
@@ -176,7 +176,7 @@ public class DescriptorIndexCollectorTest {
"a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/u1");
}
- @Test()
+ @Test
public void testSlashesInCollectionWithDeletion() throws Exception {
File localFolder = tmpf.newFolder();
makeStructure(localFolder, "1");
@@ -218,7 +218,7 @@ public class DescriptorIndexCollectorTest {
"a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/u1");
}
- @Test()
+ @Test
public void testNormalStatLocalDirectory() throws IOException {
// create local file structure
File dir = tmpf.newFolder();
@@ -243,7 +243,7 @@ public class DescriptorIndexCollectorTest {
assertEquals("found " + res, 1, res.size());
}
- @Test()
+ @Test
public void testWrongInputStatLocalDirectory() throws IOException {
File dir = makeDirs(tmpf.newFolder().toString(), "a", "b");
SortedMap<String, Long> res = DescriptorIndexCollector
@@ -254,7 +254,7 @@ public class DescriptorIndexCollectorTest {
assertTrue("found " + res, res.isEmpty());
}
- @Test()
+ @Test
public void testMinimalArgs() throws IOException {
File fakeDir = tmpf.newFolder("fantasy-dir");
new DescriptorIndexCollector()
@@ -281,7 +281,7 @@ public class DescriptorIndexCollectorTest {
null, new String[]{}, 100L, null, false);
}
- @Test()
+ @Test
public void testExistingDir() throws IOException {
File dir = tmpf.newFolder();
dir.setWritable(false);
diff --git a/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java b/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java
index 1fa5f83..c98abb8 100644
--- a/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java
+++ b/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java
@@ -13,7 +13,7 @@ import java.util.TreeSet;
public class DirectoryNodeTest {
- @Test()
+ @Test
public void testCompare() {
DirectoryNode dn1 = new DirectoryNode("a1", null, null);
DirectoryNode dn2 = new DirectoryNode("a2", null,
@@ -25,7 +25,7 @@ public class DirectoryNodeTest {
assertEquals(1, dn2.compareTo(dn3));
}
- @Test()
+ @Test
public void testFind() {
FileNode fnx = new FileNode("x", 0L, "2000-01-01 01:01");
SortedSet<FileNode> fm = new TreeSet<>();
diff --git a/src/test/java/org/torproject/descriptor/index/FileNodeTest.java b/src/test/java/org/torproject/descriptor/index/FileNodeTest.java
index 59b66a6..5af89ff 100644
--- a/src/test/java/org/torproject/descriptor/index/FileNodeTest.java
+++ b/src/test/java/org/torproject/descriptor/index/FileNodeTest.java
@@ -9,7 +9,7 @@ import org.junit.Test;
public class FileNodeTest {
- @Test()
+ @Test
public void testCompare() {
FileNode fn1 = new FileNode("a1", 1L, "2016-01-01 01:01");
FileNode fn2 = new FileNode("a2", 1L, "2016-01-01 02:02");
diff --git a/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java b/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java
index e1d36b2..f1e044c 100644
--- a/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java
+++ b/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java
@@ -24,7 +24,7 @@ public class IndexNodeTest {
@Rule
public TemporaryFolder tmpf = new TemporaryFolder();
- @Test()
+ @Test
public void testSimpleIndexRead() throws Exception {
URL indexUrl = getClass().getClassLoader().getResource("index1.json");
IndexNode index = IndexNode.fetchIndex(indexUrl.toString());
@@ -33,7 +33,7 @@ public class IndexNodeTest {
/* toString is only used for debugging. Simply ensure that paths,
* file names, and urls are readable. */
- @Test()
+ @Test
public void testToString() throws Exception {
URL indexUrl = getClass().getClassLoader().getResource("index1.json");
IndexNode index = IndexNode.fetchIndex(indexUrl.toString());
@@ -57,7 +57,7 @@ public class IndexNodeTest {
index.directories.first().directories.first().files.last().path);
}
- @Test()
+ @Test
public void testCompressedIndexRead() throws Exception {
for (String fileName : new String[] {"index1.json.xz", "index1.json.bz2",
"index1.json.gz"}) {
@@ -67,7 +67,7 @@ public class IndexNodeTest {
}
}
- @Test()
+ @Test
public void testIndexWrite() throws Exception {
for (String fileName : new String[] {
"test.json", "test.json.bz2", "test.json.gz", "test.json.xz"}) {
@@ -86,7 +86,7 @@ public class IndexNodeTest {
assertEquals("Comparing to " + oldPath, oldJson, newJson);
}
- @Test()
+ @Test
public void testRetrieveFiles() throws Exception {
URL indexUrl = getClass().getClassLoader().getResource("index2.json");
IndexNode index = IndexNode.fetchIndex(indexUrl.toString());
@@ -120,7 +120,7 @@ public class IndexNodeTest {
IndexNode.fetchIndex(indexUrl.openStream());
}
- @Test()
+ @Test
public void testRetrieveEmpty() throws Exception {
URL indexUrl = getClass().getClassLoader().getResource("index1.json");
IndexNode index = IndexNode.fetchIndex(indexUrl.toString());
More information about the tor-commits
mailing list