From 6a4064e3d4ba1232e8de661a0efb6ab1bcbb0870 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 1 Oct 2009 19:23:21 +0000
Subject: - Patch #591632 by dww | chx: Changed Refactor tests to allow testing
 contrib.

---
 modules/update/tests/aaa_update_test.1_0.xml | 34 ++++++++++++++
 modules/update/tests/aaa_update_test.info    |  7 +++
 modules/update/tests/aaa_update_test.module  |  7 +++
 modules/update/tests/bbb_update_test.1_0.xml | 34 ++++++++++++++
 modules/update/tests/bbb_update_test.info    |  7 +++
 modules/update/tests/bbb_update_test.module  |  7 +++
 modules/update/tests/ccc_update_test.1_0.xml | 34 ++++++++++++++
 modules/update/tests/ccc_update_test.info    |  7 +++
 modules/update/tests/ccc_update_test.module  |  7 +++
 modules/update/tests/dev-snapshot.xml        | 50 --------------------
 modules/update/tests/drupal.0.xml            | 34 ++++++++++++++
 modules/update/tests/drupal.1.xml            | 51 ++++++++++++++++++++
 modules/update/tests/drupal.2-sec.xml        | 69 ++++++++++++++++++++++++++++
 modules/update/tests/drupal.dev.xml          | 50 ++++++++++++++++++++
 modules/update/tests/no-updates.xml          | 34 --------------
 modules/update/tests/normal-update.xml       | 51 --------------------
 modules/update/tests/security-update.xml     | 69 ----------------------------
 modules/update/tests/update_test.module      | 30 ++++++++++--
 18 files changed, 373 insertions(+), 209 deletions(-)
 create mode 100644 modules/update/tests/aaa_update_test.1_0.xml
 create mode 100644 modules/update/tests/aaa_update_test.info
 create mode 100644 modules/update/tests/aaa_update_test.module
 create mode 100644 modules/update/tests/bbb_update_test.1_0.xml
 create mode 100644 modules/update/tests/bbb_update_test.info
 create mode 100644 modules/update/tests/bbb_update_test.module
 create mode 100644 modules/update/tests/ccc_update_test.1_0.xml
 create mode 100644 modules/update/tests/ccc_update_test.info
 create mode 100644 modules/update/tests/ccc_update_test.module
 delete mode 100644 modules/update/tests/dev-snapshot.xml
 create mode 100644 modules/update/tests/drupal.0.xml
 create mode 100644 modules/update/tests/drupal.1.xml
 create mode 100644 modules/update/tests/drupal.2-sec.xml
 create mode 100644 modules/update/tests/drupal.dev.xml
 delete mode 100644 modules/update/tests/no-updates.xml
 delete mode 100644 modules/update/tests/normal-update.xml
 delete mode 100644 modules/update/tests/security-update.xml

(limited to 'modules/update/tests')

