Adding upstream version 124.0.1.upstream/124.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 53 insertions, 0 deletions

diff --git a/toolkit/system/windowsPackageManager/tests/gtest/TestWindowsPackageManager.cpp b/toolkit/system/windowsPackageManager/tests/gtest/TestWindowsPackageManager.cpp
new file mode 100644
index 0000000000..235f44a2f7
--- /dev/null
+++ b/toolkit/system/windowsPackageManager/tests/gtest/TestWindowsPackageManager.cpp
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "gtest/gtest.h"
+#include "nsWindowsPackageManager.h"
+#include "nsServiceManagerUtils.h"
+
+using namespace mozilla::toolkit::system;
+
+TEST(WindowsPackageManager, TestWithMatches)
+{
+  nsCOMPtr<nsIWindowsPackageManager> wpm(
+      do_GetService("@mozilla.org/windows-package-manager;1"));
+  nsTArray<nsString> prefixes, packages;
+  // We're assuming that there will always be at least _one_ Microsoft package
+  // installed when we run tests. This will _probably_ hold true.
+  prefixes.AppendElement(u"Microsoft"_ns);
+  nsresult retVal = wpm->FindUserInstalledPackages(prefixes, packages);
+  ASSERT_GT(packages.Length(), 0U);
+  ASSERT_EQ(NS_OK, retVal);
+}
+
+TEST(WindowsPackageManager, TestWithoutMatches)
+{
+  nsCOMPtr<nsIWindowsPackageManager> wpm(
+      do_GetService("@mozilla.org/windows-package-manager;1"));
+  nsTArray<nsString> prefixes, packages;
+  prefixes.AppendElement(u"DoesntExist"_ns);
+  nsresult retVal = wpm->FindUserInstalledPackages(prefixes, packages);
+  ASSERT_EQ(packages.Length(), 0U);
+  ASSERT_EQ(NS_OK, retVal);
+}
diff --git a/toolkit/system/windowsPackageManager/tests/gtest/moz.build b/toolkit/system/windowsPackageManager/tests/gtest/moz.build
new file mode 100644
index 0000000000..244ae2dfaa
--- /dev/null
+++ b/toolkit/system/windowsPackageManager/tests/gtest/moz.build
@@ -0,0 +1,18 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+UNIFIED_SOURCES += [
+    "TestWindowsPackageManager.cpp",
+]
+
+LOCAL_INCLUDES += [
+    "/toolkit/system/windowsPackageManager",
+]
+
+FINAL_LIBRARY = "xul-gtest"
+
+if CONFIG["CC_TYPE"] in ("clang", "gcc"):
+    CXXFLAGS += ["-Wshadow"]