cpp/openttd-patchpack/source Changeset - r21753:c40b0fc6418b

Changeset - r21753:c40b0fc6418b

Parent rev.

Child rev.

[Not reviewed]

master

0 2 3

fonsinchen - 10 years ago 2014-09-21 16:44:37
fonsinchen@openttd.org

(svn r26896) -Codechange: Move AIStationList* tests to separate test case

5 files changed with 118 insertions and 99 deletions:

bin/ai/regression/tst_regression/main.nut

bin/ai/regression/tst_regression/result.txt

bin/ai/regression/tst_stationlist/main.nut

bin/ai/regression/tst_stationlist/result.txt

bin/ai/regression/tst_stationlist/test.sav

bin+new file

0 comments (0 inline, 0 general)

bin/ai/regression/tst_regression/main.nut

➞

Show inline comments

@@ @@ -969,54 +969,13 @@ function Regression::Order() @@
 	print("  AppendOrder():         " + AIOrder.AppendOrder(20, 7958, AIOrder.OF_NONE));
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(20));
 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));
 	print("  SetStopLocation():     " + AIOrder.SetStopLocation(20, 0, AIOrder.STOPLOCATION_MIDDLE));
 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));
 	local list = AIStationList_Vehicle(12);
 	print("");
 	print("--StationList_Vehicle--");
 	print("  Count():             " + list.Count());
 	list.Valuate(AIStation.GetLocation);
 	print("  Location ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetCargoWaiting, 0);
 	print("  CargoWaiting(0) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetCargoWaiting, 1);
 	print("  CargoWaiting(1) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetCargoRating, 1);
 	print("  CargoRating(1) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetDistanceManhattanToTile, 30000);
 	print("  DistanceManhattanToTile(30000) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetDistanceSquareToTile, 30000);
 	print("  DistanceSquareToTile(30000) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.IsWithinTownInfluence, 0);
 	print("  IsWithinTownInfluence(0) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list = AIVehicleList_Station(3);
 	local list = AIVehicleList_Station(3);
 	print("");
 	print("--VehicleList_Station--");
 	print("  Count():             " + list.Count());
 	list.Valuate(AIVehicle.GetLocation);
 	print("  Location ListDump:");
@@ @@ -1284,33 +1243,12 @@ function Regression::Station() @@
 					print("  GetCargoPlannedFromVia(" + station0 + ", " + station1 + ", " + station2 + ", " + cargo + "): " +
 							AIStation.GetCargoPlannedFromVia(station0, station1, station2, cargo));
+				}
+			}
+		}
+	}
 	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);
 	print("");
 	print("--StationList--");
 	print("  Count():             " + list.Count());
 	list.Valuate(AIStation.GetLocation);
 	print("  Location ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetCargoWaiting, 0);
 	print("  CargoWaiting(0) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetCargoWaiting, 1);
 	print("  CargoWaiting(1) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
+}
 function Regression::Tile()
+{
 	print("");
 	print("--Tile--");

bin/ai/regression/tst_regression/result.txt

➞

Show inline comments

@@ @@ -7574,24 +7574,12 @@ ERROR: IsEnd() is invalid as Begin() is @@
   GetCargoPlannedFromVia(1000, 0, 1000, 1000): -1
   GetCargoPlannedFrom(1000, 1000, 1000): -1
   GetCargoPlannedVia(1000, 1000, 1000): -1
   GetCargoPlannedFromVia(1000, 1000, 0, 1000): -1
   GetCargoPlannedFromVia(1000, 1000, 1000, 1000): -1
 --StationList--
   Count():             2
   Location ListDump:
 => 33421
 => 33411
   CargoWaiting(0) ListDump:
 => 0
 => 0
   CargoWaiting(1) ListDump:
 => 0
 => 0
 --Tile--
   HasTreeOnTile():      false
   IsFarmTile():         true
   IsRockTile():         true
   IsRoughTile():        true
   HasTreeOnTile():      true
@@ @@ -9176,36 +9164,12 @@ ERROR: IsEnd() is invalid as Begin() is @@
   AppendOrder():         true
   GetOrderCount():       1
   GetStopLocation():     2
   SetStopLocation():     true
   GetStopLocation():     1
 --StationList_Vehicle--
   Count():             2
   Location ListDump:
 => 33421
 => 33411
   CargoWaiting(0) ListDump:
 => 0
 => 0
   CargoWaiting(1) ListDump:
 => 0
 => 0
   CargoRating(1) ListDump:
 => -1
 => -1
   DistanceManhattanToTile(30000) ListDump:
 => 106
 => 96
   DistanceSquareToTile(30000) ListDump:
 => 8818
 => 7058
   IsWithinTownInfluence(0) ListDump:
 => 0
 => 0
 --VehicleList_Station--
   Count():             1
   Location ListDump:
 => 23596
   foreach():
 => 23596

bin/ai/regression/tst_stationlist/main.nut

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 class Regression extends AIController {
 	function Start();
 };
 function Regression::StationList()
+{
 	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);
 	print("");
 	print("--StationList--");
 	print("  Count():             " + list.Count());
 	list.Valuate(AIStation.GetLocation);
 	print("  Location ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetCargoWaiting, 0);
 	print("  CargoWaiting(0) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetCargoWaiting, 1);
 	print("  CargoWaiting(1) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 };
 function Regression::StationList_Vehicle()
+{
 	local list = AIStationList_Vehicle(12);
 	print("");
 	print("--StationList_Vehicle--");
 	print("  Count():             " + list.Count());
 	list.Valuate(AIStation.GetLocation);
 	print("  Location ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetCargoWaiting, 0);
 	print("  CargoWaiting(0) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetCargoWaiting, 1);
 	print("  CargoWaiting(1) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetCargoRating, 1);
 	print("  CargoRating(1) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetDistanceManhattanToTile, 30000);
 	print("  DistanceManhattanToTile(30000) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.GetDistanceSquareToTile, 30000);
 	print("  DistanceSquareToTile(30000) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIStation.IsWithinTownInfluence, 0);
 	print("  IsWithinTownInfluence(0) ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
+}
 function Regression::Start()
+{
 	StationList();
 	StationList_Vehicle();
+}

bin/ai/regression/tst_stationlist/result.txt

➞

Show inline comments

@@ new file 100644 @@
 --StationList--
   Count():             2
   Location ListDump:
 => 33421
 => 33411
   CargoWaiting(0) ListDump:
 => 0
 => 0
   CargoWaiting(1) ListDump:
 => 0
 => 0
 --StationList_Vehicle--
   Count():             2
   Location ListDump:
 => 33421
 => 33411
   CargoWaiting(0) ListDump:
 => 0
 => 0
   CargoWaiting(1) ListDump:
 => 0
 => 0
   CargoRating(1) ListDump:
 => -1
 => -1
   DistanceManhattanToTile(30000) ListDump:
 => 106
 => 96
   DistanceSquareToTile(30000) ListDump:
 => 8818
 => 7058
   IsWithinTownInfluence(0) ListDump:
 => 0
 => 0
 ERROR: The script died unexpectedly.

bin/ai/regression/tst_stationlist/test.sav

➞

Show inline comments

		new file 100644
		binary diff not shown

0 comments (0 inline, 0 general)