Refactor Player

Gorzen · Nov 16, 2018 · d104ef6 · d104ef6
1 parent ccd6a3f
commit d104ef6
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 54 deletions.
diff --git a/app/src/androidTest/java/ch/epfl/sweng/studyup/FirestoreTest.java b/app/src/androidTest/java/ch/epfl/sweng/studyup/FirestoreTest.java
@@ -41,10 +41,6 @@ public class FirestoreTest {
 
     private static Map<String, Object> TEST_DATA = null;
 
-    /*@Rule
-    public final ActivityTestRule<> mActivityRule =
-            new ActivityTestRule<>(MainActivity.class);*/
-
     @BeforeClass
     public static void enableMock() {
         MOCK_ENABLED = true;
@@ -69,8 +65,7 @@ public static void resetTestValues() {
 
     @Before
     public void setup() {
-        Player.resetPlayer();
-        Player.get().initializePlayerData(TEST_SCIPER, INITIAL_FIRSTNAME, INITIAL_LASTNAME);
+        Player.get().resetPlayer();
         Player.get().setRole(Role.student);
         resetTestValues();
     }
@@ -154,7 +149,7 @@ public void addNewUserToDBTest() throws Exception {
 
     @Test
     public void addXpPlayerAndCurrencyTest() {
-        Player.resetPlayer();
+        Player.get().resetPlayer();
 
         assertEquals(INITIAL_XP, Player.get().getExperience());
         assertEquals(INITIAL_LEVEL, Player.get().getLevel());

diff --git a/app/src/androidTest/java/ch/epfl/sweng/studyup/ItemsTest/InventoryActivityTest.java b/app/src/androidTest/java/ch/epfl/sweng/studyup/ItemsTest/InventoryActivityTest.java
@@ -40,7 +40,7 @@ public void init() {
 
     @After
     public void cleanup() {
-        Player.resetPlayer();
+        Player.get().resetPlayer();
     }
 
     @Test

diff --git a/app/src/androidTest/java/ch/epfl/sweng/studyup/ItemsTest/UtilsItemsTest.java b/app/src/androidTest/java/ch/epfl/sweng/studyup/ItemsTest/UtilsItemsTest.java
@@ -20,7 +20,7 @@
 public class UtilsItemsTest {
     @Before
     public void setup(){
-        Player.resetPlayer();
+        Player.get().resetPlayer();
     }
 
     @Test

diff --git a/app/src/androidTest/java/ch/epfl/sweng/studyup/MainActivityTest.java b/app/src/androidTest/java/ch/epfl/sweng/studyup/MainActivityTest.java
@@ -54,12 +54,6 @@ public class MainActivityTest {
     public final ActivityTestRule<MainActivity> mActivityRule =
             new ActivityTestRule<>(MainActivity.class);
 
-
-    @BeforeClass
-    public static void runOnceBeforeClass() {
-        Player.get().initializeDefaultPlayerData();
-    }
-
     @Before
     public void  initIntent() {
         Intents.init();
@@ -93,7 +87,7 @@ public void run() {
 
     @Test
     public void checkPlayerProgressionDisplay() {
-        Player.resetPlayer();
+        Player.get().resetPlayer();
         try {
             Thread.sleep(500);
         } catch (InterruptedException e) {

diff --git a/app/src/androidTest/java/ch/epfl/sweng/studyup/PlayerTest.java b/app/src/androidTest/java/ch/epfl/sweng/studyup/PlayerTest.java
@@ -25,7 +25,7 @@ public class PlayerTest {
 
     @Before
     public void setup() {
-        Player.resetPlayer();
+        Player.get().resetPlayer();
     }
 
     @Test

diff --git a/app/src/androidTest/java/ch/epfl/sweng/studyup/QuestionsTest/AddQuestionActivityTest.java b/app/src/androidTest/java/ch/epfl/sweng/studyup/QuestionsTest/AddQuestionActivityTest.java
@@ -57,7 +57,6 @@ public class AddQuestionActivityTest {
     public static void enableMock() {
         MOCK_ENABLED = true;
         Intents.init();
-        Player.get().initializeDefaultPlayerData();
     }
 
     @AfterClass

diff --git a/app/src/androidTest/java/ch/epfl/sweng/studyup/QuestionsTest/QuestsActivityTeacherTest.java b/app/src/androidTest/java/ch/epfl/sweng/studyup/QuestionsTest/QuestsActivityTeacherTest.java
@@ -36,7 +36,6 @@ public class QuestsActivityTeacherTest {
     @BeforeClass
     public static void enableMock() {
         MOCK_ENABLED = true;
-        Player.get().initializeDefaultPlayerData();
         Player.get().setRole(Role.student);
     }
     @AfterClass

diff --git a/app/src/main/java/ch/epfl/sweng/studyup/LoginActivity.java b/app/src/main/java/ch/epfl/sweng/studyup/LoginActivity.java
@@ -105,7 +105,9 @@ public void loadPlayerDataFromCache(List<String> playerCacheData) throws Excepti
         }
 
         Player currPlayer = Player.get();
-        currPlayer.initializePlayerData(sciperNum, firstName, lastName);
+        currPlayer.setSciperNum(sciperNum);
+        currPlayer.setFirstName(firstName);
+        currPlayer.setLastName(lastName);
         currPlayer.setRole(role);
     }
 

diff --git a/app/src/main/java/ch/epfl/sweng/studyup/auth/AuthenticationActivity.java b/app/src/main/java/ch/epfl/sweng/studyup/auth/AuthenticationActivity.java
@@ -52,7 +52,9 @@ public void runAuthentication() throws Exception {
 
         PlayerDataContainer playerData = Authenticator.getPlayerData(token);
 
-        Player.get().initializePlayerData(playerData.sciperNum, playerData.firstName, playerData.lastname);
+        Player.get().setSciperNum(playerData.sciperNum);
+        Player.get().setFirstName(playerData.firstName);
+        Player.get().setLastName(playerData.lastname);
         if (MOCK_ENABLED) {
             Player.get().setRole(Role.student);
         }

diff --git a/app/src/main/java/ch/epfl/sweng/studyup/player/CustomActivity.java b/app/src/main/java/ch/epfl/sweng/studyup/player/CustomActivity.java
@@ -55,10 +55,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_custom);
 
-        if (MOCK_ENABLED) {
-            Player.get().initializeDefaultPlayerData();
-        }
-
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setTitle(null);

diff --git a/app/src/main/java/ch/epfl/sweng/studyup/player/Player.java b/app/src/main/java/ch/epfl/sweng/studyup/player/Player.java
@@ -32,11 +32,11 @@ public class Player {
     private static Player instance = null;
 
     // Basic biographical data
-    private String sciperNum = null;
-    private String firstName = null;
-    private String lastName = null;
+    private String sciperNum;
+    private String firstName;
+    private String lastName;
 
-    private String username = null;
+    private String username;
     private Role role = null;
 
     // Game-related data
@@ -73,24 +73,15 @@ public static Player get() {
      * User for testing purposes.
      * Clear data from current Player instance.
      */
-    public static void resetPlayer() {
-        instance = new Player();
-    }
-
-    /**
-     * Initialize the instance of Player for the FIRST TIME.
-     * This is used when a user logs is logged in from AuthenticationActivity OR
-     * the user is logged in automatically from LoginActivity.
-     */
-    public void initializePlayerData(String sciperNum, String firstName, String lastName) {
-
-        this.sciperNum = sciperNum;
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
-
-    public void initializeDefaultPlayerData() {
-        initializePlayerData(INITIAL_SCIPER, INITIAL_FIRSTNAME, INITIAL_LASTNAME);
+    public void resetPlayer() {
+        experience = INITIAL_XP;
+        currency = INITIAL_CURRENCY;
+        level = INITIAL_LEVEL;
+        username = INITIAL_USERNAME;
+        answeredQuestions = new HashMap<>();
+        items = new ArrayList<>();
+        courses = new ArrayList<>();
+        courses.add(Course.SWENG);
     }
 
     /**
@@ -140,13 +131,6 @@ public List<Course> getCourses() {
         return courses;
     }
 
-    /**
-     * Changes the Player to the basic state, right after constructor.
-     */
-    public void reset() {
-        instance = null;
-    }
-
     // Setters
     public void setSciperNum(String sciperNum) {
         this.sciperNum = sciperNum;