From 6d6afdb3ba3a6e547c4a79a8cccbe2a8e6b963da Mon Sep 17 00:00:00 2001 From: N2614 Date: Wed, 9 Apr 2014 08:29:56 +0000 Subject: [PATCH] =?UTF-8?q?using=20namespace=E3=82=92=E4=BD=BF=E3=81=86?= =?UTF-8?q?=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@782 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../googletest/AgeChecker/testAgeChecker.cpp | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/AgeChecker/testAgeChecker.cpp b/trunk/ConsoleDataMigration/sources/tests/googletest/AgeChecker/testAgeChecker.cpp index 59393c7..7f0c95e 100644 --- a/trunk/ConsoleDataMigration/sources/tests/googletest/AgeChecker/testAgeChecker.cpp +++ b/trunk/ConsoleDataMigration/sources/tests/googletest/AgeChecker/testAgeChecker.cpp @@ -2,19 +2,21 @@ #include "AgeChecker.h" +using namespace nn::cfg::CTR; + TEST(testPin, A) { ConsoleRestore::AgeChecker ac; // A-1 - ASSERT_TRUE(ac.IsPinRestrictionRequired(12, nn::cfg::CTR::CFG_REGION_AMERICA, nn::cfg::CTR::CFG_COUNTRY_UNITED_STATES)); + ASSERT_TRUE(ac.IsPinRestrictionRequired(12, CFG_REGION_AMERICA, CFG_COUNTRY_UNITED_STATES)); // A-2 - ASSERT_TRUE(ac.IsPinRestrictionRequired(12, nn::cfg::CTR::CFG_REGION_AMERICA, nn::cfg::CTR::CFG_COUNTRY_CANADA)); + ASSERT_TRUE(ac.IsPinRestrictionRequired(12, CFG_REGION_AMERICA, CFG_COUNTRY_CANADA)); // A-3 - ASSERT_TRUE(ac.IsPinRestrictionRequired(12, nn::cfg::CTR::CFG_REGION_EUROPE, nn::cfg::CTR::CFG_COUNTRY_UNITED_KINGDOM)); + ASSERT_TRUE(ac.IsPinRestrictionRequired(12, CFG_REGION_EUROPE, CFG_COUNTRY_UNITED_KINGDOM)); // A-4 - ASSERT_TRUE(ac.IsPinRestrictionRequired(17, nn::cfg::CTR::CFG_REGION_EUROPE, nn::cfg::CTR::CFG_COUNTRY_AUSTRALIA)); - ASSERT_TRUE(ac.IsPinRestrictionRequired(17, nn::cfg::CTR::CFG_REGION_EUROPE, nn::cfg::CTR::CFG_COUNTRY_NEW_ZEALAND)); + ASSERT_TRUE(ac.IsPinRestrictionRequired(17, CFG_REGION_EUROPE, CFG_COUNTRY_AUSTRALIA)); + ASSERT_TRUE(ac.IsPinRestrictionRequired(17, CFG_REGION_EUROPE, CFG_COUNTRY_NEW_ZEALAND)); } TEST(testPin, B) @@ -22,14 +24,14 @@ TEST(testPin, B) ConsoleRestore::AgeChecker ac; // B-1 - ASSERT_FALSE(ac.IsPinRestrictionRequired(13, nn::cfg::CTR::CFG_REGION_AMERICA, nn::cfg::CTR::CFG_COUNTRY_UNITED_STATES)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_AMERICA, CFG_COUNTRY_UNITED_STATES)); // B-2 - ASSERT_FALSE(ac.IsPinRestrictionRequired(13, nn::cfg::CTR::CFG_REGION_AMERICA, nn::cfg::CTR::CFG_COUNTRY_CANADA)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_AMERICA, CFG_COUNTRY_CANADA)); // B-3 - ASSERT_FALSE(ac.IsPinRestrictionRequired(13, nn::cfg::CTR::CFG_REGION_EUROPE, nn::cfg::CTR::CFG_COUNTRY_UNITED_KINGDOM)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_EUROPE, CFG_COUNTRY_UNITED_KINGDOM)); // B-4 - ASSERT_FALSE(ac.IsPinRestrictionRequired(18, nn::cfg::CTR::CFG_REGION_EUROPE, nn::cfg::CTR::CFG_COUNTRY_AUSTRALIA)); - ASSERT_FALSE(ac.IsPinRestrictionRequired(18, nn::cfg::CTR::CFG_REGION_EUROPE, nn::cfg::CTR::CFG_COUNTRY_NEW_ZEALAND)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(18, CFG_REGION_EUROPE, CFG_COUNTRY_AUSTRALIA)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(18, CFG_REGION_EUROPE, CFG_COUNTRY_NEW_ZEALAND)); } TEST(testPin, C) @@ -37,23 +39,23 @@ TEST(testPin, C) ConsoleRestore::AgeChecker ac; // C-1 - ASSERT_FALSE(ac.IsPinRestrictionRequired(12, nn::cfg::CTR::CFG_REGION_JAPAN, nn::cfg::CTR::CFG_COUNTRY_JAPAN)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(12, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); // C-2 - ASSERT_FALSE(ac.IsPinRestrictionRequired(13, nn::cfg::CTR::CFG_REGION_JAPAN, nn::cfg::CTR::CFG_COUNTRY_JAPAN)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); // C-3 - ASSERT_FALSE(ac.IsPinRestrictionRequired(17, nn::cfg::CTR::CFG_REGION_JAPAN, nn::cfg::CTR::CFG_COUNTRY_JAPAN)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(17, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); // C-4 - ASSERT_FALSE(ac.IsPinRestrictionRequired(18, nn::cfg::CTR::CFG_REGION_JAPAN, nn::cfg::CTR::CFG_COUNTRY_JAPAN)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(18, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); } TEST(testCoppa, all) { ConsoleRestore::AgeChecker ac; // A-1 - ASSERT_TRUE(ac.IsPinRestrictionRequired(12, nn::cfg::CTR::CFG_REGION_AMERICA, nn::cfg::CTR::CFG_COUNTRY_UNITED_STATES)); + ASSERT_TRUE(ac.IsPinRestrictionRequired(12, CFG_REGION_AMERICA, CFG_COUNTRY_UNITED_STATES)); // その他 - ASSERT_FALSE(ac.IsPinRestrictionRequired(13, nn::cfg::CTR::CFG_REGION_AMERICA, nn::cfg::CTR::CFG_COUNTRY_UNITED_STATES)); - ASSERT_FALSE(ac.IsPinRestrictionRequired(13, nn::cfg::CTR::CFG_REGION_EUROPE, nn::cfg::CTR::CFG_COUNTRY_UNITED_KINGDOM)); - ASSERT_FALSE(ac.IsPinRestrictionRequired(13, nn::cfg::CTR::CFG_REGION_JAPAN, nn::cfg::CTR::CFG_COUNTRY_JAPAN)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_AMERICA, CFG_COUNTRY_UNITED_STATES)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_EUROPE, CFG_COUNTRY_UNITED_KINGDOM)); + ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); }