fix subtitle unit tests

3 files changed, 19 insertions, 16 deletions

diff --git a/MediaBrowser.Tests/MediaEncoding/Subtitles/SsaParserTests.cs b/MediaBrowser.Tests/MediaEncoding/Subtitles/AssParserTests.cs
index d869146fd..17687bc3a 100644
--- a/MediaBrowser.Tests/MediaEncoding/Subtitles/SsaParserTests.cs
+++ b/MediaBrowser.Tests/MediaEncoding/Subtitles/AssParserTests.cs
@@ -1,14 +1,13 @@
-using System;
+using MediaBrowser.MediaEncoding.Subtitles;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
-using MediaBrowser.MediaEncoding.Subtitles;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace MediaBrowser.Tests.MediaEncoding.Subtitles {
 
     [TestClass]
-    public class SsaParserTests {
+    public class AssParserTests {
 
         [TestMethod]
         public void TestParse() {
@@ -21,7 +20,7 @@ namespace MediaBrowser.Tests.MediaEncoding.Subtitles {
                                                                                                                     StartPositionTicks = 24000000,
                                                                                                                     EndPositionTicks = 72000000,
                                                                                                                     Text =
-                                                                                                                        "Senator, we're <br />making our final <br />approach into Coruscant."
+                                                                                                                        "Senator, we're "+ParserValues.NewLine+"making our final "+ParserValues.NewLine+"approach into Coruscant."
                                                                                                                 },
                                                                                          new SubtitleTrackEvent {
                                                                                                                     Id = "2",
@@ -34,14 +33,14 @@ namespace MediaBrowser.Tests.MediaEncoding.Subtitles {
                                                                                                                     Id = "3",
                                                                                                                     StartPositionTicks = 150400000,
                                                                                                                     EndPositionTicks = 180400000,
-                                                                                                                    Text = "It's <br />a <br />trap!"
+                                                                                                                    Text = "It's "+ParserValues.NewLine+"a "+ParserValues.NewLine+"trap!"
                                                                                                                 }
                                                                                      }
                                       };
 
             var sut = new AssParser();
 
-            var stream = File.OpenRead(@"MediaEncoding\Subtitles\TestSubtitles\data.ssa");
+            var stream = File.OpenRead(@"MediaEncoding\Subtitles\TestSubtitles\data.ass");
 
             var result = sut.Parse(stream, CancellationToken.None);
 
diff --git a/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs b/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs
index 2c2c944b1..6724ca597 100644
--- a/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs
+++ b/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs
@@ -5,17 +5,21 @@ using System.Threading;
 using MediaBrowser.MediaEncoding.Subtitles;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace MediaBrowser.Tests.MediaEncoding.Subtitles {
+namespace MediaBrowser.Tests.MediaEncoding.Subtitles
+{
 
     [TestClass]
-    public class SrtParserTests {
+    public class SrtParserTests
+    {
 
         [TestMethod]
-        public void TestParse() {
+        public void TestParse()
+        {
 
             var expectedSubs =
-                new SubtitleTrackInfo {
-                                          TrackEvents = new List<SubtitleTrackEvent> {
+                new SubtitleTrackInfo
+                {
+                    TrackEvents = new List<SubtitleTrackEvent> {
                                                                                          new SubtitleTrackEvent {
                                                                                                                     Id = "1",
                                                                                                                     StartPositionTicks = 24000000,
@@ -28,7 +32,7 @@ namespace MediaBrowser.Tests.MediaEncoding.Subtitles {
                                                                                                                     StartPositionTicks = 157120000,
                                                                                                                     EndPositionTicks = 173990000,
                                                                                                                     Text =
-                                                                                                                        "Oh my god, Watch out!<br />It's coming!!"
+                                                                                                                        "Oh my god, Watch out!"+ParserValues.NewLine+"It's coming!!"
                                                                                                                 },
                                                                                          new SubtitleTrackEvent {
                                                                                                                     Id = "3",
@@ -48,7 +52,7 @@ namespace MediaBrowser.Tests.MediaEncoding.Subtitles {
                                                                                                                     StartPositionTicks = 320000000,
                                                                                                                     EndPositionTicks = 329990000,
                                                                                                                     Text =
-                                                                                                                        "This is a<br />new line, as is<br />this"
+                                                                                                                        "This is a"+ParserValues.NewLine+"new line, as is"+ParserValues.NewLine+"this"
                                                                                                                 },
                                                                                          new SubtitleTrackEvent {
                                                                                                                     Id = "6",
@@ -86,7 +90,7 @@ namespace MediaBrowser.Tests.MediaEncoding.Subtitles {
                                                                                                                         "Greater than (&lt;) and less than (&gt;) are shown"
                                                                                                                 }
                                                                                      }
-                                      };
+                };
 
             var sut = new SrtParser();
 
@@ -95,7 +99,7 @@ namespace MediaBrowser.Tests.MediaEncoding.Subtitles {
             var result = sut.Parse(stream, CancellationToken.None);
 
             Assert.IsNotNull(result);
-            Assert.AreEqual(expectedSubs.TrackEvents.Count,result.TrackEvents.Count);
+            Assert.AreEqual(expectedSubs.TrackEvents.Count, result.TrackEvents.Count);
             for (int i = 0; i < expectedSubs.TrackEvents.Count; i++)
             {
                 Assert.AreEqual(expectedSubs.TrackEvents[i].Id, result.TrackEvents[i].Id);
diff --git a/MediaBrowser.Tests/MediaEncoding/Subtitles/TestSubtitles/data.ssa b/MediaBrowser.Tests/MediaEncoding/Subtitles/TestSubtitles/data.ass
index 3114a844a..3114a844a 100644
--- a/MediaBrowser.Tests/MediaEncoding/Subtitles/TestSubtitles/data.ssa
+++ b/MediaBrowser.Tests/MediaEncoding/Subtitles/TestSubtitles/data.ass