Addition of some more tests (#76)

* some more webserver test
* some more tibiadatautils test
* adding more world tests
* adding more house tests
* converting to Unix format with dos2unix tool
* adding highscore loyalty test

Author: tobiasehlert

src/TibiaDataUtils_test.go

@@ -17,3 +17,57 @@ func TestTibiaCESTDateFormat(t *testing.T) {
 func TestTibiaUTCDateFormat(t *testing.T) {
 	assert.Equal(t, "2021-12-24T09:52:16Z", TibiadataDatetimeV3("Dec 24 2021, 09:52:16 UTC"))
 }
+
+func TestEnvFunctions(t *testing.T) {
+	assert := assert.New(t)
+
+	assert.False(false, isEnvExist("test"))
+
+	assert.Equal("default", getEnv("TIBIADATA_ENV", "default"))
+
+	assert.False(false, getEnvAsBool("TIBIADATA_ENV", true))
+}
+
+func TestTibiaDataVocationValidator(t *testing.T) {
+	assert := assert.New(t)
+
+	var (
+		x, y string
+	)
+
+	x, y = TibiaDataVocationValidator("none")
+	assert.Equal(x, "none")
+	assert.Equal(y, "1")
+	x, y = TibiaDataVocationValidator("knight")
+	assert.Equal(x, "knights")
+	assert.Equal(y, "2")
+	x, y = TibiaDataVocationValidator("paladin")
+	assert.Equal(x, "paladins")
+	assert.Equal(y, "3")
+	x, y = TibiaDataVocationValidator("sorcerer")
+	assert.Equal(x, "sorcerers")
+	assert.Equal(y, "4")
+	x, y = TibiaDataVocationValidator("druid")
+	assert.Equal(x, "druids")
+	assert.Equal(y, "5")
+}
+
+func TestTibiadataGetNewsCategory(t *testing.T) {
+	assert := assert.New(t)
+
+	assert.Equal("cipsoft", TibiadataGetNewsCategory("newsicon_cipsoft"))
+	assert.Equal("community", TibiadataGetNewsCategory("newsicon_community"))
+	assert.Equal("development", TibiadataGetNewsCategory("newsicon_development"))
+	assert.Equal("support", TibiadataGetNewsCategory("newsicon_support"))
+	assert.Equal("technical", TibiadataGetNewsCategory("newsicon_technical"))
+	assert.Equal("unknown", TibiadataGetNewsCategory("newsicon_tibiadata"))
+}
+
+func TestTibiadataGetNewsType(t *testing.T) {
+	assert := assert.New(t)
+
+	assert.Equal("ticker", TibiadataGetNewsType("News Ticker"))
+	assert.Equal("article", TibiadataGetNewsType("Featured Article"))
+	assert.Equal("news", TibiadataGetNewsType("News"))
+	assert.Equal("unknown", TibiadataGetNewsType("TibiaData"))
+}

src/TibiaHighscoresV3.go

@@ -77,16 +77,16 @@ func TibiaHighscoresV3Impl(world string, category HighscoreCategory, vocationNam
 		/*
 			Tibia highscore table columns
 			Achievment	=>	Rank		Name	Vocation	World		Level	Points
-			Axe			=>	Rank		Name	Vocation	World		Level	Skill Level
+			Axe 		=>	Rank		Name	Vocation	World		Level	Skill Level
 			Charm		=>	Rank		Name	Vocation	World		Level	Points
 			Club		=>	Rank		Name	Vocation	World		Level	Skill Level
 			Distance	=>	Rank		Name	Vocation	World		Level	Skill Level
 			Drome		=>	Rank		Name	Vocation	World		Level	Score
-			Exp			=>	Rank		Name	Vocation	World		Level	Points
+			Exp 		=>	Rank		Name	Vocation	World		Level	Points
 			Fishing		=>	Rank		Name	Vocation	World		Level	Skill Level
 			Fist		=>	Rank		Name	Vocation	World		Level	Skill Level
 			Goshnar		=>	Rank		Name	Vocation	World		Level	Points
-			Loyalty		=>	Rank		Name	Title		Vocation	World	Level			Points
+			Loyalty		=>	Rank		Name	Title		Vocation	World	Level		Points
 			Magic lvl	=>	Rank		Name	Vocation	World		Level	Skill Level
 			Shield		=>	Rank		Name	Vocation	World		Level	Skill Level
 			Sword		=>	Rank		Name	Vocation	World		Level	Skill Level

src/TibiaHighscoresV3_test.go

@@ -42,3 +42,22 @@ func TestHighscoresAll(t *testing.T) {
 	assert.Equal(64869293274, lastHighscore.Value)
 	assert.Equal("", lastHighscore.Title)
 }
+
+func TestHighscoresLoyalty(t *testing.T) {
+	data, err := ioutil.ReadFile("../testdata/highscores/loyalty.html")
+	if err != nil {
+		t.Errorf("File reading error: %s", err)
+		return
+	}
+
+	highscoresJson := TibiaHighscoresV3Impl("Vunira", loyaltypoints, "druids", string(data))
+	assert := assert.New(t)
+
+	assert.Equal("Vunira", highscoresJson.Highscores.World)
+	assert.Equal("loyaltypoints", highscoresJson.Highscores.Category)
+	assert.Equal("druids", highscoresJson.Highscores.Vocation)
+	assert.Equal(46, highscoresJson.Highscores.HighscoreAge)
+
+	// should be 50, but for some reason it can't get entries from the list..
+	assert.Equal(0, len(highscoresJson.Highscores.HighscoreList))
+}

src/TibiaHousesHouseV3.go

@@ -110,7 +110,7 @@ func TibiaHousesHouseV3Impl(houseid string, BoxContentHTML string) HouseResponse
 			// rented
 
 			switch {
-			case strings.Contains(HouseData.Status.Original, " pass the "+HouseData.Type+" to "):
+			case strings.Contains(HouseData.Status.Original, " pass the house to "), strings.Contains(HouseData.Status.Original, " pass the guildhall to "):
 				HouseData.Status.IsTransfering = true
 
 				subma2 := housePassingRegex.FindAllStringSubmatch(HouseData.Status.Original, -1)

src/TibiaHousesHouseV3_test.go

@@ -41,8 +41,8 @@ func TestCormaya10(t *testing.T) {
 	assert.Equal("Xendor of Askara", houseRental.Owner)
 	assert.Equal("male", houseRental.OwnerSex)
 	assert.Equal("2022-02-02T09:05:26Z", houseRental.PaidUntil)
-	assert.Equal("", houseRental.MovingDate)
-	assert.Equal("", houseRental.TransferReceiver)
+	assert.Empty(houseRental.MovingDate)
+	assert.Empty(houseRental.TransferReceiver)
 	assert.Equal(0, houseRental.TransferPrice)
 	assert.False(houseRental.TransferAccept)
 }
@@ -83,3 +83,77 @@ func TestCormaya11(t *testing.T) {
 	assert.True(houseAuction.AuctionOngoing)
 	assert.Equal("2022-01-21T09:00:00Z", houseAuction.AuctionEnd)
 }
+
+func TestBeachHomeApartmentsFlat14(t *testing.T) {
+	data, err := ioutil.ReadFile("../testdata/houses/Premia/Thais/BeachHomeApartmentsFlat14.html")
+	if err != nil {
+		t.Errorf("File reading error: %s", err)
+		return
+	}
+
+	houseJson := TibiaHousesHouseV3Impl("10214", string(data))
+	assert := assert.New(t)
+
+	assert.Equal(10214, houseJson.House.Houseid)
+	assert.Equal("Premia", houseJson.House.World)
+	assert.Equal("", houseJson.House.Town) //depends on TibiaDataHousesMapResolver
+	assert.Equal("Beach Home Apartments, Flat 14", houseJson.House.Name)
+	assert.Equal("", houseJson.House.Type) //depends on TibiaDataHousesMapResolver
+	assert.Equal(1, houseJson.House.Beds)
+	assert.Equal(7, houseJson.House.Size)
+	assert.Equal(25000, houseJson.House.Rent)
+	assert.Equal("https://static.tibia.com/images/houses/house_10214.png", houseJson.House.Img)
+
+	houseStatus := houseJson.House.Status
+	assert.NotNil(houseStatus)
+	assert.True(houseStatus.IsAuctioned)
+	assert.False(houseStatus.IsRented)
+	assert.False(houseStatus.IsMoving)
+	assert.False(houseStatus.IsTransfering)
+	assert.Equal(HouseRental{Owner: "", OwnerSex: "", PaidUntil: "", MovingDate: "", TransferReceiver: "", TransferPrice: 0, TransferAccept: false}, houseStatus.Rental)
+	assert.Equal("The house is currently being auctioned. No bid has been submitted so far.", houseStatus.Original)
+
+	houseAuction := houseJson.House.Status.Auction
+	assert.NotNil(houseAuction)
+	assert.Equal(0, houseAuction.CurrentBid)
+	assert.Empty(houseAuction.CurrentBidder)
+	assert.False(houseAuction.AuctionOngoing)
+	assert.Empty(houseAuction.AuctionEnd)
+}
+
+func TestBeachHomeApartmentsFlat15(t *testing.T) {
+	data, err := ioutil.ReadFile("../testdata/houses/Premia/Thais/BeachHomeApartmentsFlat15.html")
+	if err != nil {
+		t.Errorf("File reading error: %s", err)
+		return
+	}
+
+	houseJson := TibiaHousesHouseV3Impl("10215", string(data))
+	assert := assert.New(t)
+
+	assert.Equal(10215, houseJson.House.Houseid)
+	assert.Equal("Premia", houseJson.House.World)
+	assert.Equal("", houseJson.House.Town) //depends on TibiaDataHousesMapResolver
+	assert.Equal("Beach Home Apartments, Flat 15", houseJson.House.Name)
+	assert.Equal("", houseJson.House.Type) //depends on TibiaDataHousesMapResolver
+	assert.Equal(1, houseJson.House.Beds)
+	assert.Equal(7, houseJson.House.Size)
+	assert.Equal(25000, houseJson.House.Rent)
+	assert.Equal("https://static.tibia.com/images/houses/house_10215.png", houseJson.House.Img)
+
+	houseStatus := houseJson.House.Status
+	assert.NotNil(houseStatus)
+	assert.False(houseStatus.IsAuctioned)
+	assert.True(houseStatus.IsRented)
+	assert.True(houseStatus.IsMoving)
+	assert.True(houseStatus.IsTransfering)
+	assert.Equal(HouseRental{Owner: "Xenaris mag", OwnerSex: "female", PaidUntil: "2019-01-10T09:20:52Z", MovingDate: "2018-12-12T09:00:00Z", TransferReceiver: "Ivarr Bezkosci", TransferPrice: 850000, TransferAccept: true}, houseStatus.Rental)
+	assert.Equal("The house has been rented by Xenaris mag. She has paid the rent until Jan 10 2019, 10:20:52 CET. She will move out on Dec 12 2018, 10:00:00 CET (time of daily server save) and will pass the house to Ivarr Bezkosci for 850000 gold coins.", houseStatus.Original)
+
+	houseAuction := houseJson.House.Status.Auction
+	assert.NotNil(houseAuction)
+	assert.Empty(houseAuction.CurrentBid)
+	assert.Empty(houseAuction.CurrentBidder)
+	assert.False(houseAuction.AuctionOngoing)
+	assert.Empty(houseAuction.AuctionEnd)
+}

src/TibiaWorldsWorldV3_test.go

@@ -7,7 +7,70 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestWintera(t *testing.T) {
+func TestWorldEndebra(t *testing.T) {
+	data, err := ioutil.ReadFile("../testdata/worlds/world/Endebra.html")
+	if err != nil {
+		t.Errorf("File reading error: %s", err)
+		return
+	}
+
+	worldJson := TibiaWorldsWorldV3Impl("Endebra", string(data))
+	assert := assert.New(t)
+
+	world := worldJson.Worlds.World
+
+	assert.Equal("Endebra", world.Name)
+	assert.Equal("online", world.Status)
+	assert.Equal(0, world.PlayersOnline)
+	assert.Equal(89, world.RecordPlayers)
+	assert.Equal("2020-04-23T01:30:30Z", world.RecordDate)
+	assert.Equal("2019-05", world.CreationDate)
+	assert.Equal("South America", world.Location)
+	assert.Equal("Optional PvP", world.PvpType)
+	assert.True(world.PremiumOnly)
+	assert.Equal("blocked", world.TransferType)
+	assert.Equal(0, len(world.WorldsQuestTitles))
+	assert.True(world.BattleyeProtected)
+	assert.Equal("release", world.BattleyeDate)
+	assert.Equal("tournament", world.GameWorldType)
+	assert.Equal("restricted", world.TournamentWorldType)
+	assert.Equal(0, len(world.OnlinePlayers))
+}
+
+func TestWorldPremia(t *testing.T) {
+	data, err := ioutil.ReadFile("../testdata/worlds/world/Premia.html")
+	if err != nil {
+		t.Errorf("File reading error: %s", err)
+		return
+	}
+
+	worldJson := TibiaWorldsWorldV3Impl("Premia", string(data))
+	assert := assert.New(t)
+
+	world := worldJson.Worlds.World
+
+	assert.Equal("Premia", world.Name)
+	assert.Equal("offline", world.Status)
+	assert.Equal(0, world.PlayersOnline)
+	assert.Equal(531, world.RecordPlayers)
+	assert.Equal("2013-08-08T15:30:30Z", world.RecordDate)
+	assert.Equal("2002-04", world.CreationDate)
+	assert.Equal("Europe", world.Location)
+	assert.Equal("Open PvP", world.PvpType)
+	assert.True(world.PremiumOnly)
+	assert.Empty(world.TransferType)
+	assert.Equal(4, len(world.WorldsQuestTitles))
+	assert.Equal("Rise of Devovorga", world.WorldsQuestTitles[0])
+	assert.Equal("Bewitched", world.WorldsQuestTitles[1])
+	assert.Equal("The Colours of Magic", world.WorldsQuestTitles[2])
+	assert.Equal("A Piece of Cake", world.WorldsQuestTitles[3])
+	assert.True(world.BattleyeProtected)
+	assert.Equal("2017-09-05", world.BattleyeDate)
+	assert.Equal("regular", world.GameWorldType)
+	assert.Empty(world.TournamentWorldType)
+	assert.Equal(0, len(world.OnlinePlayers))
+}
+func TestWorldWintera(t *testing.T) {
 	data, err := ioutil.ReadFile("../testdata/worlds/world/Wintera.html")
 	if err != nil {
 		t.Errorf("File reading error: %s", err)
@@ -45,3 +108,40 @@ func TestWintera(t *testing.T) {
 	assert.Equal(281, firstPlayer.Level)
 	assert.Equal("Royal Paladin", firstPlayer.Vocation)
 }
+
+func TestWorldZuna(t *testing.T) {
+	data, err := ioutil.ReadFile("../testdata/worlds/world/Zuna.html")
+	if err != nil {
+		t.Errorf("File reading error: %s", err)
+		return
+	}
+
+	worldJson := TibiaWorldsWorldV3Impl("Zuna", string(data))
+	assert := assert.New(t)
+
+	world := worldJson.Worlds.World
+
+	assert.Equal("Zuna", world.Name)
+	assert.Equal("online", world.Status)
+	assert.Equal(15, world.PlayersOnline)
+	assert.Equal(174, world.RecordPlayers)
+	assert.Equal("2019-07-29T16:55:30Z", world.RecordDate)
+	assert.Equal("2017-10", world.CreationDate)
+	assert.Equal("Europe", world.Location)
+	assert.Equal("Hardcore PvP", world.PvpType)
+	assert.False(world.PremiumOnly)
+	assert.Equal("locked", world.TransferType)
+	assert.Equal(2, len(world.WorldsQuestTitles))
+	assert.Equal("The Colours of Magic", world.WorldsQuestTitles[0])
+	assert.Equal("A Piece of Cake", world.WorldsQuestTitles[1])
+	assert.False(world.BattleyeProtected)
+	assert.Empty(world.BattleyeDate)
+	assert.Equal("experimental", world.GameWorldType)
+	assert.Empty(world.TournamentWorldType)
+	assert.Equal(15, len(world.OnlinePlayers))
+
+	firstPlayer := world.OnlinePlayers[0]
+	assert.Equal("Bright soul", firstPlayer.Name)
+	assert.Equal(20, firstPlayer.Level)
+	assert.Equal("Paladin", firstPlayer.Vocation)
+}

src/webserver_test.go

@@ -46,6 +46,10 @@ func TestFakeToUpCodeCoverage(t *testing.T) {
 	tibiaKillstatisticsV3(c)
 	assert.Equal(200, w.Code)
 
+	assert.False(false, tibiaNewslistArchiveV3())
+	assert.False(false, tibiaNewslistArchiveDaysV3())
+	assert.False(false, tibiaNewslistLatestV3())
+
 	tibiaNewslistV3(c)
 	assert.Equal(200, w.Code)
 
@@ -63,4 +67,6 @@ func TestFakeToUpCodeCoverage(t *testing.T) {
 
 	tibiaWorldsWorldV3(c)
 	assert.Equal(200, w.Code)
+
+	assert.Equal("TibiaData-API/v3 (release/unknown; build/manual; commit/-; edition/open-source; unittest.example.com)", TibiadataUserAgentGenerator(3))
 }