diff --git a/tests/libraries.test b/tests/libraries.test
index c361bcd..4a74a9a 100644
--- a/tests/libraries.test
+++ b/tests/libraries.test
@@ -410,23 +410,42 @@ class LibrariesTestCase extends DrupalWebTestCase {
* array('js', 'css', 'php').
*/
function assertLibraryFiles($name, $label = '', $extensions = array('js', 'css', 'php')) {
- $names = drupal_map_assoc(array('example_1', 'example_2', 'example_3', 'example_4'));
- unset($names[$name]);
+ // Test that the wrong files are not loaded...
+ $names = array(
+ 'example_1' => FALSE,
+ 'example_2' => FALSE,
+ 'example_3' => FALSE,
+ 'example_4' => FALSE,
+ );
+ // ...and the correct ones are.
+ $names[$name] = TRUE;
+
+ // Test for the specific HTML that the different file types appear as in the
+ // DOM.
+ $html = array(
+ 'js' => array(''),
+ 'css' => array('@import url("', '");'),
+ // PHP files do not get added to the DOM directly.
+ // @see _libraries_test_load()
+ 'php' => array('
', ''),
+ );
- // Test that the wrong files are not loaded.
- foreach ($names as $filename) {
+ foreach ($names as $name => $expected) {
foreach ($extensions as $extension) {
- $message = "$filename.$extension not found";
- $message = ($label !== '' ? "$label: $message" : $message);
- $this->assertNoRaw("$filename.$extension", $message);
- }
- }
-
- // Test that the correct files are loaded.
- foreach ($extensions as $extension) {
- $message = "$name.$extension found";
- $message = ($label !== '' ? "$label: $message" : $message);
- $this->assertRaw("$name.$extension", $message);
+ $filepath = drupal_get_path('module', 'libraries_test') . "/example/$name.$extension";
+ // JavaScript and CSS files appear as full URLs and with an appended
+ // query string.
+ if (in_array($extension, array('js', 'css'))) {
+ $filepath = url('', array('absolute' => TRUE)) . $filepath . '?' . variable_get('css_js_query_string');
+ }
+ $raw = $html[$extension][0] . $filepath . $html[$extension][1];
+ $label = ($label !== '' ? "$label: " : '');
+ if ($expected) {
+ $this->assertRaw($raw, "$label$name.$extension found.");
+ }
+ else {
+ $this->assertNoRaw($raw, "$label$name.$extension found.");
+ }
}
}
diff --git a/tests/libraries_test.module b/tests/libraries_test.module
index 1f67996..67ed7f7 100644
--- a/tests/libraries_test.module
+++ b/tests/libraries_test.module
@@ -542,7 +542,7 @@ function _libraries_test_load($library, $variant = NULL) {
$files = get_included_files();
foreach ($files as $file) {
if (strpos($file, 'libraries/test') && !strpos($file, 'libraries_test.module')) {
- $output .= '' . strstr($file, 'libraries/test') . '';
+ $output .= '' . str_replace(DRUPAL_ROOT . '/', '', $file) . '';
}
}
$output .= '';