commit fe9de218921bd10aee8cda7e722d6a1208ca28ea Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Thu Apr 27 11:42:59 2017 +0200 Stop downloading and merging Torperf files. We recently switched to downloading .tpf files from OnionPerf hosts, and we ran out of functioning Torperf hosts, so let's remove the code for downloading and merging Torperf files. Part of #21272. --- CHANGELOG.md | 2 + .../java/org/torproject/collector/conf/Key.java | 2 - .../collector/torperf/TorperfDownloader.java | 565 --------------------- src/main/resources/collector.properties | 10 - .../collector/conf/ConfigurationTest.java | 29 +- 5 files changed, 3 insertions(+), 605 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e1107f..8d23f01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ * Major changes - Download .tpf files from OnionPerf hosts. + - Stop downloading and merging .data and .extradata files from + Torperf hosts. * Medium changes - Clean up files in recent/exit-lists/ again. diff --git a/src/main/java/org/torproject/collector/conf/Key.java b/src/main/java/org/torproject/collector/conf/Key.java index dd35322..9473421 100644 --- a/src/main/java/org/torproject/collector/conf/Key.java +++ b/src/main/java/org/torproject/collector/conf/Key.java @@ -56,8 +56,6 @@ public enum Key { KeepDirectoryArchiveImportHistory(Boolean.class), ReplaceIpAddressesWithHashes(Boolean.class), BridgeDescriptorMappingsLimit(Integer.class), - TorperfFilesLines(String[].class), - TorperfHosts(String[][].class), OnionPerfHosts(URL[].class); private Class clazz; diff --git a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java index 2cd99df..7574665 100644 --- a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java +++ b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java @@ -3,7 +3,6 @@ package org.torproject.collector.torperf; -import org.torproject.collector.conf.Annotation; import org.torproject.collector.conf.Configuration; import org.torproject.collector.conf.ConfigurationException; import org.torproject.collector.conf.Key; @@ -25,7 +24,6 @@ import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.nio.file.Files; @@ -35,14 +33,10 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.SortedMap; import java.util.SortedSet; import java.util.Stack; import java.util.TimeZone; -import java.util.TreeMap; import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -62,12 +56,6 @@ public class TorperfDownloader extends CollecTorMain { super(config); } - private File torperfOutputDirectory = null; - private Map<String, String> torperfSources = new HashMap<>(); - private String[] torperfFilesLines = null; - private SimpleDateFormat dateFormat; - private File torperfLastMergedFile; - /** File containing the download history, which is necessary, because * OnionPerf does not delete older .tpf files, but which enables us to do * so. */ @@ -98,25 +86,6 @@ public class TorperfDownloader extends CollecTorMain { @Override protected void startProcessing() throws ConfigurationException { - this.torperfFilesLines = config.getStringArray(Key.TorperfFilesLines); - this.torperfOutputDirectory - = new File(config.getPath(Key.OutputPath).toString(), TORPERF); - this.torperfLastMergedFile = - new File(config.getPath(Key.StatsPath).toFile(), "torperf-last-merged"); - if (!this.torperfOutputDirectory.exists()) { - this.torperfOutputDirectory.mkdirs(); - } - this.dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - this.readLastMergedTimestamps(); - for (String[] source : config.getStringArrayArray(Key.TorperfHosts)) { - torperfSources.put(source[0], source[1]); - } - for (String torperfFilesLine : this.torperfFilesLines) { - this.downloadAndMergeFiles(torperfFilesLine); - } - this.writeLastMergedTimestamps(); - this.onionPerfDownloadedFile = new File(config.getPath(Key.StatsPath).toFile(), "onionperf-downloaded"); @@ -130,543 +99,9 @@ public class TorperfDownloader extends CollecTorMain { this.downloadFromOnionPerfHost(baseUrl); } this.writeDownloadedOnionPerfTpfFiles(); - this.cleanUpRsyncDirectory(); } - SortedMap<String, String> lastMergedTimestamps = new TreeMap<>(); - - private void readLastMergedTimestamps() { - if (!this.torperfLastMergedFile.exists()) { - return; - } - try { - BufferedReader br = new BufferedReader(new FileReader( - this.torperfLastMergedFile)); - String line; - while ((line = br.readLine()) != null) { - String[] parts = line.split(" "); - String fileName = null; - String timestamp = null; - if (parts.length == 2) { - try { - Double.parseDouble(parts[1]); - fileName = parts[0]; - timestamp = parts[1]; - } catch (NumberFormatException e) { - /* Handle below. */ - } - } - if (fileName == null || timestamp == null) { - logger.warn("Invalid line '" + line + "' in " - + this.torperfLastMergedFile.getAbsolutePath() + ". " - + "Ignoring past history of merging .data and .extradata " - + "files."); - this.lastMergedTimestamps.clear(); - break; - } - this.lastMergedTimestamps.put(fileName, timestamp); - } - br.close(); - } catch (IOException e) { - logger.warn("Error while reading '" - + this.torperfLastMergedFile.getAbsolutePath() + ". Ignoring " - + "past history of merging .data and .extradata files."); - this.lastMergedTimestamps.clear(); - } - } - - private void writeLastMergedTimestamps() { - try { - this.torperfLastMergedFile.getParentFile().mkdirs(); - BufferedWriter bw = new BufferedWriter(new FileWriter( - this.torperfLastMergedFile)); - for (Map.Entry<String, String> e : - this.lastMergedTimestamps.entrySet()) { - String fileName = e.getKey(); - String timestamp = e.getValue(); - bw.write(fileName + " " + timestamp + "\n"); - } - bw.close(); - } catch (IOException e) { - logger.warn("Error while writing '" - + this.torperfLastMergedFile.getAbsolutePath() + ". This may " - + "result in ignoring history of merging .data and .extradata " - + "files in the next execution.", e); - } - } - - private void downloadAndMergeFiles(String torperfFilesLine) - throws ConfigurationException { - String[] parts = torperfFilesLine.split(" "); - String sourceName = parts[0]; - int fileSize = -1; - try { - fileSize = Integer.parseInt(parts[1]); - } catch (NumberFormatException e) { - logger.warn("Could not parse file size in " - + "TorperfFiles configuration line '" + torperfFilesLine - + "'.", e); - return; - } - - /* Download and append the .data file. */ - String dataFileName = parts[2]; - String sourceBaseUrl = torperfSources.get(sourceName); - String dataUrl = sourceBaseUrl + dataFileName; - String dataOutputFileName = sourceName + "-" + dataFileName; - File dataOutputFile = new File(torperfOutputDirectory, - dataOutputFileName); - boolean downloadedDataFile = this.downloadAndAppendFile(dataUrl, - dataOutputFile, true); - - /* Download and append the .extradata file. */ - String extradataFileName = parts[3]; - String extradataUrl = sourceBaseUrl + extradataFileName; - String extradataOutputFileName = sourceName + "-" + extradataFileName; - File extradataOutputFile = new File(torperfOutputDirectory, - extradataOutputFileName); - boolean downloadedExtradataFile = this.downloadAndAppendFile( - extradataUrl, extradataOutputFile, false); - - /* Merge both files into .tpf format. */ - if (!downloadedDataFile && !downloadedExtradataFile) { - return; - } - String skipUntil = null; - if (this.lastMergedTimestamps.containsKey(dataOutputFileName)) { - skipUntil = this.lastMergedTimestamps.get(dataOutputFileName); - } - try { - skipUntil = this.mergeFiles(dataOutputFile, extradataOutputFile, - sourceName, fileSize, skipUntil); - } catch (IOException e) { - logger.warn("Failed merging " + dataOutputFile - + " and " + extradataOutputFile + ".", e); - } - if (skipUntil != null) { - this.lastMergedTimestamps.put(dataOutputFileName, skipUntil); - } - } - - private boolean downloadAndAppendFile(String urlString, File outputFile, - boolean isDataFile) { - - /* Read an existing output file to determine which line will be the - * first to append to it. */ - String lastTimestampLine = null; - int linesAfterLastTimestampLine = 0; - if (outputFile.exists()) { - try { - BufferedReader br = new BufferedReader(new FileReader( - outputFile)); - String line; - while ((line = br.readLine()) != null) { - if (isDataFile || line.contains(" LAUNCH")) { - lastTimestampLine = line; - linesAfterLastTimestampLine = 0; - } else { - linesAfterLastTimestampLine++; - } - } - br.close(); - } catch (IOException e) { - logger.warn("Failed reading '" - + outputFile.getAbsolutePath() + "' to determine the first " - + "line to append to it.", e); - return false; - } - } - try { - logger.debug("Downloading " + (isDataFile ? ".data" : - ".extradata") + " file from '" + urlString + "' and merging it " - + "into '" + outputFile.getAbsolutePath() + "'."); - URL url = new URL(urlString); - HttpURLConnection huc = (HttpURLConnection) url.openConnection(); - huc.setRequestMethod("GET"); - huc.connect(); - BufferedReader br = new BufferedReader(new InputStreamReader( - huc.getInputStream())); - String line; - BufferedWriter bw = new BufferedWriter(new FileWriter(outputFile, - true)); - boolean copyLines = lastTimestampLine == null; - while ((line = br.readLine()) != null) { - if (copyLines && linesAfterLastTimestampLine == 0) { - if (isDataFile || line.contains(" LAUNCH")) { - lastTimestampLine = line; - } - bw.write(line + "\n"); - } else if (copyLines && linesAfterLastTimestampLine > 0) { - linesAfterLastTimestampLine--; - } else if (line.equals(lastTimestampLine)) { - copyLines = true; - } - } - bw.close(); - br.close(); - if (!copyLines) { - logger.warn("The last timestamp line in '" - + outputFile.getAbsolutePath() + "' is not contained in the " - + "new file downloaded from '" + url + "'. Cannot append " - + "new lines without possibly leaving a gap. Skipping."); - return false; - } - } catch (IOException e) { - logger.warn("Failed downloading and/or merging '" - + urlString + "'.", e); - return false; - } - if (lastTimestampLine == null) { - logger.warn("'" + outputFile.getAbsolutePath() - + "' doesn't contain any timestamp lines. Unable to check " - + "whether that file is stale or not."); - } else { - long lastTimestampMillis = -1L; - if (isDataFile) { - lastTimestampMillis = Long.parseLong(lastTimestampLine.substring( - 0, lastTimestampLine.indexOf(" "))) * 1000L; - } else { - lastTimestampMillis = Long.parseLong(lastTimestampLine.substring( - lastTimestampLine.indexOf(" LAUNCH=") + " LAUNCH=".length(), - lastTimestampLine.indexOf(".", - lastTimestampLine.indexOf(" LAUNCH=")))) * 1000L; - } - if (lastTimestampMillis < System.currentTimeMillis() - - 330L * 60L * 1000L) { - logger.warn("The last timestamp in '" - + outputFile.getAbsolutePath() + "' is more than 5:30 hours " - + "old: " + lastTimestampMillis); - } - } - return true; - } - - private String mergeFiles(File dataFile, File extradataFile, - String source, int fileSize, String skipUntil) throws IOException, - ConfigurationException { - if (!dataFile.exists() || !extradataFile.exists()) { - logger.warn("File " + dataFile.getAbsolutePath() + " or " - + extradataFile.getAbsolutePath() + " is missing."); - return null; - } - logger.debug("Merging " + dataFile.getAbsolutePath() + " and " - + extradataFile.getAbsolutePath() + " into .tpf format."); - BufferedReader brD = new BufferedReader(new FileReader(dataFile)); - BufferedReader brE = new BufferedReader(new FileReader(extradataFile)); - String lineD = brD.readLine(); - String lineE = brE.readLine(); - int skippedLineCount = 1; - int skippedExtraDataCount = 1; - String maxDataComplete = null; - String maxUsedAt = null; - while (lineD != null) { - - /* Parse .data line. Every valid .data line will go into the .tpf - * format, either with additional information from the .extradata - * file or without it. */ - if (lineD.isEmpty()) { - logger.trace("Skipping empty line " + dataFile.getName() - + ":" + skippedLineCount++ + "."); - lineD = brD.readLine(); - continue; - } - SortedMap<String, String> data = this.parseDataLine(lineD); - if (data == null) { - logger.trace("Skipping illegal line " + dataFile.getName() - + ":" + skippedLineCount++ + " '" + lineD + "'."); - lineD = brD.readLine(); - continue; - } - String dataComplete = data.get("DATACOMPLETE"); - double dataCompleteSeconds = Double.parseDouble(dataComplete); - if (skipUntil != null && dataComplete.compareTo(skipUntil) < 0) { - logger.trace("Skipping " + dataFile.getName() + ":" - + skippedLineCount++ + " which we already processed before."); - lineD = brD.readLine(); - continue; - } - maxDataComplete = dataComplete; - - /* Parse .extradata line if available and try to find the one that - * matches the .data line. */ - SortedMap<String, String> extradata = null; - while (lineE != null) { - if (lineE.isEmpty()) { - logger.trace("Skipping " + extradataFile.getName() + ":" - + skippedExtraDataCount++ + " which is empty."); - lineE = brE.readLine(); - continue; - } - if (lineE.startsWith("BUILDTIMEOUT_SET ")) { - logger.trace("Skipping " + extradataFile.getName() + ":" - + skippedExtraDataCount++ + " which is a BUILDTIMEOUT_SET " - + "line."); - lineE = brE.readLine(); - continue; - } else if (lineE.startsWith("ok ") - || lineE.startsWith("error ")) { - logger.trace("Skipping " + extradataFile.getName() + ":" - + skippedExtraDataCount++ + " which is in the old format."); - lineE = brE.readLine(); - continue; - } - extradata = this.parseExtradataLine(lineE); - if (extradata == null) { - logger.trace("Skipping Illegal line " - + extradataFile.getName() + ":" + skippedExtraDataCount++ - + " '" + lineE + "'."); - lineE = brE.readLine(); - continue; - } - if (!extradata.containsKey("USED_AT")) { - logger.trace("Skipping " + extradataFile.getName() + ":" - + skippedExtraDataCount++ + " which doesn't contain a " - + "USED_AT element."); - lineE = brE.readLine(); - continue; - } - String usedAt = extradata.get("USED_AT"); - double usedAtSeconds = Double.parseDouble(usedAt); - if (skipUntil != null && usedAt.compareTo(skipUntil) < 0) { - logger.trace("Skipping " + extradataFile.getName() + ":" - + skippedExtraDataCount++ + " which we already processed " - + "before."); - lineE = brE.readLine(); - continue; - } - maxUsedAt = usedAt; - if (Math.abs(usedAtSeconds - dataCompleteSeconds) <= 1.0) { - logger.debug("Merging " + extradataFile.getName() + ":" - + skippedExtraDataCount++ + " into the current .data line."); - lineE = brE.readLine(); - break; - } else if (usedAtSeconds > dataCompleteSeconds) { - logger.trace("Comparing " + extradataFile.getName() - + " to the next .data line."); - extradata = null; - break; - } else { - logger.trace("Skipping " + extradataFile.getName() + ":" - + skippedExtraDataCount++ + " which is too old to be " - + "merged with " + dataFile.getName() + ":" - + skippedLineCount + "."); - lineE = brE.readLine(); - continue; - } - } - - /* Write output line to .tpf file. */ - SortedMap<String, String> keysAndValues = new TreeMap<>(); - keysAndValues.put("SOURCE", source); - keysAndValues.put("FILESIZE", String.valueOf(fileSize)); - if (extradata != null) { - keysAndValues.putAll(extradata); - } - keysAndValues.putAll(data); - logger.debug("Writing " + dataFile.getName() + ":" - + skippedLineCount++ + "."); - lineD = brD.readLine(); - try { - this.writeTpfLine(source, fileSize, keysAndValues); - } catch (IOException ex) { - logger.warn("Error writing output line. " - + "Aborting to merge " + dataFile.getName() + " and " - + extradataFile.getName() + ".", skippedExtraDataCount); - break; - } - } - brD.close(); - brE.close(); - this.writeCachedTpfLines(); - if (maxDataComplete == null) { - return maxUsedAt; - } else if (maxUsedAt == null) { - return maxDataComplete; - } else if (maxDataComplete.compareTo(maxUsedAt) > 0) { - return maxUsedAt; - } else { - return maxDataComplete; - } - } - - private SortedMap<Integer, String> dataTimestamps; - - private SortedMap<String, String> parseDataLine(String line) { - String[] parts = line.trim().split(" "); - if (line.length() == 0 || parts.length < 20) { - return null; - } - if (this.dataTimestamps == null) { - this.dataTimestamps = new TreeMap<>(); - this.dataTimestamps.put(0, "START"); - this.dataTimestamps.put(2, "SOCKET"); - this.dataTimestamps.put(4, "CONNECT"); - this.dataTimestamps.put(6, "NEGOTIATE"); - this.dataTimestamps.put(8, "REQUEST"); - this.dataTimestamps.put(10, "RESPONSE"); - this.dataTimestamps.put(12, "DATAREQUEST"); - this.dataTimestamps.put(14, "DATARESPONSE"); - this.dataTimestamps.put(16, "DATACOMPLETE"); - this.dataTimestamps.put(21, "DATAPERC10"); - this.dataTimestamps.put(23, "DATAPERC20"); - this.dataTimestamps.put(25, "DATAPERC30"); - this.dataTimestamps.put(27, "DATAPERC40"); - this.dataTimestamps.put(29, "DATAPERC50"); - this.dataTimestamps.put(31, "DATAPERC60"); - this.dataTimestamps.put(33, "DATAPERC70"); - this.dataTimestamps.put(35, "DATAPERC80"); - this.dataTimestamps.put(37, "DATAPERC90"); - } - SortedMap<String, String> data = new TreeMap<>(); - try { - for (Map.Entry<Integer, String> e : this.dataTimestamps.entrySet()) { - int intKey = e.getKey(); - if (parts.length > intKey + 1) { - String key = e.getValue(); - String value = String.format("%s.%02d", parts[intKey], - Integer.parseInt(parts[intKey + 1]) / 10000); - data.put(key, value); - } - } - } catch (NumberFormatException e) { - return null; - } - data.put("WRITEBYTES", parts[18]); - data.put("READBYTES", parts[19]); - if (parts.length >= 21) { - data.put("DIDTIMEOUT", parts[20]); - } - return data; - } - - private SortedMap<String, String> parseExtradataLine(String line) { - String[] parts = line.split(" "); - SortedMap<String, String> extradata = new TreeMap<>(); - String previousKey = null; - for (String part : parts) { - String[] keyAndValue = part.split("=", -1); - if (keyAndValue.length == 2) { - String key = keyAndValue[0]; - previousKey = key; - String value = keyAndValue[1]; - if (value.contains(".") && value.lastIndexOf(".") - == value.length() - 2) { - /* Make sure that all floats have two trailing digits. */ - value += "0"; - } - extradata.put(key, value); - } else if (keyAndValue.length == 1 && previousKey != null) { - String value = keyAndValue[0]; - if (previousKey.equals("STREAM_FAIL_REASONS") - && (value.equals("MISC") || value.equals("EXITPOLICY") - || value.equals("RESOURCELIMIT") - || value.equals("RESOLVEFAILED"))) { - extradata.put(previousKey, extradata.get(previousKey) + ":" - + value); - } else { - return null; - } - } else { - return null; - } - } - return extradata; - } - - private String cachedSource; - - private int cachedFileSize; - - private String cachedStartDate; - - private SortedMap<String, String> cachedTpfLines; - - private void writeTpfLine(String source, int fileSize, - SortedMap<String, String> keysAndValues) throws ConfigurationException, - IOException { - StringBuilder sb = new StringBuilder(); - int written = 0; - for (Map.Entry<String, String> keyAndValue : - keysAndValues.entrySet()) { - String key = keyAndValue.getKey(); - String value = keyAndValue.getValue(); - sb.append((written++ > 0 ? " " : "") + key + "=" + value); - } - String line = sb.toString(); - String startString = keysAndValues.get("START"); - long startMillis = Long.parseLong(startString.substring(0, - startString.indexOf("."))) * 1000L; - String startDate = dateFormat.format(startMillis); - if (this.cachedTpfLines == null || !source.equals(this.cachedSource) - || fileSize != this.cachedFileSize - || !startDate.equals(this.cachedStartDate)) { - this.writeCachedTpfLines(); - this.readTpfLinesToCache(source, fileSize, startDate); - } - if (!this.cachedTpfLines.containsKey(startString) - || line.length() > this.cachedTpfLines.get(startString).length()) { - this.cachedTpfLines.put(startString, line); - } - } - - private void readTpfLinesToCache(String source, int fileSize, - String startDate) throws IOException { - this.cachedTpfLines = new TreeMap<>(); - this.cachedSource = source; - this.cachedFileSize = fileSize; - this.cachedStartDate = startDate; - File tpfFile = new File(torperfOutputDirectory, - startDate.replaceAll("-", "/") + "/" - + source + "-" + String.valueOf(fileSize) + "-" + startDate - + ".tpf"); - if (!tpfFile.exists()) { - return; - } - BufferedReader br = new BufferedReader(new FileReader(tpfFile)); - String line; - while ((line = br.readLine()) != null) { - if (line.startsWith("@type ")) { - continue; - } - if (line.contains("START=")) { - String startString = line.substring(line.indexOf("START=") - + "START=".length()).split(" ")[0]; - this.cachedTpfLines.put(startString, line); - } - } - br.close(); - } - - private void writeCachedTpfLines() throws ConfigurationException, - IOException { - if (this.cachedSource == null || this.cachedFileSize == 0 - || this.cachedStartDate == null || this.cachedTpfLines == null) { - return; - } - File tarballFile = new File(torperfOutputDirectory, - this.cachedStartDate.replaceAll("-", "/") - + "/" + this.cachedSource + "-" - + String.valueOf(this.cachedFileSize) + "-" - + this.cachedStartDate + ".tpf"); - File rsyncFile = new File(config.getPath(Key.RecentPath).toFile(), - "torperf/" + tarballFile.getName()); - File[] outputFiles = new File[] { tarballFile, rsyncFile }; - for (File outputFile : outputFiles) { - outputFile.getParentFile().mkdirs(); - BufferedWriter bw = new BufferedWriter(new FileWriter(outputFile)); - for (String line : this.cachedTpfLines.values()) { - bw.write(Annotation.Torperf.toString()); - bw.write(line + "\n"); - } - bw.close(); - } - this.cachedSource = null; - this.cachedFileSize = 0; - this.cachedStartDate = null; - this.cachedTpfLines = null; - } - private void readDownloadedOnionPerfTpfFiles() { if (!this.onionPerfDownloadedFile.exists()) { return; diff --git a/src/main/resources/collector.properties b/src/main/resources/collector.properties index fb43495..f152644 100644 --- a/src/main/resources/collector.properties +++ b/src/main/resources/collector.properties @@ -141,16 +141,6 @@ ExitlistUrl = https://check.torproject.org/exit-addresses # ######## Torperf downloader ######## # -## Torperf host names and base URLs -## multiple pairs can be specified separated by semi-colon, e.g. -## TorperfHosts = torperf_A, http://some.torproject.org/; another, http://another.torproject.org/ -TorperfHosts = torperf, http://torperf.torproject.org/ - -## Torperf measurement file size in bytes, .data file, and .extradata file -## available on a given host (multiple times lists can be given -## TorperfFiles = torperf 51200 50kb.data 50kb.extradata, torperf 1048576 1mb.data 1mb.extradata -TorperfFilesLines = torperf 51200 50kb.data 50kb.extradata, torperf 1048576 1mb.data 1mb.extradata, torperf 5242880 5mb.data 5mb.extradata - ## OnionPerf base URLs ## Hosts must be configured to use the first subdomain part of the given URL as ## source name, e.g., SOURCE=first for the first URL below, SOURCE=second for diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java index 90065b0..a0c1dd1 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java @@ -40,7 +40,7 @@ public class ConfigurationTest { public void testKeyCount() throws Exception { assertEquals("The number of properties keys in enum Key changed." + "\n This test class should be adapted.", - 45, Key.values().length); + 43, Key.values().length); } @Test() @@ -130,19 +130,6 @@ public class ConfigurationTest { } @Test() - public void testArrayArrayValues() throws Exception { - String[][] sourceStrings = new String[][] { - new String[]{"localsource", "http://127.0.0.1:12345"}, - new String[]{"somesource", "https://some.host.org:12345"}}; - Configuration conf = new Configuration(); - conf.setProperty(Key.TorperfHosts.name(), - Arrays.deepToString(sourceStrings).replace("[[", "").replace("]]", "") - .replace("], [", Configuration.ARRAYSEP)); - assertArrayEquals(sourceStrings, - conf.getStringArrayArray(Key.TorperfHosts)); - } - - @Test() public void testUrlArrayValues() throws Exception { URL[] array = new URL[randomSource.nextInt(30) + 1]; for (int i = 0; i < array.length; i++) { @@ -169,20 +156,6 @@ public class ConfigurationTest { } @Test(expected = ConfigurationException.class) - public void testArrayValueException() throws Exception { - Configuration conf = new Configuration(); - conf.setProperty(Key.RelayCacheOrigins.name(), ""); - conf.getStringArray(Key.TorperfHosts); - } - - @Test(expected = ConfigurationException.class) - public void testBoolValueException() throws Exception { - Configuration conf = new Configuration(); - conf.setProperty(Key.TorperfHosts.name(), "http://x.y.z"); - conf.getBool(Key.RelayCacheOrigins); - } - - @Test(expected = ConfigurationException.class) public void testPathValueException() throws Exception { Configuration conf = new Configuration(); conf.setProperty(Key.RelayLocalOrigins.name(), "\\\u0000:");