Shut down XMLEventReader threads in tests with stop()

Author: ashawley

Diff for: src/test/scala/scala/xml/pull/XMLEventReaderTest.scala

@@ -39,7 +39,7 @@ class XMLEventReaderTest {
       case EvElemEnd(_, "hello") => true
       case _ => false
     })
-    er.stop  // allow thread to be garbage-collected
+    er.stop()  // allow thread to be garbage-collected
   }
 
   @Test
@@ -48,6 +48,7 @@ class XMLEventReaderTest {
     val r = new XMLEventReader(toSource(broken))
 
     assertTrue(r.next.isInstanceOf[EvElemStart])
+    r.stop()
   }
 
   @Test(expected = classOf[FatalError])
@@ -56,26 +57,38 @@ class XMLEventReaderTest {
     val r = new XMLEventReader(toSource(data))
 
     assertTrue(r.next.isInstanceOf[EvElemStart])
-    // error when returning EvText of CDATA
-    r.next
+    try {
+      // error when returning EvText of CDATA
+      r.next
+    } finally {
+      r.stop()
+    }
   }
 
   @Test(expected = classOf[FatalError])
   def malformedComment1: Unit = {
     val data = "<!"
     val r = new XMLEventReader(toSource(data))
 
-    // error when returning EvComment
-    r.next
+    try {
+      // error when returning EvComment
+      r.next
+    } finally {
+      r.stop()
+    }
   }
 
   @Test(expected = classOf[FatalError])
   def malformedComment2: Unit = {
     val data = "<!-- comment "
     val r = new XMLEventReader(toSource(data))
 
-    // error when returning EvComment
-    r.next
+    try {
+      // error when returning EvComment
+      r.next
+    } finally {
+      r.stop()
+    }
   }
 
   @Test
@@ -89,6 +102,7 @@ class XMLEventReaderTest {
     val r = new XMLEventReader(toSource(data))
 
     assertFalse(r.hasNext)
+    r.stop()
   }
 
   @Test
@@ -100,6 +114,7 @@ class XMLEventReaderTest {
     val r = new XMLEventReader(toSource(data))
 
     assertFalse(r.hasNext)
+    r.stop()
   }
 
   @Test
@@ -112,6 +127,7 @@ class XMLEventReaderTest {
     val r = new XMLEventReader(toSource(data))
 
     assertFalse(r.hasNext)
+    r.stop()
   }
 
   @Test
@@ -124,6 +140,7 @@ class XMLEventReaderTest {
     val r = new XMLEventReader(toSource(data))
 
     assertFalse(r.hasNext)
+    r.stop()
   }
 
   @Test
@@ -136,6 +153,7 @@ class XMLEventReaderTest {
     val r = new XMLEventReader(toSource(data))
 
     assertFalse(r.hasNext)
+    r.stop()
   }
 
   @Test
@@ -148,6 +166,7 @@ class XMLEventReaderTest {
     val r = new XMLEventReader(toSource(data))
 
     assertFalse(r.hasNext)
+    r.stop()
   }
 
   @Test(expected = classOf[Exception])
@@ -165,7 +184,10 @@ class XMLEventReaderTest {
         |""".stripMargin
 
     val er = new XMLEventReader(toSource(data))
-    while(er.hasNext) er.next()
-    er.stop()
+    try {
+      while(er.hasNext) er.next()
+    } finally {
+      er.stop()
+    }
   }
 }