fmt and fix tests

alaingilbert · Sep 24, 2022 · c2a235f · c2a235f
1 parent 8a6f179
commit c2a235f
Show file tree

Hide file tree

Showing 13 changed files with 539 additions and 542 deletions.
diff --git a/cmd/c/main.go b/cmd/c/main.go
@@ -332,9 +332,9 @@ func BuildShips(planetID, shipID, nbr C.int) (errorMsg *C.char) {
 // TODO: GetProduction(PlanetID) ([]Quantifiable, error)
 
 //export ConstructionsBeingBuilt
-func ConstructionsBeingBuilt(planetID C.int) (buildingID, buildingCountdown, researchID, researchCountdown, lfBuildingID, lfBuildingCountdown C.int) {
-	a, b, c, d, e, f := bot.ConstructionsBeingBuilt(ogame2.CelestialID(planetID))
-	return C.int(a), C.int(b), C.int(c), C.int(d), C.int(e), C.int(f)
+func ConstructionsBeingBuilt(planetID C.int) (buildingID, buildingCountdown, researchID, researchCountdown, lfBuildingID, lfBuildingCountdown, lfTechID, lfTechCountdown C.int) {
+	a, b, c, d, e, f, g, h := bot.ConstructionsBeingBuilt(ogame2.CelestialID(planetID))
+	return C.int(a), C.int(b), C.int(c), C.int(d), C.int(e), C.int(f), C.int(g), C.int(h)
 }
 
 //export CancelBuilding

diff --git a/pkg/extractor/v6/extractor.go b/pkg/extractor/v6/extractor.go
@@ -902,4 +902,4 @@ func (e *Extractor) ExtractLfTechs(pageHTML []byte) (ogame.LfTechs, error) {
 // ExtractLfTechsFromDoc ...
 func (e *Extractor) ExtractLfTechsFromDoc(doc *goquery.Document) (ogame.LfTechs, error) {
 	panic("not implemented")
-}
+}
diff --git a/pkg/extractor/v6/extractor_test.go b/pkg/extractor/v6/extractor_test.go
@@ -1884,7 +1884,7 @@ func TestCancelResearch(t *testing.T) {
 
 func TestGetConstructions(t *testing.T) {
 	pageHTMLBytes, _ := ioutil.ReadFile("../../../samples/unversioned/overview_active.html")
-	buildingID, buildingCountdown, researchID, researchCountdown, _, _ := NewExtractor().ExtractConstructions(pageHTMLBytes)
+	buildingID, buildingCountdown, researchID, researchCountdown, _, _, _, _ := NewExtractor().ExtractConstructions(pageHTMLBytes)
 	assert.Equal(t, ogame.CrystalMineID, buildingID)
 	assert.Equal(t, int64(731), buildingCountdown)
 	assert.Equal(t, ogame.CombustionDriveID, researchID)

diff --git a/pkg/extractor/v7/extractor_test.go b/pkg/extractor/v7/extractor_test.go
@@ -313,7 +313,7 @@ func TestExtractFleetSlot_FleetDispatch(t *testing.T) {
 func TestGetConstructionsV7(t *testing.T) {
 	pageHTMLBytes, _ := ioutil.ReadFile("../../../samples/v7/overview_supplies_in_construction.html")
 	clock := clockwork.NewFakeClockAt(time.Date(2019, 11, 12, 9, 6, 43, 0, time.UTC))
-	buildingID, buildingCountdown, researchID, researchCountdown, _, _ := ExtractConstructions(pageHTMLBytes, clock)
+	buildingID, buildingCountdown, researchID, researchCountdown, _, _, _, _ := ExtractConstructions(pageHTMLBytes, clock)
 	assert.Equal(t, ogame.MetalMineID, buildingID)
 	assert.Equal(t, int64(62), buildingCountdown)
 	assert.Equal(t, ogame.EnergyTechnologyID, researchID)

diff --git a/pkg/extractor/v9/extractor.go b/pkg/extractor/v9/extractor.go
@@ -111,4 +111,4 @@ func (e *Extractor) ExtractLfTechs(pageHTML []byte) (ogame.LfTechs, error) {
 // ExtractLfTechsFromDoc ...
 func (e *Extractor) ExtractLfTechsFromDoc(doc *goquery.Document) (ogame.LfTechs, error) {
 	return extractLfTechsFromDoc(doc)
-}
+}
diff --git a/pkg/extractor/v9/extractor_test.go b/pkg/extractor/v9/extractor_test.go
@@ -110,7 +110,7 @@ func TestGetConstructions(t *testing.T) {
 	// Without lifeform
 	pageHTMLBytes, _ := ioutil.ReadFile("../../../samples/v9.0.2/en/overview_all_queues.html")
 	clock := clockwork.NewFakeClockAt(time.Date(2022, 8, 20, 12, 43, 11, 0, time.UTC))
-	buildingID, buildingCountdown, researchID, researchCountdown, _, _ := ExtractConstructions(pageHTMLBytes, clock)
+	buildingID, buildingCountdown, researchID, researchCountdown, _, _, _, _ := ExtractConstructions(pageHTMLBytes, clock)
 	assert.Equal(t, ogame.MetalMineID, buildingID)
 	assert.Equal(t, int64(5413), buildingCountdown)
 	assert.Equal(t, ogame.ComputerTechnologyID, researchID)
@@ -119,7 +119,7 @@ func TestGetConstructions(t *testing.T) {
 	// With lifeform
 	pageHTMLBytes, _ = ioutil.ReadFile("../../../samples/v9.0.2/en/lifeform/overview_all_queues2.html")
 	clock = clockwork.NewFakeClockAt(time.Date(2022, 8, 28, 17, 22, 26, 0, time.UTC))
-	buildingID, buildingCountdown, researchID, researchCountdown, _, _ = ExtractConstructions(pageHTMLBytes, clock)
+	buildingID, buildingCountdown, researchID, researchCountdown, _, _, _, _ = ExtractConstructions(pageHTMLBytes, clock)
 	assert.Equal(t, ogame.MetalStorageID, buildingID)
 	assert.Equal(t, int64(33483), buildingCountdown)
 	assert.Equal(t, ogame.ComputerTechnologyID, researchID)

diff --git a/pkg/extractor/v9/extracts.go b/pkg/extractor/v9/extracts.go
@@ -586,8 +586,8 @@ func extractLfBuildingsFromDoc(doc *goquery.Document) (ogame.LfBuildings, error)
 		res.BiotechLab = GetNbr(doc, "lifeformTech11110")
 		res.Metropolis = GetNbr(doc, "lifeformTech11111")
 		res.PlanetaryShield = GetNbr(doc, "lifeformTech11112")
-		
- 	} else if doc.Find("#lifeform a div").HasClass("lifeform2") {
+
+	} else if doc.Find("#lifeform a div").HasClass("lifeform2") {
 		res.Rocktal = true
 		res.MeditationEnclave = GetNbr(doc, "lifeformTech12101")
 		res.CrystalFarm = GetNbr(doc, "lifeformTech12102")
@@ -601,7 +601,7 @@ func extractLfBuildingsFromDoc(doc *goquery.Document) (ogame.LfBuildings, error)
 		res.DeuteriumSynthesiser = GetNbr(doc, "lifeformTech12110")
 		res.MineralResearchCentre = GetNbr(doc, "lifeformTech12111")
 		res.MetalRecyclingPlant = GetNbr(doc, "lifeformTech12112")
-		
+
 	} else if doc.Find("#lifeform a div").HasClass("lifeform3") {
 		res.Mechas = true
 		res.AssemblyLine = GetNbr(doc, "lifeformTech13101")
@@ -616,7 +616,7 @@ func extractLfBuildingsFromDoc(doc *goquery.Document) (ogame.LfBuildings, error)
 		res.HighPerformanceSynthesiser = GetNbr(doc, "lifeformTech13110")
 		res.ChipMassProduction = GetNbr(doc, "lifeformTech13111")
 		res.NanoRepairBots = GetNbr(doc, "lifeformTech13112")
-		
+
 	} else if doc.Find("#lifeform a div").HasClass("lifeform4") {
 		res.Kaelesh = true
 		res.Sanctuary = GetNbr(doc, "lifeformTech14101")
@@ -631,14 +631,13 @@ func extractLfBuildingsFromDoc(doc *goquery.Document) (ogame.LfBuildings, error)
 		res.PsionicModulator = GetNbr(doc, "lifeformTech14110")
 		res.ShipManufacturingHall = GetNbr(doc, "lifeformTech14111")
 		res.SupraRefractor = GetNbr(doc, "lifeformTech14112")
-		
+
 	} else {
 		res.None = true
 	}
 	return res, nil
 }
 
-
 func extractLfTechsFromDoc(doc *goquery.Document) (ogame.LfTechs, error) {
 	res := ogame.LfTechs{}
 	// Can have any lifeform techs whatever current planet lifeform is, so take everything
@@ -659,7 +658,7 @@ func extractLfTechsFromDoc(doc *goquery.Document) (ogame.LfTechs, error) {
 	res.DestroyerMkII = GetNbr(doc, "lifeformTech11215")
 	res.BattlecruiserMkII = GetNbr(doc, "lifeformTech11216")
 	res.RobotAssistants = GetNbr(doc, "lifeformTech11217")
-	res.Supercomputer = GetNbr(doc, "lifeformTech11218")	
+	res.Supercomputer = GetNbr(doc, "lifeformTech11218")
 	res.VolcanicBatteries = GetNbr(doc, "lifeformTech12201")
 	res.AcousticScanning = GetNbr(doc, "lifeformTech12202")
 	res.HighEnergyPumpSystems = GetNbr(doc, "lifeformTech12203")
@@ -677,7 +676,7 @@ func extractLfTechsFromDoc(doc *goquery.Document) (ogame.LfTechs, error) {
 	res.DiamondEnergyTransmitter = GetNbr(doc, "lifeformTech12215")
 	res.ObsidianShieldReinforcement = GetNbr(doc, "lifeformTech12216")
 	res.RuneShields = GetNbr(doc, "lifeformTech12217")
-	res.RocktalCollectorEnhancement = GetNbr(doc, "lifeformTech12218")	
+	res.RocktalCollectorEnhancement = GetNbr(doc, "lifeformTech12218")
 	res.CatalyserTechnology = GetNbr(doc, "lifeformTech13201")
 	res.PlasmaDrive = GetNbr(doc, "lifeformTech13202")
 	res.EfficiencyModule = GetNbr(doc, "lifeformTech13203")