Merge pull request #159 from joshuafolkken/158-replace-range-loops-to…

…-godot-style-loops

replace range loops to Godot-style loops #158

src/lib/board.gd

@@ -12,8 +12,8 @@ func add_empty(board_position: BoardPosition) -> void:
 
 
 func _init() -> void:
-	for row_index in range(BoardPosition.MAX_SIZE):
-		for col_index in range(BoardPosition.MAX_SIZE):
+	for row_index in BoardPosition.MAX_SIZE:
+		for col_index in BoardPosition.MAX_SIZE:
 			var position := BoardPosition.new(row_index, col_index)
 			add_empty(position)
 
@@ -25,7 +25,7 @@ func get_element(board_position: BoardPosition) -> CellStatus:
 func _check_line(index: int, is_row: bool) -> CellStatus:
 	var cell_status_collection := CellStatusCollection.new()
 
-	for i in range(BoardPosition.MAX_SIZE):
+	for i in BoardPosition.MAX_SIZE:
 		var position := BoardPosition.new(index if is_row else i, index if not is_row else i)
 		var value := get_element(position)
 		cell_status_collection.append(value)
@@ -34,7 +34,7 @@ func _check_line(index: int, is_row: bool) -> CellStatus:
 
 
 func _check_lines(is_horizontal: bool) -> CellStatus:
-	for i in range(BoardPosition.MAX_SIZE):
+	for i in BoardPosition.MAX_SIZE:
 		var line_status := _check_line(i, is_horizontal)
 		if line_status.is_not_empty():
 			return line_status
@@ -45,7 +45,7 @@ func _check_lines(is_horizontal: bool) -> CellStatus:
 func _check_diagonal(reverse: bool) -> CellStatus:
 	var cell_status_collection := CellStatusCollection.new()
 
-	for i in range(BoardPosition.MAX_SIZE):
+	for i in BoardPosition.MAX_SIZE:
 		var col_index := BoardPosition.MAX_SIZE - i - 1 if reverse else i
 		var position := BoardPosition.new(i, col_index)
 		var value := get_element(position)
@@ -55,8 +55,8 @@ func _check_diagonal(reverse: bool) -> CellStatus:
 
 
 func _is_full() -> bool:
-	for row_index in range(BoardPosition.MAX_SIZE):
-		for col_index in range(BoardPosition.MAX_SIZE):
+	for row_index in BoardPosition.MAX_SIZE:
+		for col_index in BoardPosition.MAX_SIZE:
 			var position := BoardPosition.new(row_index, col_index)
 			var value := get_element(position)
 

src/lib/board_test.gd

@@ -9,8 +9,8 @@ extends GdUnitTestSuite
 func test_init() -> void:
 	var board := Board.new()
 
-	for row_index in range(BoardPosition.MAX_SIZE):
-		for col_index in range(BoardPosition.MAX_SIZE):
+	for row_index in BoardPosition.MAX_SIZE:
+		for col_index in BoardPosition.MAX_SIZE:
 			var board_position := BoardPosition.new(row_index, col_index)
 			var actual := board.get_element(board_position)
 			assert_bool(actual.is_equal(CellStatus.empty)).is_true()

src/lib/position_history.gd

@@ -6,7 +6,7 @@ var _elements: Array[BoardPosition] = []
 
 
 func _init() -> void:
-	for i in range(MAX_SIZE):
+	for i in MAX_SIZE:
 		_elements.append(BoardPosition.invalid)
 
 

src/lib/position_history_test.gd

@@ -66,7 +66,7 @@ func test_append(
 	for board_position: BoardPosition in board_positions:
 		actuals = position_history.append(board_position)
 
-	for i in range(actuals.size()):
+	for i in actuals.size():
 		var actual: BoardPosition = actuals[i]
 		var expected: BoardPosition = expecteds[i]
 

src/main.gd

@@ -23,7 +23,7 @@ func _ready() -> void:
 
 
 func disappear_cells(positions: Array[BoardPosition]) -> void:
-	for i in range(2):
+	for i in 2:
 		if positions[i].is_valid():
 			var action := _ui_manager.clear_cell if i == 0 else _ui_manager.fade_cell
 			action.call(positions[i])

tests/e2e/base_test.gd

@@ -2,6 +2,7 @@ class_name BaseTest
 extends GdUnitTestSuite
 
 const _SCENE_PATH := "res://scenes/main.tscn"
+const BOARD_SIZE = 3
 
 var _scene_runner: GdUnitSceneRunner
 var _scene: Main
@@ -16,8 +17,8 @@ func before_test() -> void:
 
 
 func is_buttons_enabled() -> void:
-	for row_index in range(3):
-		for col_index in range(3):
+	for row_index in BOARD_SIZE:
+		for col_index in BOARD_SIZE:
 			var board_position := BoardPosition.new(row_index, col_index)
 			var cell := _scene._ui_manager._cell_collection.get_element(board_position)
 			var cell_button := cell._cell_button

tests/e2e/gameplay_test.gd

@@ -16,8 +16,8 @@ func test_click_cell() -> void:
 	assert_bool(cross.visible).is_true()
 	assert_bool(circle.visible).is_false()
 
-	for row in range(3):
-		for col in range(3):
+	for row in BOARD_SIZE:
+		for col in BOARD_SIZE:
 			if row != 1 or col != 1:
 				var position := BoardPosition.new(row, col)
 				var button := _scene._ui_manager._cell_collection.get_element(position)
@@ -45,8 +45,8 @@ func test_click_three_cells() -> void:
 	assert_cell_state(BoardPosition.new(2, 2), false, true, false)
 
 	# その他のセルの状態を確認
-	for row in range(3):
-		for col in range(3):
+	for row in 3:
+		for col in 3:
 			if (row != 1 or col != 1) and (row != 0 or col != 0) and (row != 2 or col != 2):
 				var other_position := BoardPosition.new(row, col)
 				var other_cell := _scene._ui_manager._cell_collection.get_element(other_position)

tests/e2e/ui_test.gd

@@ -16,8 +16,8 @@ func test_click_cell() -> void:
 	assert_bool(cross.visible).is_true()
 	assert_bool(circle.visible).is_false()
 
-	for row in range(3):
-		for col in range(3):
+	for row in BOARD_SIZE:
+		for col in BOARD_SIZE:
 			if row != 1 or col != 1:
 				var position := BoardPosition.new(row, col)
 				var button := _scene._ui_manager._cell_collection.get_element(position)
@@ -115,8 +115,8 @@ func test_reset_button() -> void:
 
 	_scene._ui_manager.get_reset_button().emit_signal("pressed")
 
-	for row_index in range(3):
-		for col_index in range(3):
+	for row_index in BOARD_SIZE:
+		for col_index in BOARD_SIZE:
 			var position := BoardPosition.new(row_index, col_index)
 			var cell := _scene._ui_manager._cell_collection.get_element(position)
 			assert_bool(cell._cell_button.visible).is_true()