Merge pull request #5 from CDaffyJr/fix_sprint2

Wrapping up sprint 2

Author: aleromar

tests/test_random.py

@@ -0,0 +1,44 @@
+from torpydo.battleship import overlaps, set_direction, set_forward_rear
+from torpydo.ship import Letter, Position, Ship, Color
+
+def test_not_overlaps():
+    ship = Ship("test",5,Color.RED)
+    ship.add_position("B1")
+    assert overlaps(
+        [
+            Position(Letter.A,1),
+            Position(Letter.A,2)
+        ],
+        fleet=[
+            ship
+        ]
+    ) == False
+
+def test_overlaps():
+    ship = Ship("test",5, Color.RED)
+    ship.add_position("A2")
+    assert overlaps(
+        [
+            Position(Letter.A,1),
+            Position(Letter.A,2)
+        ],
+        fleet=[
+            ship
+        ]
+    ) == True
+
+def test_set_forward_read():
+    assert set_forward_rear(5,3,6) == 0
+    assert set_forward_rear(5,1,7) == 1
+    assert set_forward_rear(2,3,8) == 1
+    assert set_forward_rear(3,5,7) == 1
+    assert set_forward_rear(3,5,6) == -1
+    
+def test_set_direction():
+    axis, st_value = set_direction(Position(Letter.A,1))
+    assert axis == "horizontal"
+    assert st_value == 1
+    axis, st_value = set_direction(Position(Letter.A,2))
+    assert axis == "vertical"
+    assert st_value == 2
+    

torpydo/battleship.py

@@ -178,9 +178,11 @@ def get_random_position(board: list):
             return position
 
 def initialize_game():
-    initialize_myFleet()
 
     initialize_enemyFleet()
+    initialize_myFleet()
+
+    
 
 def initialize_myFleet():
     global myFleet
@@ -285,18 +287,28 @@ def place_this_ship(ship:Ship, st_point:Position, enemyFleet:List[Ship]):
     else:
         return False
 
+def get_random_position_2():
+    rows = 8
+    lines = 8
+
+    letter = Letter(random.randint(1, lines))
+    number = random.randint(1, rows)
+    position = Position(letter, number)
+
+    return position
+
 def initialize_enemyFleet():
     global enemyFleet
 
     enemyFleet = GameController.initialize_ships()
 
     for ship in enemyFleet:
-        ship_strating_point = get_random_position()
+        ship_strating_point = get_random_position_2()
         while not place_this_ship(ship,ship_strating_point, enemyFleet):
-            ship_strating_point = get_random_position()
+            ship_strating_point = get_random_position_2()
 
 
-    # print(enemyFleet)
+    #print(enemyFleet)
 
 def check_position_input(msg: str):
     string = input(msg)