diff --git a/modules/update/tests/aaa_update_test.1_0.xml b/modules/update/tests/aaa_update_test.1_0.xml
new file mode 100644
index 000000000..a168453f0
--- /dev/null
+++ b/modules/update/tests/aaa_update_test.1_0.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+<title>AAA Update test</title>
+<short_name>aaa_update_test</short_name>
+<dc:creator>Drupal</dc:creator>
+<api_version>7.x</api_version>
+<recommended_major>1</recommended_major>
+<supported_majors>1</supported_majors>
+<default_major>1</default_major>
+<project_status>published</project_status>
+<link>http://example.com/project/aaa_update_test</link>
+  <terms>
+   <term><name>Projects</name><value>Modules</value></term>
+  </terms>
+<releases>
+ <release>
+  <name>aaa_update_test 7.x-1.0</name>
+  <version>7.x-1.0</version>
+  <tag>DRUPAL-7--1-0</tag>
+  <version_major>1</version_major>
+  <version_patch>0</version_patch>
+  <status>published</status>
+  <release_link>http://example.com/aaa_update_test-7-x-1-0-release</release_link>
+  <download_link>http://example.com/aaa_update_test-7.x-1.0.tar.gz</download_link>
+  <date>1250424521</date>
+  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+  <filesize>1073741824</filesize>
+  <terms>
+   <term><name>Release type</name><value>New features</value></term>
+   <term><name>Release type</name><value>Bug fixes</value></term>
+  </terms>
+ </release>
+</releases>
+</project>
diff --git a/modules/update/tests/aaa_update_test.info b/modules/update/tests/aaa_update_test.info
new file mode 100644
index 000000000..634d9840d
--- /dev/null
+++ b/modules/update/tests/aaa_update_test.info
@@ -0,0 +1,7 @@
+; $Id$
+name = AAA Update test
+description = Support module for update module testing.
+package = Testing
+core = 7.x
+files[] = aaa_update_test.module
+hidden = TRUE
diff --git a/modules/update/tests/aaa_update_test.module b/modules/update/tests/aaa_update_test.module
new file mode 100644
index 000000000..da4699c05
--- /dev/null
+++ b/modules/update/tests/aaa_update_test.module
@@ -0,0 +1,7 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Dummy module for testing Update status.
+ */
diff --git a/modules/update/tests/bbb_update_test.1_0.xml b/modules/update/tests/bbb_update_test.1_0.xml
new file mode 100644
index 000000000..bfdf196f8
--- /dev/null
+++ b/modules/update/tests/bbb_update_test.1_0.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+<title>BBB Update test</title>
+<short_name>bbb_update_test</short_name>
+<dc:creator>Drupal</dc:creator>
+<api_version>7.x</api_version>
+<recommended_major>1</recommended_major>
+<supported_majors>1</supported_majors>
+<default_major>1</default_major>
+<project_status>published</project_status>
+<link>http://example.com/project/bbb_update_test</link>
+  <terms>
+   <term><name>Projects</name><value>Modules</value></term>
+  </terms>
+<releases>
+ <release>
+  <name>bbb_update_test 7.x-1.0</name>
+  <version>7.x-1.0</version>
+  <tag>DRUPAL-7--1-0</tag>
+  <version_major>1</version_major>
+  <version_patch>0</version_patch>
+  <status>published</status>
+  <release_link>http://example.com/bbb_update_test-7-x-1-0-release</release_link>
+  <download_link>http://example.com/bbb_update_test-7.x-1.0.tar.gz</download_link>
+  <date>1250424521</date>
+  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+  <filesize>1073741824</filesize>
+  <terms>
+   <term><name>Release type</name><value>New features</value></term>
+   <term><name>Release type</name><value>Bug fixes</value></term>
+  </terms>
+ </release>
+</releases>
+</project>
diff --git a/modules/update/tests/bbb_update_test.info b/modules/update/tests/bbb_update_test.info
new file mode 100644
index 000000000..d322dc375
--- /dev/null
+++ b/modules/update/tests/bbb_update_test.info
@@ -0,0 +1,7 @@
+; $Id$
+name = BBB Update test
+description = Support module for update module testing.
+package = Testing
+core = 7.x
+files[] = bbb_update_test.module
+hidden = TRUE
diff --git a/modules/update/tests/bbb_update_test.module b/modules/update/tests/bbb_update_test.module
new file mode 100644
index 000000000..da4699c05
--- /dev/null
+++ b/modules/update/tests/bbb_update_test.module
@@ -0,0 +1,7 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Dummy module for testing Update status.
+ */
diff --git a/modules/update/tests/ccc_update_test.1_0.xml b/modules/update/tests/ccc_update_test.1_0.xml
new file mode 100644
index 000000000..1b9ba75cd
--- /dev/null
+++ b/modules/update/tests/ccc_update_test.1_0.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+<title>CCC Update test</title>
+<short_name>ccc_update_test</short_name>
+<dc:creator>Drupal</dc:creator>
+<api_version>7.x</api_version>
+<recommended_major>1</recommended_major>
+<supported_majors>1</supported_majors>
+<default_major>1</default_major>
+<project_status>published</project_status>
+<link>http://example.com/project/ccc_update_test</link>
+  <terms>
+   <term><name>Projects</name><value>Modules</value></term>
+  </terms>
+<releases>
+ <release>
+  <name>ccc_update_test 7.x-1.0</name>
+  <version>7.x-1.0</version>
+  <tag>DRUPAL-7--1-0</tag>
+  <version_major>1</version_major>
+  <version_patch>0</version_patch>
+  <status>published</status>
+  <release_link>http://example.com/ccc_update_test-7-x-1-0-release</release_link>
+  <download_link>http://example.com/ccc_update_test-7.x-1.0.tar.gz</download_link>
+  <date>1250424521</date>
+  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+  <filesize>1073741824</filesize>
+  <terms>
+   <term><name>Release type</name><value>New features</value></term>
+   <term><name>Release type</name><value>Bug fixes</value></term>
+  </terms>
+ </release>
+</releases>
+</project>
diff --git a/modules/update/tests/ccc_update_test.info b/modules/update/tests/ccc_update_test.info
new file mode 100644
index 000000000..a4eb3ea06
--- /dev/null
+++ b/modules/update/tests/ccc_update_test.info
@@ -0,0 +1,7 @@
+; $Id$
+name = CCC Update test
+description = Support module for update module testing.
+package = Testing
+core = 7.x
+files[] = ccc_update_test.module
+hidden = TRUE
diff --git a/modules/update/tests/ccc_update_test.module b/modules/update/tests/ccc_update_test.module
new file mode 100644
index 000000000..da4699c05
--- /dev/null
+++ b/modules/update/tests/ccc_update_test.module
@@ -0,0 +1,7 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Dummy module for testing Update status.
+ */
diff --git a/modules/update/tests/dev-snapshot.xml b/modules/update/tests/dev-snapshot.xml
deleted file mode 100644
index 49dcc3f5f..000000000
--- a/modules/update/tests/dev-snapshot.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns:dc="http://purl.org/dc/elements/1.1/">
-<title>Drupal</title>
-<short_name>drupal</short_name>
-<dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
-<recommended_major>7</recommended_major>
-<supported_majors>7</supported_majors>
-<default_major>7</default_major>
-<project_status>published</project_status>
-<link>http://example.com/project/drupal</link>
-  <terms>
-   <term><name>Projects</name><value>Drupal project</value></term>
-  </terms>
-<releases>
- <release>
-  <name>Drupal 7.0</name>
-  <version>7.0</version>
-  <tag>DRUPAL-7-0</tag>
-  <version_major>7</version_major>
-  <version_patch>0</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-7-0-release</release_link>
-  <download_link>http://example.com/drupal-7-0.tar.gz</download_link>
-  <date>1250424521</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>1073741824</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-  </terms>
- </release>
- <release>
-  <name>Drupal 7.x-dev</name>
-  <version>7.x-dev</version>
-  <tag>DRUPAL-7</tag>
-  <version_major>7</version_major>
-  <version_extra>dev</version_extra>
-  <status>published</status>
-  <release_link>http://example.com/drupal-7-x-dev-release</release_link>
-  <download_link>http://example.com/drupal-7.x-dev.tar.gz</download_link>
-  <date>1250424581</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>2147483648</filesize>
-  <terms>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-  </terms>
- </release>
-</releases>
-</project>
diff --git a/modules/update/tests/drupal.0.xml b/modules/update/tests/drupal.0.xml
new file mode 100644
index 000000000..701e11e3e
--- /dev/null
+++ b/modules/update/tests/drupal.0.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+<title>Drupal</title>
+<short_name>drupal</short_name>
+<dc:creator>Drupal</dc:creator>
+<api_version>7.x</api_version>
+<recommended_major>7</recommended_major>
+<supported_majors>7</supported_majors>
+<default_major>7</default_major>
+<project_status>published</project_status>
+<link>http://example.com/project/drupal</link>
+  <terms>
+   <term><name>Projects</name><value>Drupal project</value></term>
+  </terms>
+<releases>
+ <release>
+  <name>Drupal 7.0</name>
+  <version>7.0</version>
+  <tag>DRUPAL-7-0</tag>
+  <version_major>7</version_major>
+  <version_patch>0</version_patch>
+  <status>published</status>
+  <release_link>http://example.com/drupal-7-0-release</release_link>
+  <download_link>http://example.com/drupal-7-0.tar.gz</download_link>
+  <date>1250424521</date>
+  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+  <filesize>1073741824</filesize>
+  <terms>
+   <term><name>Release type</name><value>New features</value></term>
+   <term><name>Release type</name><value>Bug fixes</value></term>
+  </terms>
+ </release>
+</releases>
+</project>
diff --git a/modules/update/tests/drupal.1.xml b/modules/update/tests/drupal.1.xml
new file mode 100644
index 000000000..de4cfd004
--- /dev/null
+++ b/modules/update/tests/drupal.1.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+<title>Drupal</title>
+<short_name>drupal</short_name>
+<dc:creator>Drupal</dc:creator>
+<api_version>7.x</api_version>
+<recommended_major>7</recommended_major>
+<supported_majors>7</supported_majors>
+<default_major>7</default_major>
+<project_status>published</project_status>
+<link>http://example.com/project/drupal</link>
+  <terms>
+   <term><name>Projects</name><value>Drupal project</value></term>
+  </terms>
+<releases>
+ <release>
+  <name>Drupal 7.1</name>
+  <version>7.1</version>
+  <tag>DRUPAL-7-1</tag>
+  <version_major>7</version_major>
+  <version_patch>1</version_patch>
+  <status>published</status>
+  <release_link>http://example.com/drupal-7-1-release</release_link>
+  <download_link>http://example.com/drupal-7-1.tar.gz</download_link>
+  <date>1250424581</date>
+  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+  <filesize>2147483648</filesize>
+  <terms>
+   <term><name>Release type</name><value>New features</value></term>
+   <term><name>Release type</name><value>Bug fixes</value></term>
+  </terms>
+ </release>
+ <release>
+  <name>Drupal 7.0</name>
+  <version>7.0</version>
+  <tag>DRUPAL-7-0</tag>
+  <version_major>7</version_major>
+  <version_patch>0</version_patch>
+  <status>published</status>
+  <release_link>http://example.com/drupal-7-0-release</release_link>
+  <download_link>http://example.com/drupal-7-0.tar.gz</download_link>
+  <date>1250424521</date>
+  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+  <filesize>1073741824</filesize>
+  <terms>
+   <term><name>Release type</name><value>New features</value></term>
+   <term><name>Release type</name><value>Bug fixes</value></term>
+  </terms>
+ </release>
+</releases>
+</project>
diff --git a/modules/update/tests/drupal.2-sec.xml b/modules/update/tests/drupal.2-sec.xml
new file mode 100644
index 000000000..1e68c8d5f
--- /dev/null
+++ b/modules/update/tests/drupal.2-sec.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+<title>Drupal</title>
+<short_name>drupal</short_name>
+<dc:creator>Drupal</dc:creator>
+<api_version>7.x</api_version>
+<recommended_major>7</recommended_major>
+<supported_majors>7</supported_majors>
+<default_major>7</default_major>
+<project_status>published</project_status>
+<link>http://example.com/project/drupal</link>
+  <terms>
+   <term><name>Projects</name><value>Drupal project</value></term>
+  </terms>
+<releases>
+ <release>
+  <name>Drupal 7.2</name>
+  <version>7.2</version>
+  <tag>DRUPAL-7-2</tag>
+  <version_major>7</version_major>
+  <version_patch>2</version_patch>
+  <status>published</status>
+  <release_link>http://example.com/drupal-7-2-release</release_link>
+  <download_link>http://example.com/drupal-7-2.tar.gz</download_link>
+  <date>1250424641</date>
+  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+  <filesize>4294967296</filesize>
+  <terms>
+   <term><name>Release type</name><value>New features</value></term>
+   <term><name>Release type</name><value>Bug fixes</value></term>
+   <term><name>Release type</name><value>Security update</value></term>
+  </terms>
+ </release>
+ <release>
+  <name>Drupal 7.1</name>
+  <version>7.1</version>
+  <tag>DRUPAL-7-1</tag>
+  <version_major>7</version_major>
+  <version_patch>1</version_patch>
+  <status>published</status>
+  <release_link>http://example.com/drupal-7-1-release</release_link>
+  <download_link>http://example.com/drupal-7-1.tar.gz</download_link>
+  <date>1250424581</date>
+  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+  <filesize>2147483648</filesize>
+  <terms>
+   <term><name>Release type</name><value>New features</value></term>
+   <term><name>Release type</name><value>Bug fixes</value></term>
+  </terms>
+ </release>
+ <release>
+  <name>Drupal 7.0</name>
+  <version>7.0</version>
+  <tag>DRUPAL-7-0</tag>
+  <version_major>7</version_major>
+  <version_patch>0</version_patch>
+  <status>published</status>
+  <release_link>http://example.com/drupal-7-0-release</release_link>
+  <download_link>http://example.com/drupal-7-0.tar.gz</download_link>
+  <date>1250424521</date>
+  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+  <filesize>1073741824</filesize>
+  <terms>
+   <term><name>Release type</name><value>New features</value></term>
+   <term><name>Release type</name><value>Bug fixes</value></term>
+  </terms>
+ </release>
+</releases>
+</project>
diff --git a/modules/update/tests/drupal.dev.xml b/modules/update/tests/drupal.dev.xml
new file mode 100644
index 000000000..49dcc3f5f
--- /dev/null
+++ b/modules/update/tests/drupal.dev.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+<title>Drupal</title>
+<short_name>drupal</short_name>
+<dc:creator>Drupal</dc:creator>
+<api_version>7.x</api_version>
+<recommended_major>7</recommended_major>
+<supported_majors>7</supported_majors>
+<default_major>7</default_major>
+<project_status>published</project_status>
+<link>http://example.com/project/drupal</link>
+  <terms>
+   <term><name>Projects</name><value>Drupal project</value></term>
+  </terms>
+<releases>
+ <release>
+  <name>Drupal 7.0</name>
+  <version>7.0</version>
+  <tag>DRUPAL-7-0</tag>
+  <version_major>7</version_major>
+  <version_patch>0</version_patch>
+  <status>published</status>
+  <release_link>http://example.com/drupal-7-0-release</release_link>
+  <download_link>http://example.com/drupal-7-0.tar.gz</download_link>
+  <date>1250424521</date>
+  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+  <filesize>1073741824</filesize>
+  <terms>
+   <term><name>Release type</name><value>New features</value></term>
+   <term><name>Release type</name><value>Bug fixes</value></term>
+  </terms>
+ </release>
+ <release>
+  <name>Drupal 7.x-dev</name>
+  <version>7.x-dev</version>
+  <tag>DRUPAL-7</tag>
+  <version_major>7</version_major>
+  <version_extra>dev</version_extra>
+  <status>published</status>
+  <release_link>http://example.com/drupal-7-x-dev-release</release_link>
+  <download_link>http://example.com/drupal-7.x-dev.tar.gz</download_link>
+  <date>1250424581</date>
+  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+  <filesize>2147483648</filesize>
+  <terms>
+   <term><name>Release type</name><value>Bug fixes</value></term>
+  </terms>
+ </release>
+</releases>
+</project>
diff --git a/modules/update/tests/no-updates.xml b/modules/update/tests/no-updates.xml
deleted file mode 100644
index 701e11e3e..000000000
--- a/modules/update/tests/no-updates.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns:dc="http://purl.org/dc/elements/1.1/">
-<title>Drupal</title>
-<short_name>drupal</short_name>
-<dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
-<recommended_major>7</recommended_major>
-<supported_majors>7</supported_majors>
-<default_major>7</default_major>
-<project_status>published</project_status>
-<link>http://example.com/project/drupal</link>
-  <terms>
-   <term><name>Projects</name><value>Drupal project</value></term>
-  </terms>
-<releases>
- <release>
-  <name>Drupal 7.0</name>
-  <version>7.0</version>
-  <tag>DRUPAL-7-0</tag>
-  <version_major>7</version_major>
-  <version_patch>0</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-7-0-release</release_link>
-  <download_link>http://example.com/drupal-7-0.tar.gz</download_link>
-  <date>1250424521</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>1073741824</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-  </terms>
- </release>
-</releases>
-</project>
diff --git a/modules/update/tests/normal-update.xml b/modules/update/tests/normal-update.xml
deleted file mode 100644
index de4cfd004..000000000
--- a/modules/update/tests/normal-update.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns:dc="http://purl.org/dc/elements/1.1/">
-<title>Drupal</title>
-<short_name>drupal</short_name>
-<dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
-<recommended_major>7</recommended_major>
-<supported_majors>7</supported_majors>
-<default_major>7</default_major>
-<project_status>published</project_status>
-<link>http://example.com/project/drupal</link>
-  <terms>
-   <term><name>Projects</name><value>Drupal project</value></term>
-  </terms>
-<releases>
- <release>
-  <name>Drupal 7.1</name>
-  <version>7.1</version>
-  <tag>DRUPAL-7-1</tag>
-  <version_major>7</version_major>
-  <version_patch>1</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-7-1-release</release_link>
-  <download_link>http://example.com/drupal-7-1.tar.gz</download_link>
-  <date>1250424581</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>2147483648</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-  </terms>
- </release>
- <release>
-  <name>Drupal 7.0</name>
-  <version>7.0</version>
-  <tag>DRUPAL-7-0</tag>
-  <version_major>7</version_major>
-  <version_patch>0</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-7-0-release</release_link>
-  <download_link>http://example.com/drupal-7-0.tar.gz</download_link>
-  <date>1250424521</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>1073741824</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-  </terms>
- </release>
-</releases>
-</project>
diff --git a/modules/update/tests/security-update.xml b/modules/update/tests/security-update.xml
deleted file mode 100644
index 1e68c8d5f..000000000
--- a/modules/update/tests/security-update.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns:dc="http://purl.org/dc/elements/1.1/">
-<title>Drupal</title>
-<short_name>drupal</short_name>
-<dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
-<recommended_major>7</recommended_major>
-<supported_majors>7</supported_majors>
-<default_major>7</default_major>
-<project_status>published</project_status>
-<link>http://example.com/project/drupal</link>
-  <terms>
-   <term><name>Projects</name><value>Drupal project</value></term>
-  </terms>
-<releases>
- <release>
-  <name>Drupal 7.2</name>
-  <version>7.2</version>
-  <tag>DRUPAL-7-2</tag>
-  <version_major>7</version_major>
-  <version_patch>2</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-7-2-release</release_link>
-  <download_link>http://example.com/drupal-7-2.tar.gz</download_link>
-  <date>1250424641</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>4294967296</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-   <term><name>Release type</name><value>Security update</value></term>
-  </terms>
- </release>
- <release>
-  <name>Drupal 7.1</name>
-  <version>7.1</version>
-  <tag>DRUPAL-7-1</tag>
-  <version_major>7</version_major>
-  <version_patch>1</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-7-1-release</release_link>
-  <download_link>http://example.com/drupal-7-1.tar.gz</download_link>
-  <date>1250424581</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>2147483648</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-  </terms>
- </release>
- <release>
-  <name>Drupal 7.0</name>
-  <version>7.0</version>
-  <tag>DRUPAL-7-0</tag>
-  <version_major>7</version_major>
-  <version_patch>0</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-7-0-release</release_link>
-  <download_link>http://example.com/drupal-7-0.tar.gz</download_link>
-  <date>1250424521</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>1073741824</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-  </terms>
- </release>
-</releases>
-</project>
diff --git a/modules/update/tests/update_test.module b/modules/update/tests/update_test.module
index 54e497415..f95a5cb9a 100644
--- a/modules/update/tests/update_test.module
+++ b/modules/update/tests/update_test.module
@@ -41,10 +41,30 @@ function update_test_system_info_alter(&$info, $file) {
 
 /**
  * Page callback, prints mock XML for the update module.
+ *
+ * The specific XML file to print depends on two things: the project we're
+ * trying to fetch data for, and the desired "availability scenario" for that
+ * project which we're trying to test. Before attempting to fetch this data
+ * (by checking for updates on the available updates report), callers need to
+ * define the 'update_test_xml_map' variable as an array, keyed by project
+ * name, indicating which availability scenario to use for that project.
+ *
+ * @param $project_name
+ *   The project short name update.module is trying to fetch data for (the
+ *   fetch URLs are of the form: [base_url]/[project_name]/[core_version]).
  */
-function update_test_mock_page() {
-  $xml = variable_get('update_test_xml', FALSE);
-  // Note: this will cause an exception to occur if no variable was set and
-  // $file is FALSE.
-  readfile(drupal_get_path('module', 'update_test') . "/$xml");
+function update_test_mock_page($project_name) {
+  $xml_map = variable_get('update_test_xml_map', FALSE);
+  if (isset($xml_map[$project_name])) {
+    $availability_scenario = $xml_map[$project_name];
+  }
+  elseif (isset($xml_map['#all'])) {
+    $availability_scenario = $xml_map['#all'];
+  }
+  else {
+    return FALSE;
+  }
+
+  $path = drupal_get_path('module', 'update_test');
+  readfile("$path/$project_name.$availability_scenario.xml");
 }
-- 
cgit v1.2.3