X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Flwn-epub.git;a=blobdiff_plain;f=src%2FMain.hs;h=924b9a558dd59df682d9cbdb3713fceaad0b27f1;hp=47c69fa1cba9ade063d2b63bea22fe800b33a4e9;hb=b18c060e5cb708901eb29f1f27b25c467875a143;hpb=ebedcdb6b1b8925dcfb5700d076f25743fac8645

diff --git a/src/Main.hs b/src/Main.hs
index 47c69fa..924b9a5 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -11,13 +11,16 @@ import System.IO (
   stdout
   )
 import System.IO.UTF8 (readFile)
+import Test.HUnit (Assertion, assertEqual)
+import Test.Framework (Test, testGroup)
+import Test.Framework.Providers.HUnit (testCase)
 import Text.Regex.Posix ((=~))
 import Text.XML.HXT.Core
 
 import CommandLine (show_help)
 import Configuration (Cfg(..), get_cfg)
 import LWN.Page
-import LWN.URI (is_lwn_url, make_absolute_url)
+import LWN.URI (is_lwn_url, make_absolute_url, make_https)
 import Misc (contains)
 
 
@@ -70,16 +73,16 @@ real_article_path s = do
       case make_absolute_url "current" of
         Nothing -> s
         Just ac -> ac
-    abs_s =
-      case make_absolute_url s of
+    abs_article =
+      case make_absolute_url ("Articles/" ++ s) of
         Nothing -> s
         Just as -> as
 
     check_cases :: String
     check_cases
-      | is_lwn_url s = s
+      | is_lwn_url s = make_https s
       | s `contains` "current" = abs_current
-      | s =~ "^[0-9]+$" = abs_s
+      | s =~ "^[0-9]+$" = abs_article
       | otherwise = s -- Give up
 
 main :: IO ()
@@ -101,3 +104,39 @@ main = do
     Nothing -> do
       _ <- show_help
       return ()
+
+
+
+test_current_article_path :: Assertion
+test_current_article_path = do
+  let expected = "https://lwn.net/current"
+  actual <- real_article_path "current"
+  assertEqual "Current article path constructed" expected actual
+
+test_numbered_article_path :: Assertion
+test_numbered_article_path = do
+  let expected = "https://lwn.net/Articles/69"
+  actual <- real_article_path "69" -- I'm twelve
+  assertEqual "Numbered article path constructed" expected actual
+
+
+test_full_article_path :: Assertion
+test_full_article_path = do
+  let expected = "https://lwn.net/Articles/502979/"
+  actual <- real_article_path "https://lwn.net/Articles/502979/"
+  assertEqual "Full article path left alone" expected actual
+
+test_non_https_article_path :: Assertion
+test_non_https_article_path = do
+  let expected = "https://lwn.net/Articles/502979/"
+  actual <- real_article_path "http://lwn.net/Articles/502979/"
+  assertEqual "Non-https URL made https" expected actual
+
+main_tests :: Test
+main_tests =
+  testGroup "Main Tests" [
+    testCase "Current article path constructed" test_current_article_path,
+    testCase "Numbered article path constructed" test_numbered_article_path,
+    testCase "Full article path left alone" test_full_article_path,
+    testCase "Non-https URL made https" test_non_https_article_path ]
+     
\ No newline at end of file