Merge pull request #161 from joshuafolkken/160-refactoring

160 refactoring

src/cell.gd

@@ -5,6 +5,12 @@ signal button_clicked(board_position: BoardPosition)
 
 @export var button_index := 0
 
+var button_visible: bool:
+	get:
+		return _cell_button.visible
+	set(value):
+		_cell_button.visible = value
+
 @onready var _cell_button: Button = $CellButton
 @onready var _click_sound: ClickSound = $ClickSound
 @onready var _cross: Node2D = $Cross
@@ -21,10 +27,14 @@ func set_button_visibility(value: bool) -> void:
 	_cell_button.visible = value
 
 
+func is_button_visible() -> bool:
+	return _cell_button.visible
+
+
 func _show_mark(cell_status: CellStatus) -> void:
 	_cross.visible = cell_status.is_x()
 	_circle.visible = cell_status.is_o()
-	set_button_visibility(cell_status.is_empty())
+	_cell_button.visible = cell_status.is_empty()
 	fade(false)
 
 

src/lib/cell_collection_test.gd

@@ -0,0 +1,74 @@
+# # gdlint: disable=unused-argument
+# # gdlint: disable=private-method-call
+# # GdUnit generated TestSuite
+# class_name CellCollectionTest
+# extends GdUnitTestSuite
+
+# func test_init() -> void:
+# 	await assert_error(func() -> void: CellCollection.new()).is_success()
+
+# @warning_ignore("unused_parameter")
+
+# func test_add(
+# 	position: BoardPosition,
+# 	cell: Cell,
+# 	test_parameters := [
+# 		[BoardPosition.new(0, 0), Cell.new()],
+# 		[BoardPosition.new(1, 1), Cell.new()],
+# 	]
+# ) -> void:
+# 	var collection := CellCollection.new()
+# 	collection.add(position, cell)
+
+# 	var actual := collection.get_element(position)
+# 	assert_that(actual).is_equal(cell)
+
+# func test_end_game() -> void:
+# 	var collection := CellCollection.new()
+# 	var cell1 := Cell.new()
+# 	var cell2 := Cell.new()
+# 	collection.add(BoardPosition.new(0, 0), cell1)
+# 	collection.add(BoardPosition.new(1, 1), cell2)
+
+# 	collection.end_game()
+
+# 	assert_bool(cell1.button_visible).is_false()
+# 	assert_bool(cell2.button_visible).is_false()
+
+# 	cell1.free()
+# 	cell2.free()
+
+# func test_reset_all() -> void:
+# 	var collection := CellCollection.new()
+# 	var cell1 := Cell.new()
+# 	var cell2 := Cell.new()
+
+# 	collection.add(BoardPosition.new(0, 0), cell1)
+# 	collection.add(BoardPosition.new(1, 1), cell2)
+# 	collection.reset_all()
+
+# 	assert_bool(cell1.button_visible).is_true()
+# 	assert_bool(cell2.button_visible).is_true()
+
+# 	cell1.free()
+# 	cell2.free()
+
+# func test_clear() -> void:
+# 	var collection := CellCollection.new()
+# 	var cell := Cell.new()
+# 	var position := BoardPosition.new(0, 0)
+
+# 	collection.add(position, cell)
+# 	collection.clear(position)
+
+# 	assert_bool(cell.button_visible).is_true()
+
+# func test_fade() -> void:
+# 	var collection := CellCollection.new()
+# 	var cell := Cell.new()
+# 	var position := BoardPosition.new(0, 0)
+
+# 	collection.add(position, cell)
+# 	collection.fade(position)
+
+# 	assert_bool(cell.button_visible).is_false()

src/lib/cell_status_collection.gd

@@ -1,10 +1,6 @@
 class_name CellStatusCollection
 
-var _elements: Array[CellStatus]
-
-
-func _init() -> void:
-	_elements = []
+var _elements: Array[CellStatus] = []
 
 
 func append(status: CellStatus) -> void:

src/lib/game_player_test.gd

@@ -32,7 +32,6 @@ func test_get_value(
 	id: GamePlayer.Id,
 	expected: GamePlayer.Id,
 	test_parameters := [
-		[null, GamePlayer.Id.X],
 		[GamePlayer.Id.X, GamePlayer.Id.X],
 		[GamePlayer.Id.O, GamePlayer.Id.O],
 	]

src/lib/game_status_test.gd

@@ -10,7 +10,6 @@ func test_init(
 	state: GameStatus.State,
 	is_success: bool,
 	test_parameters := [
-		[null, true],
 		[GameStatus.State.PLAYING, true],
 		[GameStatus.State.X_WIN, true],
 		[GameStatus.State.O_WIN, true],