Add more testing

src/AutoloaderBootstrap.php

@@ -50,10 +50,8 @@ public function __construct(\Composer\Autoload\ClassLoader $loader, $seed = 'com
    * Register the autoloader if it is not registered.
    */
   public function register() {
-    if ($functions = spl_autoload_functions()) {
-      if (array_search(static::AUTOLOAD_FUNCTION, $functions)) {
-        return;
-      }
+    if ($this::checkLoadedAutoloader()) {
+      return;
     }
     // Parse the composer.json.
     $composer_config = json_decode(file_get_contents(static::COMPOSER_CONFIGURATION_NAME));
@@ -114,4 +112,23 @@ protected function registerPsr($composer_config) {
     Loader::registerPsr($this->loader);
   }
 
+  /**
+   * Checks if the autoloader has been added.
+   *
+   * @return bool
+   */
+  public static function checkLoadedAutoloader() {
+    $autoloader_str = ltrim(static::AUTOLOAD_FUNCTION, '\\');
+    $autoloader = explode('::', $autoloader_str);
+    foreach (spl_autoload_functions() as $callable) {
+      if (
+        ($callable[0] == $autoloader[0] || $callable[0] == $autoloader[0]) &&
+        $callable[1] == $autoloader[1]
+      ) {
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+
 }

tests/src/AutoloaderBootstrapTest.php

@@ -37,16 +37,21 @@ public function test___construct() {
   /**
    * Tests the ::register() method.
    *
+   * @covers ::register()
    * @covers ::load()
    * @covers ::registerDrupalPaths()
+   * @covers ::checkLoadedAutoloader()
    */
   public function test_register() {
     $loader = m::mock('\Composer\Autoload\ClassLoader');
     $autoloader = new AutoloaderBootstrap($loader, 'data/docroot/sites/all/modules/testmodule/composer.json');
     $autoloader->register();
-    $functions = spl_autoload_functions();
-    $expected = [['Drupal\Composer\ClassLoader\Loader', 'autoload']];
-    $this->assertTrue(in_array($expected, $functions));
+
+    $this->assertTrue($autoloader::checkLoadedAutoloader());
+    // Make sure that calling to register a second time does not fail.
+    $autoloader->register();
+    $this->assertTrue($autoloader::checkLoadedAutoloader());
   }
 
+
 }