From 3160d2b5c7b21e5407ca683d36d8c0d7eded9630 Mon Sep 17 00:00:00 2001
From: Nguyen Dan Phuong <nguyendanphuong@live.com>
Date: Sat, 6 Aug 2016 22:46:51 +0700
Subject: [PATCH] Fix #7 added more assert in unit tests. Fix a bug in
 MangaShare for missing first image of every chapter.

---
 MangaRipper.Core/MangaShareService.cs |  2 +-
 MangaRipper.Test/UnitTest.cs          | 42 ++++++++++++++++++---------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/MangaRipper.Core/MangaShareService.cs b/MangaRipper.Core/MangaShareService.cs
index e31e326..061e2e1 100644
--- a/MangaRipper.Core/MangaShareService.cs
+++ b/MangaRipper.Core/MangaShareService.cs
@@ -35,7 +35,7 @@ public async Task<IList<string>> FindImanges(Chapter chapter, IProgress<int> pro
             string regExPages = @"<select name=""pagejump"" class=""page"" onchange=""javascript:window.location='(?<Value>[^']+)'\+this\.value\+'\.html';"">";
             var pageBase = parser.Parse(regExPages, input, "Value").FirstOrDefault();
 
-            var pagesExtend = parser.Parse(@"<option value=""(?<FileName>\d+)"">Page \d+</option>", input, "FileName");
+            var pagesExtend = parser.Parse(@"<option value=""(?<FileName>\d+)""(| selected=""selected"")>Page \d+</option>", input, "FileName");
 
             // transform pages link
             pagesExtend = pagesExtend.Select(p =>
diff --git a/MangaRipper.Test/UnitTest.cs b/MangaRipper.Test/UnitTest.cs
index 80c4981..c59ab58 100644
--- a/MangaRipper.Test/UnitTest.cs
+++ b/MangaRipper.Test/UnitTest.cs
@@ -30,16 +30,18 @@ public async Task MangaReader_Test()
             var chapters = await service.FindChapters(url, new Progress<int>(), source.Token);
             Assert.IsTrue(chapters.Count > 0, "Cannot find chapters.");
             // Test chapters are in correct order.
-            var lastChapter = chapters.Last();
-            Assert.AreEqual("Naruto 1", lastChapter.Name);
+            var chapter = chapters.Last();
+            Assert.AreEqual("Naruto 1", chapter.Name);
+            Assert.AreEqual("http://www.mangareader.net/naruto/1", chapter.Link);
             // Test there're no duplicated chapters.
             var anyDuplicated = chapters.GroupBy(x => x.Link).Any(g => g.Count() > 1);
             Assert.IsFalse(anyDuplicated, "There're duplicated chapters.");
             // Test service can find images.
-            var firstChapter = chapters.First();
-            var images = await service.FindImanges(firstChapter, new Progress<int>(), source.Token);
-            Assert.IsTrue(images.Count > 0, "Cannot find images.");
-            
+            var images = await service.FindImanges(chapter, new Progress<int>(), source.Token);
+            Assert.AreEqual(53, images.Count);
+            Assert.AreEqual("http://i10.mangareader.net/naruto/1/naruto-1564773.jpg", images[0]);
+            Assert.AreEqual("http://i4.mangareader.net/naruto/1/naruto-1564774.jpg", images[1]);
+            Assert.AreEqual("http://i1.mangareader.net/naruto/1/naruto-1564825.jpg", images[52]);
         }
 
         [TestMethod]
@@ -51,9 +53,14 @@ public async Task MangaFox_Test()
             var service = Framework.GetService(url);
             var chapters = await service.FindChapters(url, new Progress<int>(), source.Token);
             Assert.IsTrue(chapters.Count > 0, "Cannot find chapters.");
-            var chapter = chapters[0];
+            var chapter = chapters.Last();
+            Assert.AreEqual("Tian Jiang Xian Shu Nan 1", chapter.Name);
+            Assert.AreEqual("http://mangafox.me/manga/tian_jiang_xian_shu_nan/c001/1.html", chapter.Link);
             var images = await service.FindImanges(chapter, new Progress<int>(), source.Token);
-            Assert.IsTrue(images.Count > 0, "Cannot find images.");
+            Assert.AreEqual(15, images.Count);
+            Assert.AreEqual("http://h.mfcdn.net/store/manga/19803/001.0/compressed/q001.jpg", images[0]);
+            Assert.AreEqual("http://h.mfcdn.net/store/manga/19803/001.0/compressed/q002.jpg", images[1]);
+            Assert.AreEqual("http://h.mfcdn.net/store/manga/19803/001.0/compressed/q015.jpg", images[14]);
         }
 
         [TestMethod]
@@ -63,10 +70,14 @@ public async Task MangaHere_Test()
             var service = Framework.GetService(url);
             var chapters = await service.FindChapters(url, new Progress<int>(), source.Token);
             Assert.IsTrue(chapters.Count > 0, "Cannot find chapters.");
-            var chapter = chapters.First();
-            Assert.IsTrue(chapter.Name.Length > 0, "Chapter's name is empty string.");
+            var chapter = chapters.Last();
+            Assert.AreEqual("The God Of High School 1", chapter.Name);
+            Assert.AreEqual("http://www.mangahere.co/manga/the_god_of_high_school/c001/", chapter.Link);
             var images = await service.FindImanges(chapter, new Progress<int>(), source.Token);
-            Assert.IsTrue(images.Count > 0, "Cannot find images.");
+            Assert.AreEqual(55, images.Count);
+            Assert.AreEqual("http://h.mhcdn.net/store/manga/9275/001.0/compressed/m001.01.jpg", images[0]);
+            Assert.AreEqual("http://h.mhcdn.net/store/manga/9275/001.0/compressed/m001.02.jpg", images[1]);
+            Assert.AreEqual("http://h.mhcdn.net/store/manga/9275/001.0/compressed/m001.55.jpg", images[54]);
         }
 
         [TestMethod]
@@ -76,9 +87,14 @@ public async Task MangaShare_Test()
             var service = Framework.GetService(url);
             var chapters = await service.FindChapters(url, new Progress<int>(), source.Token);
             Assert.IsTrue(chapters.Count > 0, "Cannot find chapters.");
-            var chapter = chapters[0];
+            var chapter = chapters.Last();
+            Assert.AreEqual("Beelzebub 1", chapter.Name);
+            Assert.AreEqual("http://read.mangashare.com/Beelzebub/chapter-001/page001.html", chapter.Link);
             var images = await service.FindImanges(chapter, new Progress<int>(), source.Token);
-            Assert.IsTrue(images.Count > 0, "Cannot find images.");
+            Assert.AreEqual(58, images.Count);
+            Assert.AreEqual("http://dl01.mangashare.com/manga/Beelzebub/001/001.jpg", images[0]);
+            Assert.AreEqual("http://dl01.mangashare.com/manga/Beelzebub/001/002.jpg", images[1]);
+            Assert.AreEqual("http://dl01.mangashare.com/manga/Beelzebub/001/058.jpg", images[57]);
         }
     }
 }