Merge branch 'main' into issue-3911issue-3911

1 files changed, 22 insertions, 3 deletions

diff --git a/tests/unit/lib/FunctionsTest.php b/tests/unit/lib/FunctionsTest.php
index 9a92f1a..c254fda 100644
--- a/tests/unit/lib/FunctionsTest.php
+++ b/tests/unit/lib/FunctionsTest.php
@@ -75,16 +75,35 @@ class FunctionsTest extends \Codeception\Test\Unit
     }
 
     /**
-     * @covers Trails_Controller::extract_action_and_args()
+     * @covers Trails\Controller::extract_action_and_args()
      */
     public function testTrailsControllerExtractActionAndArgs()
     {
-        $controller = new Trails_Controller(null);
-        list($action, $args, $format) = $controller->extract_action_and_args('foo/bar//42.html');
+        $dispatcher = new Trails\Dispatcher('', '', '');
+        $controller = new Trails\Controller($dispatcher);
+        [$action, $args, $format] = $controller->extract_action_and_args('foo/bar//42.html');
 
         $this->assertEquals('foo', $action);
         $this->assertEquals(['bar', '', '42'], $args);
         $this->assertEquals('html', $format);
 
     }
+
+    /**
+     * @covers ::studip_interpolate
+     */
+    public function testStudipInterpolate()
+    {
+        $this->assertEquals(
+            '12bar34',
+            studip_interpolate('12%{foo}34', ['foo' => 'bar'])
+        );
+        $this->assertEquals(
+            'foo',
+            studip_interpolate('%{ bar }', ['bar' => 'foo'])
+        );
+
+        $this->expectException(Exception::class);
+        studip_interpolate('%{foo}', []);
+    }
 }