2 files changed, 78 insertions, 20 deletions

diff --git a/tests/lib/AppFramework/OCS/BaseResponseTest.php b/tests/lib/AppFramework/OCS/BaseResponseTest.php
index a1e0c620574..e04f7856623 100644
--- a/tests/lib/AppFramework/OCS/BaseResponseTest.php
+++ b/tests/lib/AppFramework/OCS/BaseResponseTest.php
@@ -3,31 +3,25 @@
 declare(strict_types=1);
 
 /**
- * @copyright 2020 Daniel Kesselberg <mail@danielkesselberg.de>
- *
- * @author 2020 Daniel Kesselberg <mail@danielkesselberg.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace Test\AppFramework\Middleware;
+namespace Test\AppFramework\OCS;
 
 use OC\AppFramework\OCS\BaseResponse;
 
+class ArrayValue implements \JsonSerializable {
+	public function __construct(
+		private array $array,
+	) {
+	}
+
+	public function jsonSerialize(): mixed {
+		return $this->array;
+	}
+}
+
 class BaseResponseTest extends \Test\TestCase {
 	public function testToXml(): void {
 		/** @var BaseResponse $response */
@@ -56,4 +50,32 @@ class BaseResponseTest extends \Test\TestCase {
 			$writer->outputMemory(true)
 		);
 	}
+
+	public function testToXmlJsonSerializable(): void {
+		/** @var BaseResponse $response */
+		$response = $this->createMock(BaseResponse::class);
+
+		$writer = new \XMLWriter();
+		$writer->openMemory();
+		$writer->setIndent(false);
+		$writer->startDocument();
+
+		$data = [
+			'hello' => 'hello',
+			'information' => new ArrayValue([
+				'@test' => 'some data',
+				'someElement' => 'withAttribute',
+			]),
+			'value without key',
+			'object' => new \stdClass(),
+		];
+
+		$this->invokePrivate($response, 'toXml', [$data, $writer]);
+		$writer->endDocument();
+
+		$this->assertEquals(
+			"<?xml version=\"1.0\"?>\n<hello>hello</hello><information test=\"some data\"><someElement>withAttribute</someElement></information><element>value without key</element><object/>\n",
+			$writer->outputMemory(true)
+		);
+	}
 }
diff --git a/tests/lib/AppFramework/OCS/V2ResponseTest.php b/tests/lib/AppFramework/OCS/V2ResponseTest.php
new file mode 100644
index 00000000000..7a70ad6d633
--- /dev/null
+++ b/tests/lib/AppFramework/OCS/V2ResponseTest.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace Test\AppFramework\OCS;
+
+use OC\AppFramework\OCS\V2Response;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCSController;
+
+class V2ResponseTest extends \Test\TestCase {
+	#[\PHPUnit\Framework\Attributes\DataProvider('providesStatusCodes')]
+	public function testStatusCodeMapper(int $expected, int $sc): void {
+		$response = new V2Response(new DataResponse([], $sc));
+		$this->assertEquals($expected, $response->getStatus());
+	}
+
+	public static function providesStatusCodes(): array {
+		return [
+			[Http::STATUS_OK, 200],
+			[Http::STATUS_BAD_REQUEST, 104],
+			[Http::STATUS_BAD_REQUEST, 1000],
+			[201, 201],
+			[Http::STATUS_UNAUTHORIZED, OCSController::RESPOND_UNAUTHORISED],
+			[Http::STATUS_INTERNAL_SERVER_ERROR, OCSController::RESPOND_SERVER_ERROR],
+			[Http::STATUS_NOT_FOUND, OCSController::RESPOND_NOT_FOUND],
+			[Http::STATUS_INTERNAL_SERVER_ERROR, OCSController::RESPOND_UNKNOWN_ERROR],
+		];
+	}
+}