Merge branch 'ext-work'FF_Checkpoint_1

1 files changed, 181 insertions, 0 deletions

diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716.rdf b/toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716.rdf
new file mode 100644
index 000000000..d60d8ca3f
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716.rdf
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE RDF:RDF [
+  <!ENTITY bug299716 "urn:mozilla:extension:bug299716">
+  <!ENTITY addons_prefix "http://localhost:4444/addons/test_bug299716">
+  <!ENTITY v0.2 "<em:version>0.2</em:version>">
+
+  <!ENTITY xpcshell.app "
+    <em:id>xpcshell@tests.mozilla.org</em:id>
+    <em:minVersion>5</em:minVersion>
+    <em:maxVersion>5</em:maxVersion>
+  ">
+
+  <!ENTITY toolkit.app "
+    <em:id>toolkit@mozilla.org</em:id>
+    <em:minVersion>1.9</em:minVersion>
+    <em:maxVersion>1.9</em:maxVersion>
+  ">
+
+  <!ENTITY invalidRange "
+    <em:minVersion>30</em:minVersion>
+    <em:maxVersion>30</em:maxVersion>
+  ">
+
+  <!ENTITY xpcshell.invalid "
+    <em:id>xpcshell@tests.mozilla.org</em:id>
+    &invalidRange;
+  ">
+
+  <!ENTITY toolkit.invalid "
+    <em:id>toolkit@mozilla.org</em:id>
+    &invalidRange;
+  ">
+]>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+  <!-- XPCShell -->
+  <RDF:Description about="&bug299716;-a@tests.mozilla.org">
+    <em:updates>
+      <RDF:Seq>
+        <RDF:li RDF:resource="&bug299716;-a@tests.mozilla.org:0.2"/>
+      </RDF:Seq>
+    </em:updates>
+  </RDF:Description>
+
+  <RDF:Description about="&bug299716;-a@tests.mozilla.org:0.2">
+    &v0.2;
+    <em:targetApplication>
+      <RDF:Description em:updateLink="&addons_prefix;_a_2.xpi">
+        &xpcshell.app;
+      </RDF:Description>
+    </em:targetApplication>
+  </RDF:Description>
+
+  <!-- Toolkit -->
+  <RDF:Description about="&bug299716;-b@tests.mozilla.org">
+    <em:updates>
+      <RDF:Seq>
+        <RDF:li RDF:resource="&bug299716;-b@tests.mozilla.org:0.2"/>
+      </RDF:Seq>
+    </em:updates>
+  </RDF:Description>
+
+  <RDF:Description about="&bug299716;-b@tests.mozilla.org:0.2">
+    &v0.2;
+    <em:targetApplication>
+      <RDF:Description em:updateLink="&addons_prefix;_b_2.xpi">
+        &toolkit.app;
+      </RDF:Description>
+    </em:targetApplication>
+  </RDF:Description>
+
+  <!-- XPCShell + Toolkit -->
+  <RDF:Description about="&bug299716;-c@tests.mozilla.org">
+    <em:updates>
+      <RDF:Seq>
+        <RDF:li RDF:resource="&bug299716;-c@tests.mozilla.org:0.2"/>
+      </RDF:Seq>
+    </em:updates>
+  </RDF:Description>
+
+  <RDF:Description about="&bug299716;-c@tests.mozilla.org:0.2">
+    &v0.2;
+    <em:targetApplication>
+      <RDF:Description em:updateLink="&addons_prefix;_c_2.xpi">
+        &xpcshell.app;
+      </RDF:Description>
+    </em:targetApplication>
+    <em:targetApplication>
+      <RDF:Description em:updateLink="&addons_prefix;_c_2.xpi">
+        &toolkit.app;
+      </RDF:Description>
+    </em:targetApplication>
+  </RDF:Description>
+
+  <!-- XPCShell (Toolkit invalid) -->
+  <RDF:Description about="&bug299716;-d@tests.mozilla.org">
+    <em:updates>
+      <RDF:Seq>
+        <RDF:li RDF:resource="&bug299716;-d@tests.mozilla.org:0.2"/>
+      </RDF:Seq>
+    </em:updates>
+  </RDF:Description>
+
+  <RDF:Description about="&bug299716;-d@tests.mozilla.org:0.2">
+    &v0.2;
+    <em:targetApplication>
+      <RDF:Description em:updateLink="&addons_prefix;_d_2.xpi">
+        &xpcshell.app;
+      </RDF:Description>
+    </em:targetApplication>
+    <em:targetApplication>
+      <RDF:Description em:updateLink="&addons_prefix;_d_2.xpi">
+        &toolkit.invalid;
+      </RDF:Description>
+    </em:targetApplication>
+  </RDF:Description>
+
+  <!-- Toolkit (XPCShell invalid), should not install -->
+  <RDF:Description about="&bug299716;-e@tests.mozilla.org">
+    <em:updates>
+      <RDF:Seq>
+        <RDF:li RDF:resource="&bug299716;-e@tests.mozilla.org:0.2"/>
+      </RDF:Seq>
+    </em:updates>
+  </RDF:Description>
+
+  <RDF:Description about="&bug299716;-e@tests.mozilla.org:0.2">
+    &v0.2;
+    <em:targetApplication>
+      <RDF:Description em:updateLink="&addons_prefix;_e_2.xpi">
+        &xpcshell.invalid;
+      </RDF:Description>
+    </em:targetApplication>
+    <em:targetApplication>
+      <RDF:Description em:updateLink="&addons_prefix;_e_2.xpi">
+        &toolkit.app;
+      </RDF:Description>
+    </em:targetApplication>
+  </RDF:Description>
+
+  <!-- None (XPCShell, Toolkit invalid), should not install -->
+  <RDF:Description about="&bug299716;-f@tests.mozilla.org">
+    <em:updates>
+      <RDF:Seq>
+        <RDF:li RDF:resource="&bug299716;-f@tests.mozilla.org:0.2"/>
+      </RDF:Seq>
+    </em:updates>
+  </RDF:Description>
+
+  <RDF:Description about="&bug299716;-f@tests.mozilla.org:0.2">
+    &v0.2;
+    <em:targetApplication>
+      <RDF:Description em:updateLink="&addons_prefix;_f_2.xpi">
+        &xpcshell.invalid;
+      </RDF:Description>
+    </em:targetApplication>
+    <em:targetApplication>
+      <RDF:Description em:updateLink="&addons_prefix;_f_2.xpi">
+        &toolkit.invalid;
+      </RDF:Description>
+    </em:targetApplication>
+  </RDF:Description>
+
+  <!-- Toolkit (invalid), should not install -->
+  <RDF:Description about="&bug299716;-g@tests.mozilla.org">
+    <em:updates>
+      <RDF:Seq>
+        <RDF:li RDF:resource="&bug299716;-g@tests.mozilla.org:0.2"/>
+      </RDF:Seq>
+    </em:updates>
+  </RDF:Description>
+
+  <RDF:Description about="&bug299716;-g@tests.mozilla.org:0.2">
+    &v0.2;
+    <em:targetApplication>
+      <RDF:Description em:updateLink="&addons_prefix;_g_2.xpi">
+        &toolkit.invalid;
+      </RDF:Description>
+    </em:targetApplication>
+  </RDF:Description>
+</RDF:RDF>