X-Git-Url: http://nitlanguage.org

diff --git a/lib/saxophonit/testing.nit b/lib/saxophonit/testing.nit
index c940b15..70db6a5 100644
--- a/lib/saxophonit/testing.nit
+++ b/lib/saxophonit/testing.nit
@@ -40,7 +40,7 @@ class SAXEventLogger
 	# order they fired (the oldest first). Two event loggers have equivalent
 	# logs if and only if they received the same events in the same order and
 	# with equivalent arguments.
-	private var log: Array[Array[String]] = new Array[Array[String]]
+	private var log = new Array[Array[String]]
 
 	# http://xml.org/sax/properties/declaration-handler
 	private var decl_handler: nullable DeclHandler = null
@@ -87,7 +87,7 @@ class SAXEventLogger
 		var buf = new FlatBuffer
 		var sub_diff: Array[Int]
 		var equal: Bool
-		var i: Int = 0
+		var i = 0
 		var min: Int
 		var max: Int
 
@@ -140,7 +140,7 @@ class SAXEventLogger
 	private fun diff_entry(actual: Array[String], expected: Array[String]):
 			Array[Int] do
 		var result = new Array[Int]
-		var i: Int = 0
+		var i = 0
 		var min: Int
 		var max: Int
 
@@ -190,8 +190,6 @@ class SAXEventLogger
 	# in the specified entry.
 	private fun diff_append_deletion(buf: Buffer, log: Array[Array[String]],
 			entry_index: Int, sorted_mismatches: Collection[Int]) do
-		var sub_buf = new FlatBuffer
-
 		buf.append(term_deletion)
 		buf.append("< {entry_index}|")
 		diff_append_mismatch_entry(buf, log[entry_index], sorted_mismatches,
@@ -236,7 +234,7 @@ class SAXEventLogger
 	private fun diff_append_mismatch_entry(buf: Buffer, entry: Array[String],
 			sorted_mismatches: Collection[Int], term_normal: String,
 			term_emphasis: String) do
-		var i: Int = 0
+		var i = 0
 		var j = sorted_mismatches.iterator
 		var length = entry.length
 
@@ -547,10 +545,10 @@ abstract class SAXTestSuite
 	super TestSuite
 
 	# Logger of the expected event sequence.
-	var expected: SAXEventLogger = new SAXEventLogger
+	var expected = new SAXEventLogger
 
 	# Logger of the actual event sequence.
-	var actual: SAXEventLogger = new SAXEventLogger
+	var actual = new SAXEventLogger
 
 	# The tested SAX reader.
 	var reader: XMLReader is noinit
@@ -590,6 +588,6 @@ abstract class SAXTestSuite
 
 	# Make the reader parse the specified string
 	fun parse_string(str: String) do
-		actual.parse(new InputSource.with_stream(new StringIStream(str)))
+		actual.parse(new InputSource.with_stream(new StringReader(str)))
 	end
 end