fixup! Adjust tests

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
nextcloud · Feb 18, 2024 · 3e64873 · 3e64873
1 parent 8e565ee
commit 3e64873
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 7 deletions.
diff --git a/tests/Unit/Controller/ApiControllerTest.php b/tests/Unit/Controller/ApiControllerTest.php
@@ -386,6 +386,7 @@ public function dataTestCreateNewForm() {
 		return [
 			'forms' => ['expectedForm' => [
 				'id' => 7,
+				'state' => 0,
 				'hash' => 'formHash',
 				'title' => '',
 				'description' => '',

diff --git a/tests/Unit/Service/FormsServiceTest.php b/tests/Unit/Service/FormsServiceTest.php
@@ -170,6 +170,7 @@ public function dataGetForm() {
 			// Just the full form without submissions
 			'one-full-form' => [[
 				'id' => 42,
+				'state' => 0,
 				'hash' => 'abcdefg',
 				'title' => 'Form 1',
 				'description' => 'Description Text',
@@ -250,6 +251,7 @@ public function testGetForm(array $expected) {
 		// The form
 		$form = new Form();
 		$form->setId(42);
+		$form->setState(0); // default => 0 means active
 		$form->setHash('abcdefg');
 		$form->setTitle('Form 1');
 		$form->setDescription('Description Text');
@@ -341,13 +343,14 @@ public function dataGetPartialForm() {
 		return [
 			'onePartialOwnedForm' => [[
 				'id' => 42,
+				'state' => 0,
 				'hash' => 'abcdefg',
 				'title' => 'Form 1',
 				'expires' => 0,
 				'lastUpdated' => 123456789,
 				'permissions' => Constants::PERMISSION_ALL,
 				'submissionCount' => 123,
-				'partial' => true
+				'partial' => true,
 			]]
 		];
 	}
@@ -358,6 +361,7 @@ public function dataGetPartialForm() {
 	 */
 	public function testGetPartialForm(array $expected) {
 		$form = new Form();
+		$form->setState(0);
 		$form->setId(42);
 		$form->setHash('abcdefg');
 		$form->setTitle('Form 1');
@@ -384,7 +388,8 @@ public function dataGetPartialFormShared() {
 				'lastUpdated' => 123456789,
 				'permissions' => ['results', 'submit'],
 				'submissionCount' => 123,
-				'partial' => true
+				'state' => 0,
+				'partial' => true,
 			]]
 		];
 	}
@@ -397,6 +402,7 @@ public function dataGetPartialFormShared() {
 	public function testGetPartialFormShared(array $expected) {
 		$form = new Form();
 		$form->setId(42);
+		$form->setState(0);
 		$form->setHash('abcdefg');
 		$form->setTitle('Form 1');
 		$form->setOwnerId('otherUser');
@@ -428,6 +434,7 @@ public function dataGetPublicForm() {
 			// Bare form without questions, checking removed access & ownerId
 			'one-full-form' => [[
 				'id' => 42,
+				'state' => 0,
 				'hash' => 'abcdefg',
 				'title' => 'Form 1',
 				'description' => 'Description Text',
@@ -455,6 +462,7 @@ public function testGetPublicForm(array $expected) {
 		// The form
 		$form = new Form();
 		$form->setId(42);
+		$form->setState(0);
 		$form->setHash('abcdefg');
 		$form->setTitle('Form 1');
 		$form->setDescription('Description Text');
@@ -1034,6 +1042,7 @@ public function dataIsSharedFormShown() {
 		return [
 			'dontShowToOwner' => [
 				'ownerId' => 'currentUser',
+				'state' => 0,
 				'expires' => 0,
 				'access' => [
 					'permitAllUsers' => true,
@@ -1044,6 +1053,7 @@ public function dataIsSharedFormShown() {
 			],
 			'expiredForm' => [
 				'ownerId' => 'notCurrentUser',
+				'state' => 0,
 				'expires' => 1,
 				'access' => [
 					'permitAllUsers' => true,
@@ -1054,6 +1064,7 @@ public function dataIsSharedFormShown() {
 			],
 			'shownToAll' => [
 				'ownerId' => 'notCurrentUser',
+				'state' => 0,
 				'expires' => 0,
 				'access' => [
 					'permitAllUsers' => true,
@@ -1064,6 +1075,7 @@ public function dataIsSharedFormShown() {
 			],
 			'sharedToUser' => [
 				'ownerId' => 'notCurrentUser',
+				'state' => 0,
 				'expires' => 0,
 				'access' => [
 					'permitAllUsers' => false,
@@ -1074,14 +1086,37 @@ public function dataIsSharedFormShown() {
 			],
 			'notShown' => [
 				'ownerId' => 'notCurrentUser',
+				'state' => 0,
 				'expires' => 0,
 				'access' => [
 					'permitAllUsers' => true,
 					'showToAllUsers' => false,
 				],
 				'shareType' => IShare::TYPE_LINK,
 				'expected' => false,
-			]
+			],
+			'ArchivedIsNotShown' => [
+				'ownerId' => 'notCurrentUser',
+				'state' => Constants::FORM_STATE_ARCHIVED,
+				'expires' => 0,
+				'access' => [
+					'permitAllUsers' => true,
+					'showToAllUsers' => true,
+				],
+				'shareType' => IShare::TYPE_USER,
+				'expected' => false,
+			],
+			'ClosedIsNotShown' => [
+				'ownerId' => 'notCurrentUser',
+				'state' => Constants::FORM_STATE_CLOSED,
+				'expires' => 0,
+				'access' => [
+					'permitAllUsers' => true,
+					'showToAllUsers' => true,
+				],
+				'shareType' => IShare::TYPE_USER,
+				'expected' => false,
+			],
 		];
 	}
 	/**
@@ -1096,6 +1131,7 @@ public function dataIsSharedFormShown() {
 	public function testIsSharedFormShown(string $ownerId, int $expires, array $access, int $shareType, bool $expected) {
 		$form = new Form();
 		$form->setId(42);
+		$form->setState(0);
 		$form->setOwnerId($ownerId);
 		$form->setExpires($expires);
 		$form->setAccess($access);
@@ -1227,19 +1263,23 @@ public function testIsSharedToCircle_circlesDisabled() {
 
 	public function dataHasFormExpired() {
 		return [
-			'hasExpired' => [time() - 3600, true],
-			'hasNotExpired' => [time() + 3600, false],
-			'doesNeverExpire' => [0, false]
+			'hasExpired' => [time() - 3600, Constants::FORM_STATE_ACTIVE, true],
+			'hasNotExpired' => [time() + 3600, Constants::FORM_STATE_ACTIVE, false],
+			'doesNeverExpire' => [0, Constants::FORM_STATE_ACTIVE, false],
+			'isClosed' => [time() + 3600, Constants::FORM_STATE_CLOSED, true],
+			'isArchived' => [time() + 3600, Constants::FORM_STATE_ARCHIVED, true],
 		];
 	}
 	/**
 	 * @dataProvider dataHasFormExpired
 	 *
 	 * @param int $expires
+	 * @param int $state the form state
 	 * @param bool $expected has expired
 	 */
-	public function testHasFormExpired(int $expires, bool $expected) {
+	public function testHasFormExpired(int $expires, int $state, bool $expected) {
 		$form = new Form();
+		$form->setState($state);
 		$form->setExpires($expires);
 
 		$this->assertEquals($expected, $this->formsService->hasFormExpired($form));