Let's not forget unit testing

nixxquality · May 2, 2014 · 1f1a52f · 1f1a52f
1 parent be19cd3
commit 1f1a52f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/FFMSsharp.Tests/UnitTest1.cs b/FFMSsharp.Tests/UnitTest1.cs
@@ -47,7 +47,7 @@ public void IndexerMatroska()
         }
 
         [TestMethod]
-        [ExpectedException(typeof(FFMSFileReadException))] // Yes. This surprised me too. It's not a NO_FILE error.
+        [ExpectedException(typeof(FileLoadException))]
         public void IndexerFileNotFound()
         {
             Indexer indexer = new Indexer("this file doesn't exist.avi");
@@ -170,6 +170,30 @@ public void VideoSourceAndAPIFunctions()
             Assert.AreEqual(71.939, source.LastTime);
         }
 
+        [TestMethod]
+        [ExpectedException(typeof(FileLoadException))]
+        public void VideoSourceFileLoadException()
+        {
+            Index index = new Index("h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.ffindex");
+            VideoSource source = index.VideoSource("this file doesn't exist.avi", 0);
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(ArgumentException))]
+        public void VideoSourceArgumentException()
+        {
+            Index index = new Index("h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.ffindex");
+            VideoSource source = index.VideoSource("h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv", 10);
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void VideoSourceInvalidOperationException()
+        {
+            Index index = new Index("h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.ffindex");
+            VideoSource source = index.VideoSource("h264_720p_hp_3.1_600kbps_aac_mp3_dual_audio_harry_potter.mkv", 0);
+        }
+
         [TestMethod]
         [ExpectedException(typeof(ArgumentOutOfRangeException))]
         public void VideoSourceGetFrameIntOutOfRange()

diff --git a/FFMSsharp/FFMSsharp.xml b/FFMSsharp/FFMSsharp.xml
diff --git a/FFMSsharp/Index.cs b/FFMSsharp/Index.cs
@@ -448,6 +448,7 @@ public bool BelongsToFile(string sourceFile)
         /// <seealso cref="AudioSource"/>
         /// <seealso cref="GetFirstTrackOfType"/>
         /// <seealso cref="GetFirstIndexedTrackOfType"/>
+        /// <exception cref="System.IO.FileLoadException">Failure to open the <paramref name="sourceFile"/></exception>
         /// <exception cref="ArgumentException">Trying to make a VideoSource out of an invalid track</exception>
         /// <exception cref="InvalidOperationException">Supplying the wrong <paramref name="sourceFile"/></exception>
         public VideoSource VideoSource(string sourceFile, int track, int threads = 1, SeekMode seekMode = SeekMode.Normal)
@@ -461,6 +462,8 @@ public VideoSource VideoSource(string sourceFile, int track, int threads = 1, Se
 
             if (videoSource == IntPtr.Zero)
             {
+                if (err.ErrorType == FFMS_Errors.FFMS_ERROR_PARSER && err.SubType == FFMS_Errors.FFMS_ERROR_FILE_READ)
+                    throw new System.IO.FileLoadException(err.Buffer);
                 if (err.ErrorType == FFMS_Errors.FFMS_ERROR_INDEX && err.SubType == FFMS_Errors.FFMS_ERROR_INVALID_ARGUMENT)
                     throw new ArgumentException(err.Buffer);
                 if (err.ErrorType == FFMS_Errors.FFMS_ERROR_INDEX && err.SubType == FFMS_Errors.FFMS_ERROR_FILE_MISMATCH)