From 65e105935c46dd07140ee30f81c83a58ae98aa34 Mon Sep 17 00:00:00 2001
From: Sangyoon21 <143711987+Sangyoon21@users.noreply.github.com>
Date: Sat, 13 Jul 2024 14:44:26 +0300
Subject: [PATCH] Making the correct Parsing

---
 TestResultSummaryService/parsers/Parser.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/TestResultSummaryService/parsers/Parser.js b/TestResultSummaryService/parsers/Parser.js
index ca8d6e56..8b9f6cae 100644
--- a/TestResultSummaryService/parsers/Parser.js
+++ b/TestResultSummaryService/parsers/Parser.js
@@ -13,7 +13,7 @@ class Parser {
         const javaVersionRegex =
             /=JAVA VERSION OUTPUT BEGIN=[\r\n]+([\s\S]*?)[\r\n]+.*=JAVA VERSION OUTPUT END=/;
         const javaBuildDateRegex =
-            /\s([0-9]{4})-?(0[1-9]|1[012])-?(0[1-9]|[12][0-9]|3[01])/;
+            /Eclipse OpenJ9 VM \(build [^,]+, JRE [^\s]+ [^\s]+ [^\s]+ (\d{8})_/;
         const sdkResourceRegex = /.*?SDK_RESOURCE\=(.*)[\r\n]+/;
         let curRegexResult = null;
         let javaVersion, jdkDate, sdkResource;
@@ -26,8 +26,11 @@ class Parser {
         }
         curRegexResult = null;
         // parse jdk date from javaVersion
-        if ((curRegexResult = javaBuildDateRegex.exec(javaVersion)) !== null) {
-            jdkDate = curRegexResult[0];
+        if ((curRegexResult = javaBuildDateRegex.exec(output)) !== null) {
+            jdkDate = curRegexResult[1].trim(); // Ensure the date is trimmed
+            // Convert jdkDate from YYYYMMDD to YYYY-MM-DD
+            jdkDate = `${jdkDate.substring(0, 4)}-${jdkDate.substring(4, 6)}-${jdkDate.substring(6, 8)}`;
+            console.log('Parsed jdkDate:', jdkDate);  // Log statement to show jdkDate
         }
         return { javaVersion, jdkDate, sdkResource };
     }
@@ -102,7 +105,7 @@ class Parser {
         let versions = {};
 
         const releaseInfoRegex =
-            /=RELEASE INFO BEGIN=\n[\s\S]*?SOURCE="(.*)"[\s\S]*?=RELEASE INFO END=/;
+            /=RELEASE INFO BEGIN=\n[\s\S]*?SOURCE="(.*)"[\r\n]+.*=RELEASE INFO END=/;
         const generalOpenjdkShaRegex = /git:(.*)/;
         const openjdkShaRegex = /OpenJDK:\s?([^\s\:]*)/;
         const j9AndOmrShaRegex = /OpenJ9:\s?([^\s\:]*).*OMR:\s?([^\s\:]*)/;