From f214f74e03e5b46fda9e75618cfc97dee7faef0d Mon Sep 17 00:00:00 2001
From: zkldi <notzkldi@zkldi.com>
Date: Thu, 20 May 2021 19:57:12 +0100
Subject: [PATCH] rename some invalid percent and date errs

---
 server/src/score-import/framework/common/score-utils.ts         | 2 +-
 .../import-types/common/batch-manual/converter.test.ts          | 2 +-
 .../score-import/import-types/file/mer-iidx/converter.test.ts   | 2 +-
 .../src/score-import/import-types/ir/fervidex/converter.test.ts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/score-import/framework/common/score-utils.ts b/server/src/score-import/framework/common/score-utils.ts
index c9b6b8c1b..6623a1dde 100644
--- a/server/src/score-import/framework/common/score-utils.ts
+++ b/server/src/score-import/framework/common/score-utils.ts
@@ -162,7 +162,7 @@ export function ParseDateFromString(str: string | undefined | null): number | nu
     const date = Date.parse(str);
 
     if (Number.isNaN(date)) {
-        throw new InvalidScoreFailure(`Could not convert date ${str} to number.`);
+        throw new InvalidScoreFailure(`Invalid/Unparsable score timestamp of ${str}.`);
     }
 
     return date;
diff --git a/server/src/score-import/import-types/common/batch-manual/converter.test.ts b/server/src/score-import/import-types/common/batch-manual/converter.test.ts
index b2baf801f..5339b6491 100644
--- a/server/src/score-import/import-types/common/batch-manual/converter.test.ts
+++ b/server/src/score-import/import-types/common/batch-manual/converter.test.ts
@@ -379,7 +379,7 @@ t.test("#ConverterFn", (t) => {
                     importType,
                     logger
                 ),
-            { message: /Invalid score of 2000, produced percent of 127/u } as any
+            { message: /Invalid percent/u } as any
         );
 
         t.end();
diff --git a/server/src/score-import/import-types/file/mer-iidx/converter.test.ts b/server/src/score-import/import-types/file/mer-iidx/converter.test.ts
index 0f945c16e..d6f90799b 100644
--- a/server/src/score-import/import-types/file/mer-iidx/converter.test.ts
+++ b/server/src/score-import/import-types/file/mer-iidx/converter.test.ts
@@ -127,7 +127,7 @@ t.test("#ConvertFileMerIIDX", (t) => {
 
     t.test("Invalid Date", (t) => {
         t.rejects(() => merc({ update_time: "INVALID" }), {
-            message: /Invalid score timestamp of INVALID/u,
+            message: /Invalid percent/u,
         } as any);
 
         t.end();
diff --git a/server/src/score-import/import-types/ir/fervidex/converter.test.ts b/server/src/score-import/import-types/ir/fervidex/converter.test.ts
index 3c866674c..9814092b2 100644
--- a/server/src/score-import/import-types/ir/fervidex/converter.test.ts
+++ b/server/src/score-import/import-types/ir/fervidex/converter.test.ts
@@ -178,7 +178,7 @@ t.test("#ConverterIRFervidex", (t) => {
                 "ir/fervidex",
                 logger
             ),
-            { message: /Invalid score of 9999 for chart.*Resulted in percent/giu } as any
+            { message: /Invalid percent/giu } as any
         );
 
         t.end();