From c542976cf3bad5c58b4165e9d5ad508b66cb5cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?= =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?= Date: Mon, 3 Jun 2019 11:37:57 +0900 Subject: [PATCH] Fix: TDD mode renewal (incompleted) --- src/game/lib/global/global_variables.js | 48 ++++++++++++++++--------- test/tdd.html | 19 ++++++---- test/tdd.js | 17 ++++++--- 3 files changed, 58 insertions(+), 26 deletions(-) diff --git a/src/game/lib/global/global_variables.js b/src/game/lib/global/global_variables.js index 750c551..6589dfa 100644 --- a/src/game/lib/global/global_variables.js +++ b/src/game/lib/global/global_variables.js @@ -5,6 +5,17 @@ var MODE_RELEASE = "release"; var MODE_DEBUG = "debug"; var runMode = MODE_DEBUG; +function isTddMode() { + // console.log("debug mode ? " + runMode); + if(typeof(tddMode) === "undefined") + return false; + + if(tddMode == true) + return true; + + return false; +} + function isDebugMode() { // console.log("debug mode ? " + runMode); return runMode == MODE_DEBUG ? true : false; @@ -21,23 +32,28 @@ var GAME_SCREEN_SIZE = { x: 1024, y: 768 } var sessionStorageManager = new SessionStorageManager(); -{ - if(isDebugMode()) { - console.log("maestroName : " + sessionStorageManager.getMaestroName()); - console.log("maestroID : " + sessionStorageManager.getMaestroID()); - console.log("maestroAccountType : " + sessionStorageManager.getMaestroAccountType()); - console.log("playerName : " + sessionStorageManager.getPlayerName()); - console.log("playerID : " + sessionStorageManager.getPlayerID()); - console.log("playerAccountType : " + sessionStorageManager.getPlayerAccountType()); - console.log("playingAppID : " + sessionStorageManager.getPlayingAppID()); - console.log("playingAppName : " + sessionStorageManager.getPlayingAppName()); - console.log("playingAppKoreanName : " + sessionStorageManager.getPlayingAppKoreanName()); - console.log("record : " + sessionStorageManager.getRecord()); - console.log("appHighestRecord : " + sessionStorageManager.getAppHighestRecord()); - } - if(sessionStorageManager.getMaestroID() === null && !isLogin()) { - goLogin(); +{ + if(isTddMode()) { + console.log("Running in TDD mode"); + } else { + if(isDebugMode()) { + console.log("maestroName : " + sessionStorageManager.getMaestroName()); + console.log("maestroID : " + sessionStorageManager.getMaestroID()); + console.log("maestroAccountType : " + sessionStorageManager.getMaestroAccountType()); + console.log("playerName : " + sessionStorageManager.getPlayerName()); + console.log("playerID : " + sessionStorageManager.getPlayerID()); + console.log("playerAccountType : " + sessionStorageManager.getPlayerAccountType()); + console.log("playingAppID : " + sessionStorageManager.getPlayingAppID()); + console.log("playingAppName : " + sessionStorageManager.getPlayingAppName()); + console.log("playingAppKoreanName : " + sessionStorageManager.getPlayingAppKoreanName()); + console.log("record : " + sessionStorageManager.getRecord()); + console.log("appHighestRecord : " + sessionStorageManager.getAppHighestRecord()); + } + + if(sessionStorageManager.getMaestroID() === null && !isLogin()) { + goLogin(); + } } } diff --git a/test/tdd.html b/test/tdd.html index b655729..9a0d8d4 100644 --- a/test/tdd.html +++ b/test/tdd.html @@ -5,7 +5,13 @@ Mata + + + +
@@ -15,17 +21,18 @@ + - + - - - - - + + + + + diff --git a/test/tdd.js b/test/tdd.js index 197360a..faab013 100644 --- a/test/tdd.js +++ b/test/tdd.js @@ -109,9 +109,9 @@ QUnit.test( "AccountValidator - isValidPlayerPW", function( assert ) { text = "1"; assert.equal(accountValidator.isValidPlayerPW(text), false, "isValidPlayerPW - " + text); text = "12"; - assert.equal(accountValidator.isValidPlayerPW(text), false, "isValidPlayerPW - " + text); + assert.equal(accountValidator.isValidPlayerPW(text), true, "isValidPlayerPW - " + text); text = "123"; - assert.equal(accountValidator.isValidPlayerPW(text), false, "isValidPlayerPW - " + text); + assert.equal(accountValidator.isValidPlayerPW(text), true, "isValidPlayerPW - " + text); text = "1234"; assert.equal(accountValidator.isValidPlayerPW(text), true, "isValidPlayerPW - " + text); text = "12345"; @@ -119,6 +119,10 @@ QUnit.test( "AccountValidator - isValidPlayerPW", function( assert ) { text = "123456"; assert.equal(accountValidator.isValidPlayerPW(text), true, "isValidPlayerPW - " + text); text = "1234567"; + assert.equal(accountValidator.isValidPlayerPW(text), true, "isValidPlayerPW - " + text); + text = "12345678"; + assert.equal(accountValidator.isValidPlayerPW(text), true, "isValidPlayerPW - " + text); + text = "123456789"; assert.equal(accountValidator.isValidPlayerPW(text), false, "isValidPlayerPW - " + text); assert.equal(accountValidator.isValidPlayerPW(text), false, "isValidPlayerPW - no text"); @@ -292,7 +296,7 @@ QUnit.test( "DBConnectManager - Player login", function( assert ) { "jisangs", "test", "111111", (jsonData) => { returnPlayerID = jsonData["PlayerID"]; - assert.equal(returnPlayerID, 31); + assert.equal(returnPlayerID, 300); done(); }, (jsonData) => { @@ -303,6 +307,8 @@ QUnit.test( "DBConnectManager - Player login", function( assert ) { }); }); +// DB data is not prepared +/* QUnit.test( "DBConnectManager - Player history", function( assert ) { sessionStorageManager.maestroID = 1; // jisangs sessionStorageManager.playerID = "8"; // 부현율 @@ -406,6 +412,7 @@ QUnit.test( "DBConnectManager - Player ranking", function( assert ) { }); }); +*/ QUnit.test( "DBConnectManager - HowToPlay", function( assert ) { let howToPlayForSpaceInvaders = "외계인이 나타났다!\\n마우스 왼쪽 버튼으로\\n외계인을 클릭해서 물리쳐 주세요."; @@ -441,7 +448,8 @@ QUnit.test( "DBConnectManager - HowToPlay", function( assert ) { }); }); - +// DB data is not prepared +/* QUnit.test( "DBConnectManager - UpdateRecord", function( assert ) { let todayBestRecord = 0; @@ -488,6 +496,7 @@ QUnit.test( "DBConnectManager - UpdateRecord", function( assert ) { ); }, 200); }); +*/ //////////////////////////////////////////////////