Merges Album and AlbumDescription

2016-01-19 18:18:24 +01:00
parent 53b2d9c07b
commit 719a3cf82e
9 changed files with 402 additions and 555 deletions
--- a/album_test.go
+++ b/album_test.go
@@ -11,120 +11,3 @@ func Test(t *testing.T) { TestingT(t) }
 type AlbumSuite struct{}

 var _ = Suite(&AlbumSuite{})
-
-func (s *AlbumSuite) TestSanitazation(c *C) {
-	data := map[string]string{
-		"Le cycle de l'eau - I":         "Le-cycle-de-l-eau-I",
-		"Nef des fous":                  "Nef-des-fous",
-		"Oiseau noir":                   "Oiseau-noir",
-		"Foo":                           "Foo",
-		"Nuit de l'étoile":              "Nuit-de-l-etoile",
-		"Mon Père saigne l'Histoire":    "Mon-Pere-saigne-l-Histoire",
-		"Les disparus d'apostrophes !":  "Les-disparus-d-apostrophes",
-		"Eden - It's an Endless World!": "Eden-It-s-an-Endless-World",
-		"100.000 femmes":                "100000-femmes",
-	}
-
-	for title, expected := range data {
-		san := sanitizeTitleString(title)
-		c.Check(san, Equals, expected, Commentf("Processing '%s'", title))
-	}
-}
-
-func (s *AlbumSuite) TestBedecomURI(c *C) {
-	data := map[string]Album{
-		"BD-Okko-Tome-1-Le-cycle-de-l-eau-I-41693.html": Album{
-			ID:     41693,
-			ISBN:   "2-84789-164-1",
-			Series: "Okko",
-			Title:  "Le cycle de l'eau - I",
-			Num:    1,
-			NumA:   "",
-		},
-		"BD-Nef-des-fous-Tome-3-Turbulences-950.html": Album{
-			ID:     950,
-			ISBN:   "2840551292",
-			Series: "Nef des fous (La)",
-			Title:  "Turbulences",
-			Num:    3,
-			NumA:   "",
-		},
-		"BD-Oiseau-noir-21819.html": Album{
-			ID:     21819,
-			ISBN:   "2-8001-1949-7",
-			Series: "Oiseau noir (L')",
-			Title:  "L'oiseau noir",
-			Num:    -1,
-			NumA:   "",
-		},
-		"BD-Nuit-de-l-etoile-8103.html": Album{
-			ID:     8103,
-			ISBN:   "2-905035-25-0",
-			Series: "Nuit de l'étoile (La)",
-			Title:  "La nuit de l'étoile",
-			Num:    -1,
-			NumA:   "",
-		},
-		"BD-Nef-des-fous-HS03-Le-petit-Roy-1387.html": Album{
-			ID:     1387,
-			ISBN:   "2-84055-142-X",
-			Series: "Nef des fous (La)",
-			Title:  "Le petit Roy",
-			Num:    -1,
-			NumA:   "HS03",
-		},
-		"BD-Maus-Tome-1-Mon-Pere-saigne-l-Histoire-17248.html": Album{
-			ID:     17248,
-			ISBN:   "2080660292",
-			Series: "Maus",
-			Title:  "Mon Père saigne l'Histoire",
-			Num:    1,
-			NumA:   "",
-		},
-		"BD-Iriacynthe-Tome-1a-11975.html": Album{
-			ID:     11975,
-			ISBN:   "2-203-33844-X",
-			Series: "Iriacynthe",
-			Title:  "Iriacynthe",
-			Num:    1,
-			NumA:   "a",
-		},
-		"BD-Jack-Palmer-Tome-4-Les-disparus-d-apostrophes-7023.html": Album{
-			ID:     7023,
-			ISBN:   "2205022350",
-			Series: "Jack Palmer",
-			Title:  "Les disparus d'apostrophes !",
-			Num:    4,
-			NumA:   "",
-		},
-		"BD-Eden-It-s-an-Endless-World-Tome-4-Vengeance-19912.html": Album{
-			ID:     19912,
-			ISBN:   "2845380429",
-			Series: "Eden - It's an Endless World!",
-			Title:  "Vengeance",
-			Num:    4,
-			NumA:   "",
-		},
-		"BD-100000-femmes-Tome-1-100000-femmes-les-175515.html": Album{
-			ID:     175515,
-			ISBN:   "978-2-917456-30-9",
-			Series: "100.000 femmes (Les)",
-			Title:  "100.000 femmes (les)",
-			Num:    1,
-			NumA:   "",
-		},
-		"BD-Catalogues-Expositions-Brassens-ou-la-liberte-124218.html": Album{
-			ID:     124218,
-			ISBN:   "9782205066975",
-			Series: "(Catalogues) Expositions",
-			Title:  "Brassens ou la liberté",
-			Num:    -1,
-			NumA:   "",
-		},
-	}
-
-	for expectedURL, album := range data {
-		url := album.GetBedethequeComURI()
-		c.Check(url, Equals, expectedURL)
-	}
-}