Index: branches/pyyaml3000/tests/test_reader.py
===================================================================
--- branches/pyyaml3000/tests/test_stream.py	(revision 45)
+++ branches/pyyaml3000/tests/test_reader.py	(revision 46)
@@ -1,31 +1,44 @@
 
 import test_appliance
-from yaml.stream import Stream, StreamError
+from yaml.reader import Reader, ReaderError
 
-class TestStreamErrors(test_appliance.TestAppliance):
+import codecs
 
-    def _testStreamUnicodeErrors(self, test_name, stream_filename):
-        try:
-            data = unicode(file(stream_filename, 'rb').read(), 'utf-8')
-        except:
+class TestReaderErrors(test_appliance.TestAppliance):
+
+    def _testReaderUnicodeErrors(self, test_name, stream_filename):
+        for encoding in ['utf-8', 'utf-16-le', 'utf-16-be']:
+            try:
+                data = unicode(file(stream_filename, 'rb').read(), encoding)
+                break
+            except:
+                pass
+        else:
             return
-        self.failUnlessRaises(StreamError, lambda: self._load(stream_filename, data))
+        #self._load(data)
+        self.failUnlessRaises(ReaderError,
+                lambda: self._load(data))
+        #self._load(codecs.open(stream_filename, encoding=encoding))
+        self.failUnlessRaises(ReaderError,
+                lambda: self._load(codecs.open(stream_filename, encoding=encoding)))
 
-    def _testStreamStringErrors(self, test_name, stream_filename):
+    def _testReaderStringErrors(self, test_name, stream_filename):
         data = file(stream_filename, 'rb').read()
-        self.failUnlessRaises(StreamError, lambda: self._load(stream_filename, data))
+        #self._load(data)
+        self.failUnlessRaises(ReaderError, lambda: self._load(data))
 
-    def _testStreamFileErrors(self, test_name, stream_filename):
+    def _testReaderFileErrors(self, test_name, stream_filename):
         data = file(stream_filename, 'rb')
-        self.failUnlessRaises(StreamError, lambda: self._load(stream_filename, data))
+        #self._load(data)
+        self.failUnlessRaises(ReaderError, lambda: self._load(data))
 
-    def _load(self, stream_filename, data):
-        stream = Stream(stream_filename, data)
+    def _load(self, data):
+        stream = Reader(data)
         while stream.peek() != u'\0':
             stream.forward()
 
-TestStreamErrors.add_tests('testStreamUnicodeErrors', '.stream-error')
-TestStreamErrors.add_tests('testStreamStringErrors', '.stream-error')
-TestStreamErrors.add_tests('testStreamFileErrors', '.stream-error')
+TestReaderErrors.add_tests('testReaderUnicodeErrors', '.stream-error')
+TestReaderErrors.add_tests('testReaderStringErrors', '.stream-error')
+TestReaderErrors.add_tests('testReaderFileErrors', '.stream-error')