Fix Class "com.example.App+xp.web.dev.Console" could not be found

ChangeLog.md

@@ -3,6 +3,12 @@ Web change log
 
 ## ?.?.? / ????-??-??
 
+## 1.4.2 / 2018-08-16
+
+* Fixed `Class "com.example.App+xp.web.dev.Console" could not be found`
+  errors when using development webserver.
+  (@thekid)
+
 ## 1.4.1 / 2018-08-14
 
 * Changed `xp web` commandline to allow using filenames as application

src/main/php/xp/web/Source.class.php

@@ -3,6 +3,11 @@
 use lang\ClassLoader;
 use lang\XPClass;
 
+/**
+ * An application source
+ *
+ * @test xp://web.unittest.SourceTest
+ */
 class Source {
   private $application;
 
@@ -17,10 +22,10 @@ public function __construct($name, $environment) {
 
     if ('-' === $application) {
       $this->application= new ServeDocumentRootStatically($environment);
-    } else if (is_file($name)) {
-      $this->application= ClassLoader::getDefault()->loadUri($name)->newInstance($environment);
+    } else if (is_file($application)) {
+      $this->application= ClassLoader::getDefault()->loadUri($application)->newInstance($environment);
     } else {
-      $this->application= ClassLoader::getDefault()->loadClass($name)->newInstance($environment);
+      $this->application= ClassLoader::getDefault()->loadClass($application)->newInstance($environment);
     }
 
     if ($filters) {

src/test/php/web/unittest/HelloWorld.class.php

@@ -0,0 +1,14 @@
+<?php namespace web\unittest;
+
+use web\Application;
+
+class HelloWorld extends Application {
+
+  /** @return var */
+  public function routes() {
+    return ['/' => function($req, $res) {
+      $res->answer(200);
+      $res->send('Hello World', 'text/plain');
+    }];
+  }
+}

src/test/php/web/unittest/SourceTest.class.php

@@ -0,0 +1,42 @@
+<?php namespace web\unittest;
+
+use io\Path;
+use lang\XPClass;
+use unittest\TestCase;
+use web\Environment;
+use xp\web\ServeDocumentRootStatically;
+use xp\web\Source;
+
+class SourceTest extends TestCase {
+  private $environment;
+
+  /** @return void */
+  public function setUp() {
+    $this->environment= new Environment('dev', '.', 'static', []);
+  }
+
+  #[@test]
+  public function serve_document_root() {
+    $src= new Source('-', $this->environment);
+    $this->assertInstanceOf(ServeDocumentRootStatically::class, $src->application());
+  }
+
+  #[@test]
+  public function application_class() {
+    $src= new Source('web.unittest.HelloWorld', $this->environment);
+    $this->assertInstanceOf(HelloWorld::class, $src->application());
+  }
+
+  #[@test]
+  public function application_file() {
+    $base= XPClass::forName('web.unittest.HelloWorld')->getClassLoader()->path;
+    $src= new Source(new Path($base, 'web/unittest/HelloWorld.class.php'), $this->environment);
+    $this->assertInstanceOf(HelloWorld::class, $src->application());
+  }
+
+  #[@test]
+  public function application_class_and_filter() {
+    $src= new Source('web.unittest.HelloWorld+xp.web.dev.Console', $this->environment);
+    $this->assertInstanceOf(HelloWorld::class, $src->application());
+  }
+}