Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7724] trunk/soft/fudaa-crue/crue-server/src
|
From: <de...@us...> - 2012-10-08 06:39:18
|
Revision: 7724
http://fudaa.svn.sourceforge.net/fudaa/?rev=7724&view=rev
Author: deniger
Date: 2012-10-08 06:39:12 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
support fichier externe
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelper.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ReadHelper.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationContent.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/projet/migrate/TestScenarioMigrateProcessor.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java
trunk/soft/fudaa-crue/crue-server/src/test/resources/integration/v1_1_1/otfa.zip
trunk/soft/fudaa-crue/crue-server/src/test/resources/migration/etu3-avecErreurs.zip
trunk/soft/fudaa-crue/crue-server/src/test/resources/migration/etu3-ok.zip
trunk/soft/fudaa-crue/crue-server/src/test/resources/projet/Etu3-0_1.1.2.zip
trunk/soft/fudaa-crue/crue-server/src/test/resources/remover/Etu3-0_1.1.2.zip
trunk/soft/fudaa-crue/crue-server/src/test/resources/v1_2/archive/Etu_v1.2.zip
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelper.java 2012-10-05 22:45:14 UTC (rev 7723)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelper.java 2012-10-08 06:39:12 UTC (rev 7724)
@@ -576,6 +576,7 @@
List<DonCLimM> listeDCLM = calc.getlisteDCLM();
for (DonCLimM donCLimM : listeDCLM) {
if (!donCLimM.getActuallyActive()) {
+ boolean actuallyActive = donCLimM.getEmh().getActuallyActive();
res.addWarn("validation.dclm.inactive", calc.getNom(), ((DonCLimMCommonItem) donCLimM).getShortName());
}
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ReadHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ReadHelper.java 2012-10-05 22:45:14 UTC (rev 7723)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ReadHelper.java 2012-10-08 06:39:12 UTC (rev 7724)
@@ -26,9 +26,7 @@
public static void updateRelationScenarioModeleSousModele(CrueIOResu<CrueData> ioData) {
EMHScenario scenario = ioData.getMetier().getScenarioData();
- EMHModeleBase modele = ioData.getMetier().getModele();
- EMHRelationFactory.addRelationContientEMH(scenario, modele);
- EMHRelationFactory.addRelationContientEMH(modele, ioData.getMetier().getSousModele());
+ initializeRelationScenarioModeleSousModele(ioData, scenario);
}
public static EMHScenario readModeleAnsSetRelation(final CtuluLog analyzer, final String dcPath, final String dhPath) {
@@ -84,4 +82,10 @@
EMHRelationFactory.addRelationContientEMH(emhScenario, res.getModele());
EMHRelationFactory.addRelationContientEMH(res.getModele(), res.getSousModele());
}
+
+ private static void initializeRelationScenarioModeleSousModele(CrueIOResu<CrueData> ioData, EMHScenario scenario) {
+ EMHModeleBase modele = ioData.getMetier().getModele();
+ EMHRelationFactory.addRelationContientEMH(scenario, modele);
+ EMHRelationFactory.addRelationContientEMH(modele, ioData.getMetier().getSousModele());
+ }
}
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationContent.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationContent.java 2012-10-05 22:45:14 UTC (rev 7723)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationContent.java 2012-10-08 06:39:12 UTC (rev 7724)
@@ -37,7 +37,7 @@
public void testValidationEtuBYCor() {
CtuluLog analyzer = new CtuluLog();
final CrueIOResu<CrueData> ioResu = ReadHelper.readModeleAndDefaultORES(analyzer, "/EtuBY/Test_c9cor.dc",
- "/EtuBY/Test_c9cor.dh");
+ "/EtuBY/Test_c9cor.dh");
// testAnalyser(analyzer);
CrueData data = ioResu.getMetier();
EMHScenario scenarioData = data.getScenarioData();
@@ -46,21 +46,16 @@
scenarioData.setNom("Test");
CtuluLogGroup doValidate = doValidate(scenarioData, data.getCrueConfigMetier());
int nbOccurence = doValidate.getNbOccurence(CtuluLogLevel.ERROR);
- List<CtuluLog> analyser = doValidate.getLogs();
- for (CtuluLog ctuluAnalyze : analyser) {
- ctuluAnalyze.printResume();
-
- }
- assertEquals(44, nbOccurence);//TOUS: Aucun DonFrt affecté au LitNumeroté STOCKG + 38 profils sans lit mineur.
+ assertEquals(42, nbOccurence);//TOUS: Aucun DonFrt affecté au LitNumeroté STOCKG + 38 profils sans lit mineur.
}
-
- public static void validateAll(final CtuluLogGroup logs, final EMHScenario scenario,
- final Collection<CrueValidator> validators) {
+
+ public static void validateAll(final CtuluLogGroup logs, final EMHScenario scenario,
+ final Collection<CrueValidator> validators) {
validateAll(logs, scenario, false, validators);
}
public static void validateAll(final CtuluLogGroup logs, final EMHScenario scenario,
- final boolean addOnlyNotEmptyLog, final Collection<CrueValidator> validators) {
+ final boolean addOnlyNotEmptyLog, final Collection<CrueValidator> validators) {
if (validators == null) {
return;
}
@@ -82,7 +77,7 @@
CtuluLogGroup mng = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
List<CrueValidator> validators = new ArrayList<CrueValidator>();
validators.add(new ValidatorForValuesAndContents(configMetier));
- validators.add(new ValidateAndRebuildProfilSection(configMetier,null));
+ validators.add(new ValidateAndRebuildProfilSection(configMetier, null));
ValidationHelper.validateAll(mng, scenarioData, validators);
return mng;
}
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/projet/migrate/TestScenarioMigrateProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/projet/migrate/TestScenarioMigrateProcessor.java 2012-10-05 22:45:14 UTC (rev 7723)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/projet/migrate/TestScenarioMigrateProcessor.java 2012-10-08 06:39:12 UTC (rev 7724)
@@ -75,7 +75,10 @@
"M3-0_c10.pnum.xml",
"M3-0_c10.optr.xml",//ajoute automatiquement pour v1.1.1 ->v1.2 et sup
"M3_c9.dc",
- "M3_c9.dh"};
+ "M3_c9.dh",
+ "Config"//repertoire de config
+
+ };
this.testFichiersPresent(presentFiles, targetDir.list());
}
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java 2012-10-05 22:45:14 UTC (rev 7723)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java 2012-10-08 06:39:12 UTC (rev 7724)
@@ -13,6 +13,7 @@
import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.config.CrueConfigMetierLoaderDefaultTest;
import org.fudaa.dodico.crue.io.Crue10FileFormatFactory;
+import org.fudaa.dodico.crue.io.ReadHelper;
import org.fudaa.dodico.crue.io.TestCrueDRSOFile;
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.io.common.CrueFileType;
@@ -198,6 +199,7 @@
if (analyzer.containsErrorOrSevereError()) {
analyzer.printResume();
}
+ ReadHelper.initRelations(data);
assertFalse(analyzer.containsErrorOrSevereError());
EMHScenario scenarioData = data.getScenarioData();
CtuluLog logs = ValidationHelper.validateDonCLimMScenario(scenarioData.getDonCLimMScenario(), CrueConfigMetierLoaderDefaultTest.DEFAULT);
Modified: trunk/soft/fudaa-crue/crue-server/src/test/resources/integration/v1_1_1/otfa.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-server/src/test/resources/migration/etu3-avecErreurs.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-server/src/test/resources/migration/etu3-ok.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-server/src/test/resources/projet/Etu3-0_1.1.2.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-server/src/test/resources/remover/Etu3-0_1.1.2.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-server/src/test/resources/v1_2/archive/Etu_v1.2.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
