diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/AgeChecker.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/AgeChecker.cpp index 1abfa1b..4b4f61b 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/AgeChecker.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/AgeChecker.cpp @@ -63,7 +63,8 @@ bool AgeChecker::IsPinRestrictionRequired(u32 age, CfgRegionCode region, CfgCoun bool AgeChecker::IsCoppaRequired(u32 age, nn::cfg::CTR::CfgRegionCode region, nn::cfg::CTR::CfgCountryCode country) { - if (region == CFG_REGION_AMERICA && country == CFG_COUNTRY_UNITED_STATES && age < COPPA_REQUIRED_AGE) + if ((region == CFG_REGION_AMERICA && country == CFG_COUNTRY_UNITED_STATES && age < COPPA_REQUIRED_AGE) || + (region == CFG_REGION_AMERICA && country == CFG_COUNTRY_CANADA && age < COPPA_REQUIRED_AGE)) { return true; } diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/AgeChecker/testAgeChecker.cpp b/trunk/ConsoleDataMigration/sources/tests/googletest/AgeChecker/testAgeChecker.cpp index 7f0c95e..d6f9af4 100644 --- a/trunk/ConsoleDataMigration/sources/tests/googletest/AgeChecker/testAgeChecker.cpp +++ b/trunk/ConsoleDataMigration/sources/tests/googletest/AgeChecker/testAgeChecker.cpp @@ -32,19 +32,15 @@ TEST(testPin, B) // B-4 ASSERT_FALSE(ac.IsPinRestrictionRequired(18, CFG_REGION_EUROPE, CFG_COUNTRY_AUSTRALIA)); ASSERT_FALSE(ac.IsPinRestrictionRequired(18, CFG_REGION_EUROPE, CFG_COUNTRY_NEW_ZEALAND)); + // B-5 + ASSERT_FALSE(ac.IsPinRestrictionRequired(12, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); } -TEST(testPin, C) +TEST(testPin, D) { ConsoleRestore::AgeChecker ac; - // C-1 - ASSERT_FALSE(ac.IsPinRestrictionRequired(12, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); - // C-2 - ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); - // C-3 - ASSERT_FALSE(ac.IsPinRestrictionRequired(17, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); - // C-4 + // D-1, 2 ASSERT_FALSE(ac.IsPinRestrictionRequired(18, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); } @@ -52,10 +48,26 @@ TEST(testCoppa, all) { ConsoleRestore::AgeChecker ac; // A-1 - ASSERT_TRUE(ac.IsPinRestrictionRequired(12, CFG_REGION_AMERICA, CFG_COUNTRY_UNITED_STATES)); - // その他 - 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)); + ASSERT_TRUE(ac.IsCoppaRequired(12, CFG_REGION_AMERICA, CFG_COUNTRY_UNITED_STATES)); + // A-2 + ASSERT_TRUE(ac.IsCoppaRequired(12, CFG_REGION_AMERICA, CFG_COUNTRY_CANADA)); + // A-3 + ASSERT_FALSE(ac.IsCoppaRequired(12, CFG_REGION_EUROPE, CFG_COUNTRY_UNITED_KINGDOM)); + // A-4 + ASSERT_FALSE(ac.IsCoppaRequired(17, CFG_REGION_EUROPE, CFG_COUNTRY_AUSTRALIA)); + ASSERT_FALSE(ac.IsCoppaRequired(17, CFG_REGION_EUROPE, CFG_COUNTRY_NEW_ZEALAND)); + // B-1 + ASSERT_FALSE(ac.IsCoppaRequired(13, CFG_REGION_AMERICA, CFG_COUNTRY_UNITED_STATES)); + // B-2 + ASSERT_FALSE(ac.IsCoppaRequired(13, CFG_REGION_AMERICA, CFG_COUNTRY_CANADA)); + // B-3 + ASSERT_FALSE(ac.IsCoppaRequired(13, CFG_REGION_EUROPE, CFG_COUNTRY_UNITED_KINGDOM)); + // B-4 + ASSERT_FALSE(ac.IsCoppaRequired(18, CFG_REGION_EUROPE, CFG_COUNTRY_AUSTRALIA)); + ASSERT_FALSE(ac.IsCoppaRequired(18, CFG_REGION_EUROPE, CFG_COUNTRY_NEW_ZEALAND)); + // B-5 + ASSERT_FALSE(ac.IsCoppaRequired(12, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); + // D-1, 2 + ASSERT_FALSE(ac.IsCoppaRequired(18, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN)); }