From d0d1137a0da3bd78c80b5be5a3629f8b4dc1e102 Mon Sep 17 00:00:00 2001 From: majean5 Date: Wed, 18 May 2022 17:26:24 +0200 Subject: [PATCH] =?UTF-8?q?UnitTests=20du=20d=C3=A9mon=20qui=20marchent=20?= =?UTF-8?q?pas=20(et=20du=20coup=20plus=20de=20test=5Frequin=20tej)=20+=20?= =?UTF-8?q?le=20bouton=20avce=20le=20pllus=20et=20l'utilisateur=20en=20mie?= =?UTF-8?q?ux=20man=20+=20diagrammes=20de=20classe=20plus=20classes=20+=20?= =?UTF-8?q?PS=20rien=20marche=20=20+=20double=20PS=20:=2085=20erreurs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Documents/Diagramme de class - 1.mdj | 376 ++++++++- Documents/Diagramme de class - 2.mdj | 1132 ++++++++++++++++++++++++-- Persistance/IPersistanceManager.cs | 1 + TestsUnitaires/TestsUnitaires.csproj | 4 + TestsUnitaires/Tests_Requin.cs | 17 + TestsUnitaires/UnitTest1.cs | 14 - UnitTests/UnitTest_Modele.cs | 75 ++ UnitTests/UnitTests.csproj | 26 + WpfApp1.sln | 19 +- WpfApp1/Images/User.png | Bin 0 -> 45641 bytes WpfApp1/Images/plus.png | Bin 2720 -> 17652 bytes WpfApp1/WpfApp1.csproj | 4 + WpfApp1/userControlAcceuil.xaml | 4 +- test_requin/Program.cs | 45 +- 14 files changed, 1567 insertions(+), 150 deletions(-) create mode 100644 TestsUnitaires/Tests_Requin.cs delete mode 100644 TestsUnitaires/UnitTest1.cs create mode 100644 UnitTests/UnitTest_Modele.cs create mode 100644 UnitTests/UnitTests.csproj create mode 100644 WpfApp1/Images/User.png diff --git a/Documents/Diagramme de class - 1.mdj b/Documents/Diagramme de class - 1.mdj index 703aa37..b7f6e61 100644 --- a/Documents/Diagramme de class - 1.mdj +++ b/Documents/Diagramme de class - 1.mdj @@ -2161,6 +2161,367 @@ "propertyLabel": { "$ref": "AAAAAAGAvAsirFvmfmE=" } + }, + { + "_type": "UMLClassView", + "_id": "AAAAAAGA15zTupMKXgg=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGA15zTupMLBK8=", + "_parent": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGA15zTupMMkP4=", + "_parent": { + "$ref": "AAAAAAGA15zTupMLBK8=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -383, + "top": 401, + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15zTupMN8fY=", + "_parent": { + "$ref": "AAAAAAGA15zTupMLBK8=" + }, + "font": "Arial;13;1", + "left": 1277, + "top": 599, + "width": 456.09814453125, + "height": 13, + "text": "Expert" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15zTupMOUUk=", + "_parent": { + "$ref": "AAAAAAGA15zTupMLBK8=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -383, + "top": 401, + "width": 73.67724609375, + "height": 13, + "text": "(from Model)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15zTupMP1V0=", + "_parent": { + "$ref": "AAAAAAGA15zTupMLBK8=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -383, + "top": 401, + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 1272, + "top": 592, + "width": 466.09814453125, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAGA15zTupMMkP4=" + }, + "nameLabel": { + "$ref": "AAAAAAGA15zTupMN8fY=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGA15zTupMOUUk=" + }, + "propertyLabel": { + "$ref": "AAAAAAGA15zTupMP1V0=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAGA15zTupMQ/Ns=", + "_parent": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15zTupMRdPE=", + "_parent": { + "$ref": "AAAAAAGA15zTupMQ/Ns=" + }, + "model": { + "$ref": "AAAAAAGAvCf/UGee2AU=" + }, + "font": "Arial;13;0", + "left": 1277, + "top": 622, + "width": 456.09814453125, + "height": 13, + "text": "+/Surnom: string", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15zTupMSbR8=", + "_parent": { + "$ref": "AAAAAAGA15zTupMQ/Ns=" + }, + "model": { + "$ref": "AAAAAAGAvCgQeGfCj+A=" + }, + "font": "Arial;13;0", + "left": 1277, + "top": 637, + "width": 456.09814453125, + "height": 13, + "text": "+/DateD: DateTime", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 1272, + "top": 617, + "width": 466.09814453125, + "height": 38 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAGA15zTupMTuP8=", + "_parent": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15zTupMUSJs=", + "_parent": { + "$ref": "AAAAAAGA15zTupMTuP8=" + }, + "model": { + "$ref": "AAAAAAGAvCkVKGi2/50=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1253, + "top": 828, + "width": 456.09814453125, + "height": 13, + "text": "+ValiderSubmit(lBdFine: List, lBdPasFinie: List): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15zTupMVIKA=", + "_parent": { + "$ref": "AAAAAAGA15zTupMTuP8=" + }, + "model": { + "$ref": "AAAAAAGAvCrrV2nJyHw=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1253, + "top": 843, + "width": 456.09814453125, + "height": 13, + "text": "+ValiderUnCangement(lBdFine: List, lBdPasFinie: List): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15zTupMWJ5E=", + "_parent": { + "$ref": "AAAAAAGA15zTupMTuP8=" + }, + "model": { + "$ref": "AAAAAAGAvC3bCm6KAZI=" + }, + "font": "Arial;13;0", + "left": 1277, + "top": 662, + "width": 456.09814453125, + "height": 13, + "text": "+Equals(e: Expert): bool", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 1272, + "top": 655, + "width": 466.09814453125, + "height": 25 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAGA15zTupMXcuM=", + "_parent": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -352, + "top": 176, + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAGA15zTupMYd3s=", + "_parent": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -352, + "top": 176, + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 1272, + "top": 592, + "width": 466.09814453125, + "height": 89, + "nameCompartment": { + "$ref": "AAAAAAGA15zTupMLBK8=" + }, + "attributeCompartment": { + "$ref": "AAAAAAGA15zTupMQ/Ns=" + }, + "operationCompartment": { + "$ref": "AAAAAAGA15zTupMTuP8=" + }, + "receptionCompartment": { + "$ref": "AAAAAAGA15zTupMXcuM=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAGA15zTupMYd3s=" + } + }, + { + "_type": "UMLRealizationView", + "_id": "AAAAAAGA1546aZZRFXY=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGA1546aZZPrwk=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA1546aZZSC5s=", + "_parent": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "model": { + "$ref": "AAAAAAGA1546aZZPrwk=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1288, + "top": 568, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA1546apZTDfI=", + "_parent": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "model": { + "$ref": "AAAAAAGA1546aZZPrwk=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 1283, + "top": 582, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA1546apZUkJA=", + "_parent": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "model": { + "$ref": "AAAAAAGA1546aZZPrwk=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1299, + "top": 539, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGAs7TrzGLtlPM=" + }, + "tail": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "lineStyle": 1, + "points": "1380:591;1209:529", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGA1546aZZSC5s=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGA1546apZTDfI=" + }, + "propertyLabel": { + "$ref": "AAAAAAGA1546apZUkJA=" + } } ] }, @@ -3018,6 +3379,19 @@ "target": { "$ref": "AAAAAAGAs7Try2LrDc4=" } + }, + { + "_type": "UMLRealization", + "_id": "AAAAAAGA1546aZZPrwk=", + "_parent": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "source": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "target": { + "$ref": "AAAAAAGAs7Try2LrDc4=" + } } ], "attributes": [ @@ -3084,7 +3458,7 @@ "_parent": { "$ref": "AAAAAAGAvCeH6mc4CoU=" }, - "name": "ValiderUnChangement", + "name": "ValiderUnCangement", "parameters": [ { "_type": "UMLParameter", diff --git a/Documents/Diagramme de class - 2.mdj b/Documents/Diagramme de class - 2.mdj index 7601293..76ff55a 100644 --- a/Documents/Diagramme de class - 2.mdj +++ b/Documents/Diagramme de class - 2.mdj @@ -1576,12 +1576,12 @@ "_parent": { "$ref": "AAAAAAGAs7TrzGLuQrg=" }, - "visible": false, "font": "Arial;13;0", - "left": 1533, - "top": 93, + "left": 909, + "top": 429, "width": 309.61328125, - "height": 13 + "height": 13, + "text": "«i»" }, { "_type": "LabelView", @@ -1591,7 +1591,7 @@ }, "font": "Arial;13;3", "left": 909, - "top": 431, + "top": 444, "width": 309.61328125, "height": 13, "text": "Personne" @@ -1628,7 +1628,7 @@ "left": 904, "top": 424, "width": 319.61328125, - "height": 25, + "height": 38, "stereotypeLabel": { "$ref": "AAAAAAGAs7TrzGLvM/A=" }, @@ -1663,7 +1663,7 @@ }, "font": "Arial;13;0", "left": 909, - "top": 454, + "top": 467, "width": 309.61328125, "height": 13, "text": "+/Email: string", @@ -1680,7 +1680,7 @@ }, "font": "Arial;13;0", "left": 909, - "top": 469, + "top": 482, "width": 309.61328125, "height": 13, "text": "+/MotDePasse: string", @@ -1689,7 +1689,7 @@ ], "font": "Arial;13;0", "left": 904, - "top": 449, + "top": 462, "width": 319.61328125, "height": 38 }, @@ -1714,7 +1714,7 @@ }, "font": "Arial;13;0", "left": 909, - "top": 492, + "top": 505, "width": 309.61328125, "height": 13, "text": "+Personne(string email, string mdp)", @@ -1731,7 +1731,7 @@ }, "font": "Arial;13;2", "left": 909, - "top": 507, + "top": 520, "width": 309.61328125, "height": 13, "text": "+ChangerInfo(nvEmail: string, nvMdp: string): void", @@ -1748,7 +1748,7 @@ }, "font": "Arial;13;2", "left": 909, - "top": 522, + "top": 535, "width": 309.61328125, "height": 13, "text": "+ToString(): string", @@ -1757,7 +1757,7 @@ ], "font": "Arial;13;0", "left": 904, - "top": 487, + "top": 500, "width": 319.61328125, "height": 53 }, @@ -2363,158 +2363,952 @@ } ], "font": "Arial;13;0", - "left": 1432, - "top": 455, - "width": 466.09814453125, - "height": 53 + "left": 1432, + "top": 455, + "width": 466.09814453125, + "height": 53 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAGAvCeH6mdCmuE=", + "_parent": { + "$ref": "AAAAAAGAvCeH6mc6iG8=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -192, + "top": -24, + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAGAvCeH6mdD9So=", + "_parent": { + "$ref": "AAAAAAGAvCeH6mc6iG8=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -192, + "top": -24, + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 1432, + "top": 392, + "width": 466.09814453125, + "height": 116, + "nameCompartment": { + "$ref": "AAAAAAGAvCeH6mc7ICg=" + }, + "attributeCompartment": { + "$ref": "AAAAAAGAvCeH6mdA4Og=" + }, + "operationCompartment": { + "$ref": "AAAAAAGAvCeH6mdB6Dk=" + }, + "receptionCompartment": { + "$ref": "AAAAAAGAvCeH6mdCmuE=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAGAvCeH6mdD9So=" + } + }, + { + "_type": "UMLRealizationView", + "_id": "AAAAAAGAvCuJeWt/nUk=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGAvCuJeWt9lRg=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAvCuJeWuAD/8=", + "_parent": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "model": { + "$ref": "AAAAAAGAvCuJeWt9lRg=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1328, + "top": 479, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAvCuJeWuBhSQ=", + "_parent": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "model": { + "$ref": "AAAAAAGAvCuJeWt9lRg=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 1329, + "top": 494, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAvCuJeWuCOjY=", + "_parent": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "model": { + "$ref": "AAAAAAGAvCuJeWt9lRg=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1325, + "top": 450, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGAs7TrzGLtlPM=" + }, + "tail": { + "$ref": "AAAAAAGAvCeH6mc6iG8=" + }, + "lineStyle": 1, + "points": "1431:465;1224:478", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGAvCuJeWuAD/8=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGAvCuJeWuBhSQ=" + }, + "propertyLabel": { + "$ref": "AAAAAAGAvCuJeWuCOjY=" + } + }, + { + "_type": "UMLClassView", + "_id": "AAAAAAGA15EgB9xP62A=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGA15EgB9xQhpo=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xP62A=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGA15EgB9xRdlU=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xQhpo=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -176, + "top": 704, + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15EgB9xSgfY=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xQhpo=" + }, + "font": "Arial;13;1", + "left": 517, + "top": 1199, + "width": 237.39599609375, + "height": 13, + "text": "Manager" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15EgB9xTjdc=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xQhpo=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -176, + "top": 704, + "width": 73.67724609375, + "height": 13, + "text": "(from Model)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15EgB9xU2S8=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xQhpo=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -176, + "top": 704, + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 512, + "top": 1192, + "width": 247.39599609375, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAGA15EgB9xRdlU=" + }, + "nameLabel": { + "$ref": "AAAAAAGA15EgB9xSgfY=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGA15EgB9xTjdc=" + }, + "propertyLabel": { + "$ref": "AAAAAAGA15EgB9xU2S8=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAGA15EgB9xVuGc=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xP62A=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15HnJt06Dp8=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xVuGc=" + }, + "model": { + "$ref": "AAAAAAGA15HnG90xBUE=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1222, + "width": 237.39599609375, + "height": 13, + "text": "+/Requins: ReadOnlyCollection", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15KlYd21tqQ=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xVuGc=" + }, + "model": { + "$ref": "AAAAAAGA15KlWt2sGEk=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1237, + "width": 237.39599609375, + "height": 13, + "text": "+/requins: List", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15MuwN4vU64=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xVuGc=" + }, + "model": { + "$ref": "AAAAAAGA15Muut4m0iA=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1252, + "width": 237.39599609375, + "height": 13, + "text": "+/SelectedRequin: Requin", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15OPud6X+b8=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xVuGc=" + }, + "model": { + "$ref": "AAAAAAGA15OPst6OWo8=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1267, + "width": 237.39599609375, + "height": 13, + "text": "+/Pers: IPersistanceManager", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 512, + "top": 1217, + "width": 247.39599609375, + "height": 68 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAGA15EgB9xWgYE=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xP62A=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15QXgd7/VQM=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xWgYE=" + }, + "model": { + "$ref": "AAAAAAGA15QXet72Teo=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1290, + "width": 237.39599609375, + "height": 13, + "text": "+Manager(IPersistanceManager pers)", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15Vckd/AI08=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xWgYE=" + }, + "model": { + "$ref": "AAAAAAGA15Vcit+3mxY=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1305, + "width": 237.39599609375, + "height": 13, + "text": "+LoadRequins(): void", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15WWQ9/5+eE=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xWgYE=" + }, + "model": { + "$ref": "AAAAAAGA15WWO9/wDNE=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1320, + "width": 237.39599609375, + "height": 13, + "text": "+SaveRequins(): void", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 512, + "top": 1285, + "width": 247.39599609375, + "height": 53 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAGA15EgB9xXqa4=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xP62A=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -88, + "top": 352, + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAGA15EgCNxYj5c=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xP62A=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -88, + "top": 352, + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 512, + "top": 1192, + "width": 247.39599609375, + "height": 146, + "nameCompartment": { + "$ref": "AAAAAAGA15EgB9xQhpo=" + }, + "attributeCompartment": { + "$ref": "AAAAAAGA15EgB9xVuGc=" + }, + "operationCompartment": { + "$ref": "AAAAAAGA15EgB9xWgYE=" + }, + "receptionCompartment": { + "$ref": "AAAAAAGA15EgB9xXqa4=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAGA15EgCNxYj5c=" + } + }, + { + "_type": "UMLClassView", + "_id": "AAAAAAGA15bdbeArhR8=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGA15bdbeAsGok=", + "_parent": { + "$ref": "AAAAAAGA15bdbeArhR8=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGA15bdbeAtPgE=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAsGok=" + }, + "font": "Arial;13;0", + "left": 565, + "top": 1005, + "width": 230.8896484375, + "height": 13, + "text": "«i»" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15bdbeAuDVY=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAsGok=" + }, + "font": "Arial;13;3", + "left": 565, + "top": 1020, + "width": 230.8896484375, + "height": 13, + "text": "IPersistanceManager" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15bdbeAvRbM=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAsGok=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -32, + "top": -288, + "width": 73.67724609375, + "height": 13, + "text": "(from Model)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15bdbeAw3oY=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAsGok=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -32, + "top": -288, + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 560, + "top": 1000, + "width": 240.8896484375, + "height": 38, + "stereotypeLabel": { + "$ref": "AAAAAAGA15bdbeAtPgE=" + }, + "nameLabel": { + "$ref": "AAAAAAGA15bdbeAuDVY=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGA15bdbeAvRbM=" + }, + "propertyLabel": { + "$ref": "AAAAAAGA15bdbeAw3oY=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAGA15bdbuAxrCU=", + "_parent": { + "$ref": "AAAAAAGA15bdbeArhR8=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "font": "Arial;13;0", + "left": 560, + "top": 1038, + "width": 240.8896484375, + "height": 10 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAGA15bdbuAylvk=", + "_parent": { + "$ref": "AAAAAAGA15bdbeArhR8=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15g+N+VRRZA=", + "_parent": { + "$ref": "AAAAAAGA15bdbuAylvk=" + }, + "model": { + "$ref": "AAAAAAGA15g+MOVIt2M=" + }, + "font": "Arial;13;0", + "left": 565, + "top": 1053, + "width": 230.8896484375, + "height": 13, + "text": "+LoadRequins(): IEnumerable", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15kC5uXArL8=", + "_parent": { + "$ref": "AAAAAAGA15bdbuAylvk=" + }, + "model": { + "$ref": "AAAAAAGA15kC4OW3Dxc=" + }, + "font": "Arial;13;0", + "left": 565, + "top": 1068, + "width": 230.8896484375, + "height": 13, + "text": "+SaveRequins(): IEnumerable", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 560, + "top": 1048, + "width": 240.8896484375, + "height": 38 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAGA15bdbuAzAiw=", + "_parent": { + "$ref": "AAAAAAGA15bdbeArhR8=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -16, + "top": -144, + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAGA15bdbuA0I6Y=", + "_parent": { + "$ref": "AAAAAAGA15bdbeArhR8=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -16, + "top": -144, + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 560, + "top": 1000, + "width": 240.8896484375, + "height": 86, + "nameCompartment": { + "$ref": "AAAAAAGA15bdbeAsGok=" + }, + "attributeCompartment": { + "$ref": "AAAAAAGA15bdbuAxrCU=" + }, + "operationCompartment": { + "$ref": "AAAAAAGA15bdbuAylvk=" + }, + "receptionCompartment": { + "$ref": "AAAAAAGA15bdbuAzAiw=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAGA15bdbuA0I6Y=" + } + }, + { + "_type": "UMLRealizationView", + "_id": "AAAAAAGA15reEOfitbM=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15reEOfj5xY=", + "_parent": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1061, + "top": 580, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15reEOfkYs0=", + "_parent": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 1046, + "top": 582, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15reEOflFAs=", + "_parent": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1090, + "top": 577, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGAs7TrzGLtlPM=" + }, + "tail": { + "$ref": "AAAAAAGAvAXUjFZP5GE=" + }, + "lineStyle": 1, + "points": "1080:615;1072:555", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGA15reEOfj5xY=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGA15reEOfkYs0=" + }, + "propertyLabel": { + "$ref": "AAAAAAGA15reEOflFAs=" + } + }, + { + "_type": "UMLRealizationView", + "_id": "AAAAAAGA15rjSOgfzOc=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15rjSOgg+64=", + "_parent": { + "$ref": "AAAAAAGA15rjSOgfzOc=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1061, + "top": 580, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA15rjSOgfzOc=" + }, + "edgePosition": 1 }, { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGAvCeH6mdCmuE=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15rjSOghS/s=", "_parent": { - "$ref": "AAAAAAGAvCeH6mc6iG8=" + "$ref": "AAAAAAGA15rjSOgfzOc=" }, "model": { - "$ref": "AAAAAAGAvCeH6mc4CoU=" + "$ref": "AAAAAAGAvAsiq1vhD/Q=" }, - "visible": false, + "visible": null, "font": "Arial;13;0", - "left": -192, - "top": -24, - "width": 10, - "height": 10 + "left": 1046, + "top": 582, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGA15rjSOgfzOc=" + }, + "edgePosition": 1 }, { - "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGAvCeH6mdD9So=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15rjSOgi8pw=", "_parent": { - "$ref": "AAAAAAGAvCeH6mc6iG8=" + "$ref": "AAAAAAGA15rjSOgfzOc=" }, "model": { - "$ref": "AAAAAAGAvCeH6mc4CoU=" + "$ref": "AAAAAAGAvAsiq1vhD/Q=" }, "visible": false, "font": "Arial;13;0", - "left": -192, - "top": -24, - "width": 10, - "height": 10 + "left": 1090, + "top": 577, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA15rjSOgfzOc=" + }, + "edgePosition": 1 } ], "font": "Arial;13;0", - "containerChangeable": true, - "left": 1432, - "top": 392, - "width": 466.09814453125, - "height": 116, - "nameCompartment": { - "$ref": "AAAAAAGAvCeH6mc7ICg=" + "head": { + "$ref": "AAAAAAGAs7TrzGLtlPM=" }, - "attributeCompartment": { - "$ref": "AAAAAAGAvCeH6mdA4Og=" + "tail": { + "$ref": "AAAAAAGAvAXUjFZP5GE=" }, - "operationCompartment": { - "$ref": "AAAAAAGAvCeH6mdB6Dk=" + "lineStyle": 1, + "points": "1080:615;1072:555", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGA15rjSOgg+64=" }, - "receptionCompartment": { - "$ref": "AAAAAAGAvCeH6mdCmuE=" + "stereotypeLabel": { + "$ref": "AAAAAAGA15rjSOghS/s=" }, - "templateParameterCompartment": { - "$ref": "AAAAAAGAvCeH6mdD9So=" + "propertyLabel": { + "$ref": "AAAAAAGA15rjSOgi8pw=" } }, { "_type": "UMLRealizationView", - "_id": "AAAAAAGAvCuJeWt/nUk=", + "_id": "AAAAAAGA15sL+eh3my8=", "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, "model": { - "$ref": "AAAAAAGAvCuJeWt9lRg=" + "$ref": "AAAAAAGA15sL+eh13b4=" }, "subViews": [ { "_type": "EdgeLabelView", - "_id": "AAAAAAGAvCuJeWuAD/8=", + "_id": "AAAAAAGA15sL+eh4X84=", "_parent": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "model": { - "$ref": "AAAAAAGAvCuJeWt9lRg=" + "$ref": "AAAAAAGA15sL+eh13b4=" }, "visible": false, "font": "Arial;13;0", - "left": 1328, - "top": 479, + "left": 644, + "top": 1128, "height": 13, "alpha": 1.5707963267948966, "distance": 15, "hostEdge": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "edgePosition": 1 }, { "_type": "EdgeLabelView", - "_id": "AAAAAAGAvCuJeWuBhSQ=", + "_id": "AAAAAAGA15sL+eh5P94=", "_parent": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "model": { - "$ref": "AAAAAAGAvCuJeWt9lRg=" + "$ref": "AAAAAAGA15sL+eh13b4=" }, "visible": null, "font": "Arial;13;0", - "left": 1329, - "top": 494, + "left": 629, + "top": 1125, "height": 13, "alpha": 1.5707963267948966, "distance": 30, "hostEdge": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "edgePosition": 1 }, { "_type": "EdgeLabelView", - "_id": "AAAAAAGAvCuJeWuCOjY=", + "_id": "AAAAAAGA15sL+eh6T3U=", "_parent": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "model": { - "$ref": "AAAAAAGAvCuJeWt9lRg=" + "$ref": "AAAAAAGA15sL+eh13b4=" }, "visible": false, "font": "Arial;13;0", - "left": 1325, - "top": 450, + "left": 673, + "top": 1135, "height": 13, "alpha": -1.5707963267948966, "distance": 15, "hostEdge": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "edgePosition": 1 } ], "font": "Arial;13;0", "head": { - "$ref": "AAAAAAGAs7TrzGLtlPM=" + "$ref": "AAAAAAGA15bdbeArhR8=" }, "tail": { - "$ref": "AAAAAAGAvCeH6mc6iG8=" + "$ref": "AAAAAAGA15EgB9xP62A=" }, "lineStyle": 1, - "points": "1431:465;1224:478", + "points": "649:1191;670:1086", "showVisibility": true, "nameLabel": { - "$ref": "AAAAAAGAvCuJeWuAD/8=" + "$ref": "AAAAAAGA15sL+eh4X84=" }, "stereotypeLabel": { - "$ref": "AAAAAAGAvCuJeWuBhSQ=" + "$ref": "AAAAAAGA15sL+eh5P94=" }, "propertyLabel": { - "$ref": "AAAAAAGAvCuJeWuCOjY=" + "$ref": "AAAAAAGA15sL+eh6T3U=" } } ] @@ -2979,7 +3773,7 @@ "$ref": "AAAAAAFF+qBWK6M3Z8Y=" }, "name": "Personne", - "stereotype": "", + "stereotype": "i", "attributes": [ { "_type": "UMLAttribute", @@ -3501,6 +4295,192 @@ ] } ] + }, + { + "_type": "UMLClass", + "_id": "AAAAAAGA15EgBtxNhVI=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "Manager", + "ownedElements": [ + { + "_type": "UMLDependency", + "_id": "AAAAAAGA15qXF+XwMIY=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "source": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "target": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + } + }, + { + "_type": "UMLRealization", + "_id": "AAAAAAGA15sL+eh13b4=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "source": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "target": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + } + } + ], + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAGA15HnG90xBUE=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "/Requins", + "type": "ReadOnlyCollection" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGA15KlWt2sGEk=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "/requins", + "type": "List" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGA15Muut4m0iA=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "/SelectedRequin", + "type": { + "$ref": "AAAAAAGALQHg0aEFSj0=" + } + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGA15OPst6OWo8=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "/Pers", + "type": "IPersistanceManager" + } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAGA15QXet72Teo=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "Manager", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGA15VInN+RWiE=", + "_parent": { + "$ref": "AAAAAAGA15QXet72Teo=" + }, + "name": "IPersistanceManager pers", + "type": "" + } + ], + "specification": "\n" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGA15Vcit+3mxY=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "LoadRequins", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGA15WV3N/cdFc=", + "_parent": { + "$ref": "AAAAAAGA15Vcit+3mxY=" + }, + "type": "void", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGA15WWO9/wDNE=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "SaveRequins", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGA15W/8uAVlT4=", + "_parent": { + "$ref": "AAAAAAGA15WWO9/wDNE=" + }, + "type": "void", + "direction": "return" + } + ] + } + ] + }, + { + "_type": "UMLClass", + "_id": "AAAAAAGA15bdbeAp+aQ=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "IPersistanceManager", + "stereotype": "i", + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAGA15g+MOVIt2M=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "name": "LoadRequins", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGA15i/GuVtLfk=", + "_parent": { + "$ref": "AAAAAAGA15g+MOVIt2M=" + }, + "type": "IEnumerable", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGA15kC4OW3Dxc=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "name": "SaveRequins", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGA15mUaOXc0uQ=", + "_parent": { + "$ref": "AAAAAAGA15kC4OW3Dxc=" + }, + "type": "IEnumerable", + "direction": "return" + } + ] + } + ], + "isAbstract": true } ] }, diff --git a/Persistance/IPersistanceManager.cs b/Persistance/IPersistanceManager.cs index cec430d..3e22454 100644 --- a/Persistance/IPersistanceManager.cs +++ b/Persistance/IPersistanceManager.cs @@ -10,5 +10,6 @@ namespace Persistance public interface IPersistanceManager { IEnumerable LoadRequins(); + //IEnumerable SaveRequins(); } } \ No newline at end of file diff --git a/TestsUnitaires/TestsUnitaires.csproj b/TestsUnitaires/TestsUnitaires.csproj index cc7744a..326d55c 100644 --- a/TestsUnitaires/TestsUnitaires.csproj +++ b/TestsUnitaires/TestsUnitaires.csproj @@ -19,4 +19,8 @@ + + + + diff --git a/TestsUnitaires/Tests_Requin.cs b/TestsUnitaires/Tests_Requin.cs new file mode 100644 index 0000000..ae92038 --- /dev/null +++ b/TestsUnitaires/Tests_Requin.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +using Xamarin.Forms; + +namespace TestsUnitaires +{ + public class Tests_Requin : + { + public Page1() + { + + } + } +} \ No newline at end of file diff --git a/TestsUnitaires/UnitTest1.cs b/TestsUnitaires/UnitTest1.cs deleted file mode 100644 index 92efe05..0000000 --- a/TestsUnitaires/UnitTest1.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Xunit; - -namespace TestsUnitaires -{ - public class UnitTest1 - { - [Fact] - public void Test1() - { - - } - } -} diff --git a/UnitTests/UnitTest_Modele.cs b/UnitTests/UnitTest_Modele.cs new file mode 100644 index 0000000..68c6a83 --- /dev/null +++ b/UnitTests/UnitTest_Modele.cs @@ -0,0 +1,75 @@ +using System; +using Xunit; +using Modèle; +using System.Collections.Generic; + +namespace UnitTests +{ + public class UnitTest_Modele + { + + [Fact] + public void Test1() + { + + List zones = new List { Zone.ATLANTIQUE, Zone.PACIFIQUE }; + List RandomFunFacts = new List { "askip les requins c'est cool", "le requin mexicain possède un groin", "le requin scie est sympa comme tout il me coupe du bois l'hiver" }; + Requin requin = new Requin("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo"); + Requin requin2 = new Requin("nom", "nomSci", "des", "photo", "video", "photoCarte", Conservation.CR, zones, RandomFunFacts); + List bdd = new List { requin, requin2 }; + + Console.WriteLine("Test de la classe Requin!"); + foreach (Zone zone in requin2.Repartition) + { + Console.WriteLine(zone); + } + } + + + [Fact] + public void Test2() + { + List zones = new List { Zone.ATLANTIQUE, Zone.PACIFIQUE }; + List RandomFunFacts = new List { "askip les requins c'est cool", "le requin mexicain possède un groin", "le requin scie est sympa comme tout il me coupe du bois l'hiver" }; + Requin requin = new Requin("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo"); + Requin requin2 = new Requin("nom", "nomSci", "des", "photo", "video", "photoCarte", Conservation.CR, zones, RandomFunFacts); + List bdd = new List { requin, requin2 }; + + Console.WriteLine("Test Personnes :"); + DateTime d = new DateTime(2020, 12, 12); + List finie = new List(); + Utilisateur u1 = new Utilisateur("bobpoutou@yahoo.com", "vivepoutou"); + Utilisateur u2 = new Utilisateur("jeancarotte@gamil.com", "miamlescarottes", 48); + Expert e1 = new Expert("AlexPert@gmail.com", "lesRequins", "Le Gros BG", d); + Expert e2 = new Expert("Blabla@gmail.com", "lesPoissons", "Le débutant"); + u1.FaireUnSubmit("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo", bdd); + e1.ValiderSubmit(finie, bdd); + Console.WriteLine(u1); + Console.WriteLine(u2); + + foreach (Requin r in bdd) + { + Console.WriteLine(r); + } + foreach (Requin r in finie) + { + Console.WriteLine(r); + } + + finie.Clear(); + finie.Add(requin); + Console.WriteLine(e1); + Console.WriteLine(e2); + + List z = new List(); + u1.FaireUnChangement(requin, "lalalilalou", "", "", "", Conservation.NE, z, "hahahahaha", bdd); + e1.ValiderUnChangement(finie, bdd); + foreach (Requin r in finie) + { + Console.WriteLine(r); + } + } + + + } +} diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj new file mode 100644 index 0000000..326d55c --- /dev/null +++ b/UnitTests/UnitTests.csproj @@ -0,0 +1,26 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + diff --git a/WpfApp1.sln b/WpfApp1.sln index 4857e49..82e5c61 100644 --- a/WpfApp1.sln +++ b/WpfApp1.sln @@ -18,8 +18,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modèle", "Modèle\Modèle. EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{18E1E85C-1B90-47C9-BB80-53FAE0A79466}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test_requin", "test_requin\test_requin.csproj", "{D82F546C-3455-4857-A705-BDD3F61973CD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StubLib", "StubLib\StubLib.csproj", "{3DE43637-4ADE-420B-A78E-BD5A01B7E930}" ProjectSection(ProjectDependencies) = postProject {A3496A97-FA54-4FA9-A128-4B0D97D8F7EF} = {A3496A97-FA54-4FA9-A128-4B0D97D8F7EF} @@ -27,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StubLib", "StubLib\StubLib. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Persistance", "Persistance\Persistance.csproj", "{A3496A97-FA54-4FA9-A128-4B0D97D8F7EF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestsUnitaires", "TestsUnitaires\TestsUnitaires.csproj", "{44FC8FF7-778E-462A-8E46-9153006A4EAE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{D92A482A-06C4-4F7B-B51F-3934A2E4C8E2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -51,10 +49,6 @@ Global {006E8327-215C-46B4-8816-24B996B82798}.Debug|Any CPU.Build.0 = Debug|Any CPU {006E8327-215C-46B4-8816-24B996B82798}.Release|Any CPU.ActiveCfg = Release|Any CPU {006E8327-215C-46B4-8816-24B996B82798}.Release|Any CPU.Build.0 = Release|Any CPU - {D82F546C-3455-4857-A705-BDD3F61973CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D82F546C-3455-4857-A705-BDD3F61973CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D82F546C-3455-4857-A705-BDD3F61973CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D82F546C-3455-4857-A705-BDD3F61973CD}.Release|Any CPU.Build.0 = Release|Any CPU {3DE43637-4ADE-420B-A78E-BD5A01B7E930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3DE43637-4ADE-420B-A78E-BD5A01B7E930}.Debug|Any CPU.Build.0 = Debug|Any CPU {3DE43637-4ADE-420B-A78E-BD5A01B7E930}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -63,18 +57,17 @@ Global {A3496A97-FA54-4FA9-A128-4B0D97D8F7EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3496A97-FA54-4FA9-A128-4B0D97D8F7EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {A3496A97-FA54-4FA9-A128-4B0D97D8F7EF}.Release|Any CPU.Build.0 = Release|Any CPU - {44FC8FF7-778E-462A-8E46-9153006A4EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44FC8FF7-778E-462A-8E46-9153006A4EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44FC8FF7-778E-462A-8E46-9153006A4EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44FC8FF7-778E-462A-8E46-9153006A4EAE}.Release|Any CPU.Build.0 = Release|Any CPU + {D92A482A-06C4-4F7B-B51F-3934A2E4C8E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D92A482A-06C4-4F7B-B51F-3934A2E4C8E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D92A482A-06C4-4F7B-B51F-3934A2E4C8E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D92A482A-06C4-4F7B-B51F-3934A2E4C8E2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {C85454C4-850B-4305-AFB6-789DDA8CD88A} = {18E1E85C-1B90-47C9-BB80-53FAE0A79466} - {D82F546C-3455-4857-A705-BDD3F61973CD} = {18E1E85C-1B90-47C9-BB80-53FAE0A79466} - {44FC8FF7-778E-462A-8E46-9153006A4EAE} = {18E1E85C-1B90-47C9-BB80-53FAE0A79466} + {D92A482A-06C4-4F7B-B51F-3934A2E4C8E2} = {18E1E85C-1B90-47C9-BB80-53FAE0A79466} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {169891F4-0C16-4020-9581-5AC90ADE6FD5} diff --git a/WpfApp1/Images/User.png b/WpfApp1/Images/User.png new file mode 100644 index 0000000000000000000000000000000000000000..cbb2341154ebfe97de0b4d91cde9e4158bd1797f GIT binary patch literal 45641 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 Y>$KaM9Br2lFNBaU+`L_Xb`c!@Kf~8ndH?_b literal 0 HcmV?d00001 diff --git a/WpfApp1/Images/plus.png b/WpfApp1/Images/plus.png index 633a000a040f02589b6547be8e420db1b3f2815f..44de36b9f4927317aaf5c0e65a7d617e0fd2a0b6 100644 GIT binary patch literal 17652 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 literal 2720 zcmeH}do)!09>6Eccr>_`N0L#Jb39TU6b3V1NsJs!ondsOB&3#CZ8nj|(UrO7AUVw7 zNFJp;BGb(DSob(6_K^2uj@6AVW+v>rlGx4M|ZE`exq-V%?=*2`0lVR&H?Y@>gMU~=TACC z4h*9F7<%?xWK?Wi5}0!BM$XM#>fiDT3X6UzDXnd4d&c^$y|e30cMsG%G(0-?$JF#J zPw;VmK`2`OBwmrMsfA}Jp-_tVJzVg9S4Mc_iKOlB+RrD=3KjiL-NGvZ>jpynpXpQn zg2&^3FiY1oIr-EtmA@pF6Cwz9)@(QjW?W6iqB246qZSOyJh1YKNsJO*rETMI){4b% z7+DA4v<*Ww2->n??EcCYDz>qOs4wrtqmHYdb+y*EhZwET+C(8yaaS+LhcpccU30es zHDWjHfX#x<=zT|B-gSyE!ncfx_{1O=+x20XNig#aQM9nsvJ_gU1w4fq=KYIQfA(7p z(*<^>F1P{TZDyLnxP&K*zm2f^+nfJYbJ3UX3Wp(o>cE(WuFx?M~OjfVR=i;qVKnmTXoL?O)bTpmmU=6@YIL zgJLDfhU!F3Pc|TOFmNhlV&VajjG=dQ+K5LQD@Ga6MLO)g@}O6AQo*(|bAP%!zMj92 zz^x`w(~=E|{TlEINMPv9M&p#l1Pf#fjE53GbU?E>=nQ?S-pDyvkfkRNp0?a6oob;TLsK8`z56N{0=gGUqJS-L|pt|Hfp34;yVOr(G-6WVWQx ztq#EGNolINVRC9My$#q|sEbNy2QIJx$|0zIP0oJDw*qPJ@_ zNiVN2h?h!XvKr8D*!LnG!=+ z>A6yVVzKnz&oEb-E0UM2fl8eAmKVv7c=Nqw++W3m?lYxq@`| zXcx~-AB#o)s$R?wxrCH*wXMgaagRCX`le6@1m_1UX~KiYLJ{oR{*!ce%1=2C=tn*= zsT{Qj^CoXc%39&Dd5yWqKm?5_i}X!_O7Hs9!ef4jpf2*8k%5F0oRoA@E4HFM@mS53 z!SeE+29vQ!Kg2aYgPe1N_4?tZt`i*6u*O9z<2H{W&HW)2RxQd5WoDv}S+#=j z`xt^5R#ovWOM@`}_!xr`8GPYKLBmrTrL}db4|nAI)>dNo6}N|%)a)^%$tA+E#1*fX zdJQitd3PHN9`J533*OZ96aG$Vz5oJc2ZplCc{fd~oZc zZR+E3<4L8Q?jIyaEA1ott2?oEzg8LBIZ7n?ORLDB(2Fen7*Fm4ql0S}=wZW;i!hzh zO^0IUg0yOm!>0mdHIXI$ToYWds54^?sF{*g4e9wJ$+Lx+z!dDw$4KJPxfB-LCzu;a zTp<j>K^UPoAMHLH>5S0;m-sUab_#)+C%>b0Lh zdri;6JLXSGSGvE2FaL{;VK%qv+~4VFg5&KFF}SFR9EFFE%OOQuWkmfD&^1N&haW?Y zGX2J@>Is^EFMcn~rwr@n)Gut}TQr z;PwI56m8J{y50^P!yj4=P{5f2?S6X}t5xC4oW}0G2?IuUmT)SkF*2mZV_`g-ctjUo z>3urwRpjVch*zVQ?oJs?|Mc$NPMKc9WY*cWkIU-I!<%mb3NW|}zprv2Bdii4sa@%9 zA8hG2j|+o5(@W2;E6hQkB~w^}W9BB17R(Eq8klfqStr~}Oi|bba%XpeC%MbmWjD#> zc`oZFN<4l4-(}fMW3v!gY;pb1n0RB^YsG#=_6Ojv$X?a~eD-}O$FWIW0-D@A@4nt& NdANGJJS3b>`zKany08EM diff --git a/WpfApp1/WpfApp1.csproj b/WpfApp1/WpfApp1.csproj index 13a0950..499d7b8 100644 --- a/WpfApp1/WpfApp1.csproj +++ b/WpfApp1/WpfApp1.csproj @@ -25,6 +25,7 @@ + @@ -61,6 +62,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/WpfApp1/userControlAcceuil.xaml b/WpfApp1/userControlAcceuil.xaml index 3cf4fd8..e06e29d 100644 --- a/WpfApp1/userControlAcceuil.xaml +++ b/WpfApp1/userControlAcceuil.xaml @@ -11,11 +11,11 @@ diff --git a/test_requin/Program.cs b/test_requin/Program.cs index 3c74ea1..f1c8e3b 100644 --- a/test_requin/Program.cs +++ b/test_requin/Program.cs @@ -8,57 +8,14 @@ namespace test_requin { static void Main(string[] args) { - List zones = new List { Zone.ATLANTIQUE, Zone.PACIFIQUE }; - Console.WriteLine("Test de la classe Requin!"); - List RandomFunFacts = new List { "askip les requins c'est cool", "le requin mexicain possède un groin", "le requin scie est sympa comme tout il me coupe du bois l'hiver" }; - Requin requin = new Requin("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo"); ; - Requin requin2 = new Requin("nom", "nomSci", "des", "photo", "video", "photoCarte", Conservation.CR, zones, RandomFunFacts); - List bdd = new List { requin, requin2 }; - foreach (Zone zone in requin2.Repartition) - { - Console.WriteLine(zone); - } + Console.Write("------------------------------------------------------------------------------------\n"); - Console.WriteLine("Test Personnes :"); - DateTime d = new DateTime(2020, 12, 12); - List finie= new List(); - Utilisateur u1= new Utilisateur("bobpoutou@yahoo.com", "vivepoutou"); - Utilisateur u2 = new Utilisateur("jeancarotte@gamil.com", "miamlescarottes", 48); - Expert e1 = new Expert("AlexPert@gmail.com", "lesRequins", "Le Gros BG",d); - Expert e2 = new Expert("Blabla@gmail.com", "lesPoissons", "Le débutant"); - u1.FaireUnSubmit("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo", bdd); - e1.ValiderSubmit(finie, bdd); - Console.WriteLine(u1); - Console.WriteLine(u2); - - foreach (Requin r in bdd) - { - Console.WriteLine(r); - } Console.Write("------------------------------------------------------------------------------------\n"); - foreach (Requin r in finie) - { - Console.WriteLine(r); - } - - finie.Clear(); - finie.Add(requin); - Console.WriteLine(e1); - Console.WriteLine(e2); - - List z = new List(); - Console.WriteLine("----------------------------------------------------------------------------------\n"); - u1.FaireUnChangement(requin, "lalalilalou", "", "", "", Conservation.NE, z, "hahahahaha", bdd); - e1.ValiderUnChangement(finie, bdd); - foreach(Requin r in finie) - { - Console.WriteLine(r); - } } } }