From f031b34c90aaa19ff453a8e01802ee8f268812ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Agneray?= <francois.agneray@lam.fr>
Date: Tue, 24 Aug 2021 16:49:33 +0200
Subject: [PATCH] Fixed tests (client + server)
---
.../components/dataset-by-family.component.spec.ts | 2 ++
.../components/dataset-card-doc.component.spec.ts | 3 ++-
server/tests/Action/DatasetListActionTest.php | 3 +++
server/tests/Action/InstanceActionTest.php | 1 +
server/tests/Action/InstanceListActionTest.php | 1 +
5 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/client/src/app/instance/documentation/components/dataset-by-family.component.spec.ts b/client/src/app/instance/documentation/components/dataset-by-family.component.spec.ts
index 823eca11..4c6a5be8 100644
--- a/client/src/app/instance/documentation/components/dataset-by-family.component.spec.ts
+++ b/client/src/app/instance/documentation/components/dataset-by-family.component.spec.ts
@@ -18,6 +18,7 @@ const DATASET_LIST: Dataset[] = [
survey_name: 'mySurvey',
id_dataset_family: 1,
public: true,
+ full_data_path: '/data/path1',
config: {
images: ['image1'],
cone_search: {
@@ -67,6 +68,7 @@ const DATASET_LIST: Dataset[] = [
survey_name: 'mySurvey',
id_dataset_family: 1,
public: true,
+ full_data_path: '/data/path2',
config: {
images: ['image1'],
cone_search: {
diff --git a/client/src/app/instance/documentation/components/dataset-card-doc.component.spec.ts b/client/src/app/instance/documentation/components/dataset-card-doc.component.spec.ts
index 7911b704..0386a238 100644
--- a/client/src/app/instance/documentation/components/dataset-card-doc.component.spec.ts
+++ b/client/src/app/instance/documentation/components/dataset-card-doc.component.spec.ts
@@ -21,10 +21,11 @@ const DATASET: Dataset = {
label: 'my dataset',
description: 'This is my dataset',
display: 1,
- data_path: 'path',
+ data_path: '/path',
survey_name: 'mySurvey',
id_dataset_family: 1,
public: true,
+ full_data_path: '/data/path',
config: {
images: ['image1'],
cone_search: {
diff --git a/server/tests/Action/DatasetListActionTest.php b/server/tests/Action/DatasetListActionTest.php
index 3b34d4e2..51a5a343 100644
--- a/server/tests/Action/DatasetListActionTest.php
+++ b/server/tests/Action/DatasetListActionTest.php
@@ -21,6 +21,7 @@ use Doctrine\ORM\EntityManager;
use Doctrine\Persistence\ObjectRepository;
use App\Entity\Survey;
use App\Entity\DatasetFamily;
+use App\Entity\Instance;
final class DatasetListActionTest extends TestCase
{
@@ -91,7 +92,9 @@ final class DatasetListActionTest extends TestCase
public function testAddANewDataset(): void
{
+ $instance = $this->createMock(Instance::class);
$datasetFamily = $this->createMock(DatasetFamily::class);
+ $datasetFamily->method('getInstance')->willReturn($instance);
$survey = $this->createMock(Survey::class);
$this->entityManager->method('find')->willReturnOnConsecutiveCalls($datasetFamily, $survey);
diff --git a/server/tests/Action/InstanceActionTest.php b/server/tests/Action/InstanceActionTest.php
index d3e136f9..5b717a3a 100644
--- a/server/tests/Action/InstanceActionTest.php
+++ b/server/tests/Action/InstanceActionTest.php
@@ -78,6 +78,7 @@ final class InstanceActionTest extends TestCase
$fields = array(
'label' => 'AspiC',
+ 'data_path' => '/DEFAULT',
'config' => '{}'
);
diff --git a/server/tests/Action/InstanceListActionTest.php b/server/tests/Action/InstanceListActionTest.php
index e3bd1e18..81c86466 100644
--- a/server/tests/Action/InstanceListActionTest.php
+++ b/server/tests/Action/InstanceListActionTest.php
@@ -63,6 +63,7 @@ final class InstanceListActionTest extends TestCase
$fields = array(
'name' => 'aspic',
'label' => 'Aspic',
+ 'data_path' => '/DEFAULT',
'config' => '{}'
);
--
GitLab