6 files changed, 70 insertions, 0 deletions
diff --git a/toolkit/components/commandlines/test/unit/data/test_bug410156.desktop b/toolkit/components/commandlines/test/unit/data/test_bug410156.desktop
new file mode 100644
index 0000000000..1847cdd98e
--- /dev/null
+++ b/toolkit/components/commandlines/test/unit/data/test_bug410156.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=test_bug410156
+Type=Link
+URL=http://www.bug410156.com/
+Icon=gnome-fs-bookmark
diff --git a/toolkit/components/commandlines/test/unit/data/test_bug410156.url b/toolkit/components/commandlines/test/unit/data/test_bug410156.url
new file mode 100644
index 0000000000..6920e1f774
--- /dev/null
+++ b/toolkit/components/commandlines/test/unit/data/test_bug410156.url
@@ -0,0 +1,9 @@
+[InternetShortcut]
+URL=http://www.bug410156.com/
+IDList=
+HotKey=0
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut.A]
+[InternetShortcut.W]
+URL=http://www.bug410156.com/
diff --git a/toolkit/components/commandlines/test/unit/test_bug666224.js b/toolkit/components/commandlines/test/unit/test_bug666224.js
new file mode 100644
index 0000000000..a53ee3e733
--- /dev/null
+++ b/toolkit/components/commandlines/test/unit/test_bug666224.js
@@ -0,0 +1,6 @@
+function run_test() {
+  var cmdLine = Cu.createCommandLine();
+  try {
+    cmdLine.getArgument(cmdLine.length);
+  } catch (e) {}
+}
diff --git a/toolkit/components/commandlines/test/unit/test_classinfo.js b/toolkit/components/commandlines/test/unit/test_classinfo.js
new file mode 100644
index 0000000000..50a677c0e0
--- /dev/null
+++ b/toolkit/components/commandlines/test/unit/test_classinfo.js
@@ -0,0 +1,8 @@
+/* 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/. */
+
+function run_test() {
+  var commandLine = Cu.createCommandLine();
+  Assert.ok("length" in commandLine);
+}
diff --git a/toolkit/components/commandlines/test/unit/test_resolvefile.js b/toolkit/components/commandlines/test/unit/test_resolvefile.js
new file mode 100644
index 0000000000..79eab32319
--- /dev/null
+++ b/toolkit/components/commandlines/test/unit/test_resolvefile.js
@@ -0,0 +1,30 @@
+/* Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+add_task(async function test_resolveFile() {
+  const EXISTING_FILE = do_get_file("xpcshell.ini");
+  // We explicitly do not initialize this with a working dir.
+  let cmdLine = Cu.createCommandLine();
+  let fileByPath = cmdLine.resolveFile(EXISTING_FILE.path);
+  info("Resolved: " + fileByPath.path);
+  Assert.ok(EXISTING_FILE.equals(fileByPath), "Should find the same file");
+
+  Assert.ok(
+    !cmdLine.resolveFile("xpcshell.ini"),
+    "Should get null for relative files."
+  );
+
+  // Now create a commandline with a working dir:
+  cmdLine = Cu.createCommandLine(EXISTING_FILE.parent);
+  let resolvedTxtFile = cmdLine.resolveFile("xpcshell.ini");
+
+  info("Resolved: " + resolvedTxtFile.path);
+  Assert.ok(
+    EXISTING_FILE.equals(resolvedTxtFile),
+    "Should resolve relative file."
+  );
+});
diff --git a/toolkit/components/commandlines/test/unit/xpcshell.ini b/toolkit/components/commandlines/test/unit/xpcshell.ini
new file mode 100644
index 0000000000..89772407c6
--- /dev/null
+++ b/toolkit/components/commandlines/test/unit/xpcshell.ini
@@ -0,0 +1,10 @@
+[DEFAULT]
+head =
+skip-if = toolkit == 'android'
+support-files =
+  data/test_bug410156.desktop
+  data/test_bug410156.url
+
+[test_classinfo.js]
+[test_bug666224.js]
+[test_resolvefile.js]