fix: correct argument extraction order in FormatDateTime and enhance class name parsing in CallConstructor

Author: bialger

lib/execution_tree/BytecodeCommands.cpp

@@ -1201,6 +1201,8 @@ std::expected<ExecutionResult, std::runtime_error> CallConstructor(PassedExecuti
   if (first_underscore != std::string::npos && second_underscore != std::string::npos &&
       second_underscore > first_underscore + 1) {
     class_name = constructor_name.substr(first_underscore + 1, second_underscore - first_underscore - 1);
+  } else if (first_underscore != std::string::npos) {
+    class_name = constructor_name.substr(first_underscore + 1);
   } else {
     class_name = constructor_name;
   }
@@ -1575,15 +1577,15 @@ std::expected<ExecutionResult, std::runtime_error> NanoTime(PassedExecutionData&
 }
 
 std::expected<ExecutionResult, std::runtime_error> FormatDateTime(PassedExecutionData& data) {
-  auto arguments = TryExtractTwoArguments<void*, int64_t>(data, "FormatDateTime");
+  auto arguments = TryExtractTwoArguments<int64_t, void*>(data, "FormatDateTime");
 
   if (!arguments) {
     return std::unexpected(arguments.error());
   }
 
-  auto timestamp_var = arguments.value().second;
+  auto timestamp_var = arguments.value().first;
 
-  void* string_obj1 = arguments.value().first;
+  void* string_obj1 = arguments.value().second;
   auto* format_str_ptr = runtime::GetDataPointer<std::string>(string_obj1);
 
   try {

tests/bytecode_commands_tests.cpp

@@ -1053,6 +1053,7 @@ TEST_F(BuiltinTestSuite, TimeCommands) {
   constexpr int64_t kSleepMs = 1;
   constexpr int64_t kEpochSeconds = 0;
   constexpr std::string_view kYearFormat = "%Y";
+  constexpr std::string_view kFormatString = "%Y-%m-%d %H:%M:%S.%f";
   constexpr std::string_view kDateFormat = "%Y-%m-%d";
   constexpr std::string_view kEpochDate = "1970-01-01";
   constexpr int64_t kPositiveThreshold = 0;
@@ -1085,9 +1086,9 @@ TEST_F(BuiltinTestSuite, TimeCommands) {
   auto nano_val = PopInt();
   EXPECT_GT(nano_val, kPositiveThreshold);
 
-  auto format_str = MakeString(std::string{kYearFormat});
-  PushInt(kEpochSeconds);
+  auto format_str = MakeString(std::string{kFormatString});
   PushObject(format_str);
+  PushInt(second);
   auto format_cmd = MakeSimple("FormatDateTime");
   ASSERT_TRUE(format_cmd);
   EXPECT_TRUE(format_cmd->Execute(data_).has_value());