From 405a61891ff675f0b5baa47e772f0bb8e1ac5ed3 Mon Sep 17 00:00:00 2001 From: Ferdinand Majerech Date: Tue, 22 Jul 2014 01:13:01 +0200 Subject: [PATCH] Reader unittest fixes. --- test/src/reader.d | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/test/src/reader.d b/test/src/reader.d index d79d212..e8e9927 100644 --- a/test/src/reader.d +++ b/test/src/reader.d @@ -11,42 +11,38 @@ import dyaml.testcommon; import dyaml.reader; -/** - * Try reading entire stream through Reader, expecting an error (the stream is invalid). - * - * Params: verbose = Print verbose output? - * data = Stream to read. - */ -void runReader(in bool verbose, Stream stream) +// Try reading entire stream through Reader, expecting an error (the stream is invalid). +// +// Params: verbose = Print verbose output? +// data = Stream to read. +void runReader(const bool verbose, Stream stream) { try { auto reader = new Reader(stream); - while(reader.peek() != '\0'){reader.forward();} + while(reader.peek() != '\0') { reader.forward(); } } catch(ReaderException e) { - if(verbose){writeln(typeid(e).toString(), "\n", e);} + if(verbose) { writeln(typeid(e).toString(), "\n", e); } return; } assert(false, "Expected an exception"); } -/** - * Stream error unittest. Tries to read invalid input streams, expecting errors. - * - * Params: verbose = Print verbose output? - * errorFilename = File name to read from. - */ +/// Stream error unittest. Tries to read invalid input streams, expecting errors. +/// +/// Params: verbose = Print verbose output? +/// errorFilename = File name to read from. void testStreamError(bool verbose, string errorFilename) { auto file = new File(errorFilename); - scope(exit){file.close();} + scope(exit) { file.close(); } runReader(verbose, file); } -unittest +unittest { writeln("D:YAML Reader unittest"); run("testStreamError", &testStreamError, ["stream-error"]);