From d242effc01872acaa8a371a184f31bdea54819fc Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 30 Apr 2014 07:16:13 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=AB=E3=83=8A=E3=83=80=E3=81=8Ccoppa?=
 =?UTF-8?q?=E5=88=A4=E5=AE=9A=E3=81=8B=E3=82=89=E6=BC=8F=E3=82=8C=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7=E8=BF=BD=E5=8A=A0?=
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@796 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/AgeChecker.cpp     |  3 +-
 .../googletest/AgeChecker/testAgeChecker.cpp  | 38 ++++++++++++-------
 2 files changed, 27 insertions(+), 14 deletions(-)

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));
 
 }