Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8623] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2014-02-14 21:12:46
|
Revision: 8623
http://sourceforge.net/p/fudaa/svn/8623
Author: deniger
Date: 2014-02-14 21:12:43 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
CRUE-618
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java
trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2014-02-14 21:12:43 UTC (rev 8623)
@@ -558,6 +558,7 @@
otfa.validator.referenceScenarioNoSet=le sc\u00e9nario de r\u00e9f\u00e9rence n'est pas renseign\u00e9
otfa.validator.referenceCoeurNoSet=Le coeur de r\u00e9f\u00e9rence n'est pas renseign\u00e9
otfa.validator.cibleCoeurNoSet=Le coeur cible n'est pas renseign\u00e9
+otfa.validator.cibleCoeurEmptyButNotScenarioEtude=Si Le coeur cible est vide toute la demi-ligne cible doit \u00eatre vide
otfa.validator.cibleConversionMisconfigured=La cible est mal d\u00e9finie. Pour repr\u00e9senter une conversion, l'\u00e9tude et le sc\u00e9nario doivent \u00eatre tous les 2 vides.
otfa.deleteRunBefore.logs=Effacement des runs avant
otfa.deleteRunAfter.logs=Effacement des runs apr\u00e8s
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java 2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java 2014-02-14 21:12:43 UTC (rev 8623)
@@ -63,6 +63,11 @@
OtfaCampagneLine metier = new OtfaCampagneLine();
metier.setCommentaire(dao.Commentaire);
metier.setIndice(dao.Numero);
+ if (dao.LancerComparaison != null) {
+ metier.setLancerComparaison(Boolean.valueOf(dao.LancerComparaison));
+ } else {
+ metier.setLancerComparaison(true);
+ }
metier.setReference(CrueConverterCommonParameter.convertRunParametersDaoToMetier(dao.Reference));
metier.setCible(CrueConverterCommonParameter.convertRunParametersDaoToMetier(dao.Cible));
return metier;
@@ -72,6 +77,7 @@
CrueDaoStructureOptions.LigneCampagne dao = new CrueDaoStructureOptions.LigneCampagne();
dao.Commentaire = metier.getCommentaire();
dao.Numero = metier.getIndice();
+ dao.LancerComparaison = Boolean.valueOf(metier.isLancerComparaison());
dao.Reference = CrueConverterCommonParameter.convertRunParametersMetierToDao(metier.getReference());
dao.Cible = CrueConverterCommonParameter.convertRunParametersMetierToDao(metier.getCible());
return dao;
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java 2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java 2014-02-14 21:12:43 UTC (rev 8623)
@@ -32,6 +32,7 @@
public int Numero;
public String Commentaire;
+ public Boolean LancerComparaison;
public RunParameters Reference;
public RunParameters Cible;
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java 2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java 2014-02-14 21:12:43 UTC (rev 8623)
@@ -30,6 +30,10 @@
}
}
+ public boolean isEmpty() {
+ return StringUtils.isBlank(coeurName) && StringUtils.isBlank(scenarioNom) && StringUtils.isBlank(etuFile);
+ }
+
/**
*
* @return true si la version utilisee est Crue9.
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java 2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java 2014-02-14 21:12:43 UTC (rev 8623)
@@ -6,7 +6,7 @@
/**
* Correspond a une ligne d'une campagne.
- *
+ *
* @author deniger
*/
public class OtfaCampagneLine {
@@ -14,6 +14,8 @@
private OtfaCampagneItem reference;
private OtfaCampagneItem cible;
private String commentaire;
+ private boolean lancerComparaison = true;
+
/**
* correspond à l'indice de la ligne dans la liste de {@link OtfaCampagne}
*/
@@ -22,6 +24,14 @@
public OtfaCampagneLine() {
}
+ public boolean isLancerComparaison() {
+ return lancerComparaison;
+ }
+
+ public void setLancerComparaison(boolean lancerComparaison) {
+ this.lancerComparaison = lancerComparaison;
+ }
+
public OtfaCampagneLine(OtfaCampagneLine toCopy) {
if (toCopy != null) {
if (toCopy.reference != null) {
@@ -30,8 +40,8 @@
if (toCopy.cible != null) {
cible = new OtfaCampagneItem(toCopy.cible);
}
- this.commentaire=toCopy.commentaire;
- this.indice=toCopy.indice;
+ this.commentaire = toCopy.commentaire;
+ this.indice = toCopy.indice;
}
}
@@ -51,7 +61,8 @@
/**
* TODO a verifer:
- * @return
+ *
+ * @return
*/
public boolean isCibleAConversion() {
return (StringUtils.isBlank(cible.getScenarioNom()) && StringUtils.isBlank(cible.getEtuPath()));
@@ -132,6 +143,9 @@
result = prime * result + ((commentaire == null) ? 0 : commentaire.hashCode());
result = prime * result + indice;
result = prime * result + ((reference == null) ? 0 : reference.hashCode());
+ if (lancerComparaison) {
+ result++;
+ }
return result;
}
@@ -167,6 +181,9 @@
if (indice != other.indice) {
return false;
}
+ if (lancerComparaison != other.lancerComparaison) {
+ return false;
+ }
if (reference == null) {
if (other.reference != null) {
return false;
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java 2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java 2014-02-14 21:12:43 UTC (rev 8623)
@@ -110,14 +110,18 @@
}
boolean cibleEtuEmpty = StringUtils.isEmpty(line.getCible().getEtuPath());
boolean cibleScenarioEmpty = StringUtils.isEmpty(line.getCible().getScenarioNom());
- if ((cibleEtuEmpty && !cibleScenarioEmpty) || (!cibleEtuEmpty && cibleScenarioEmpty)) {
- log.addSevereError("otfa.validator.cibleConversionMisconfigured");
+ final boolean coeurEmpty = StringUtils.isEmpty(line.getCible().getCoeurName());
+ if (line.isLancerComparaison() || !coeurEmpty) {
+ if ((cibleEtuEmpty && !cibleScenarioEmpty) || (!cibleEtuEmpty && cibleScenarioEmpty)) {
+ log.addSevereError("otfa.validator.cibleConversionMisconfigured");
+ }
}
-
-
- if (StringUtils.isEmpty(line.getCible().getCoeurName())) {
+ if (line.isLancerComparaison() && coeurEmpty) {
log.addSevereError("otfa.validator.cibleCoeurNoSet");
}
+ if (!line.isLancerComparaison() && coeurEmpty && (!cibleEtuEmpty || !cibleScenarioEmpty)) {
+ log.addSevereError("otfa.validator.cibleCoeurEmptyButNotScenarioEtude");
+ }
}
}
@@ -165,7 +169,6 @@
}
}
-
}
}
@@ -197,7 +200,6 @@
}
}
-
}
}
@@ -220,7 +222,7 @@
}
private void validateXsdCompatible(OtfaCampagne campagne, OtfaCampagneItem item, Map<File, String> xsdVersionByEtuFile,
- CtuluLog log, boolean isRef) {
+ CtuluLog log, boolean isRef) {
if (item.isCrue9()) {
return;
}
@@ -241,7 +243,7 @@
} else if (!StringUtils.equals(xsdVersion, findVersion.getVersion())) {
log.addSevereError(isRef ? "otfa.validator.referenceXsdNotCompatible" : "otfa.validator.cibleXsdNotCompatible",
- xsdVersion, findVersion.getVersion());
+ xsdVersion, findVersion.getVersion());
}
}
@@ -266,7 +268,7 @@
final Map<String, CrueVersionType> scenarios = scenariosByEtudes.get(reference.getEtuPath());
if (scenarios != null) {
scenarios.put(line.getFinalCible().getScenarioNom(),
- line.getCible().isCrue9() ? CrueVersionType.CRUE9 : CrueVersionType.CRUE10);
+ line.getCible().isCrue9() ? CrueVersionType.CRUE9 : CrueVersionType.CRUE10);
}
} else {
this.validScenarioExist(campagne, cible, scenariosByEtudes, log);
@@ -276,7 +278,7 @@
}
private void validScenarioExist(OtfaCampagne campagne, OtfaCampagneItem item,
- final Map<String, Map<String, CrueVersionType>> scenariosByEtudes, CtuluLog log) {
+ final Map<String, Map<String, CrueVersionType>> scenariosByEtudes, CtuluLog log) {
File etuFile = item.getEtuFile(campagne.getOtfaDir());
//validation effectuée auparavant:
if (etuFile == null || !etuFile.exists()) {
@@ -314,15 +316,14 @@
//erreur relevée par ailleurs: il faut eviter les remontées multiples
if (versionItem.equals(CrueVersionType.CRUE10) && !coeurExist(item.getCoeurName())) {
Logger.getLogger(OtfaContentValidator.class.getName()).log(Level.INFO,
- "pas d'erreur le scenario {0} car deja remonté dans un test precedent",
- scenarioVersion);
+ "pas d'erreur le scenario {0} car deja remonté dans un test precedent",
+ scenarioVersion);
} else {
log.addSevereError("otfa.validator.crueVersionNonCompatible", name, scenarioVersion.getDisplayName(),
- versionItem.getDisplayName());
+ versionItem.getDisplayName());
}
}
-
}
}
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2014-02-14 21:12:43 UTC (rev 8623)
@@ -57,7 +57,7 @@
*
*/
public class OtfaExecutor {
-
+
private final CoeurManager coeurManager;
private final ConnexionInformation user;
private final CalculCrueRunnerManager calculRunner;
@@ -75,7 +75,7 @@
this.calculRunner = calculRunner;
this.lineSaver = lineSaver;
}
-
+
public RTFAResultLines launch(OtfaCampagne in, ProgressionInterface progress) {
RTFAResultLines result = null;
OutOfMemoryError oomError = null;
@@ -87,7 +87,7 @@
lineSaver.start(false);
}
result = lineSaver.getLines();
-
+
result.getHeader().setCommentaire(in.getCommentaire());
result.getHeader().setDate(new LocalDateTime());
updater.majProgessionStateOnly(BusinessMessages.getString("otfa.avancement.validation"));
@@ -98,20 +98,20 @@
if (preloadSelector != null && preloadSelector.containsSomething()) {
campagneLogs.addGroup(preloadSelector);
}
-
+
if (campagneLogs.containsFatalError()) {
return result;
}
if (stoppedAskedByUser()) {
return result;
}
-
+
List<OtfaCampagneLine> lines = in.getLines();
final int size = lines.size();
updater.setValue(size, size);
updater.majProgessionStateOnly(BusinessMessages.getString("otfa.avancement.lock"));
for (OtfaCampagneLine line : lines) {
-
+
allEtu.add(line.getReference().getEtuFile(in.getOtfaDir()));
if (!line.isCibleAConversion()) {
allEtu.add(line.getFinalCible().getEtuFile(in.getOtfaDir()));
@@ -157,7 +157,7 @@
}
return result;
}
-
+
private void processAllLines(OtfaCampagne in, CtuluLogGroup campagneLogs, ProgressionUpdater updater) {
if (in.getReferenceOptions().isEffacerRunAvant() || in.getCibleOptions().isEffacerRunAvant()) {
CtuluLogGroup logsBefore = campagneLogs.createGroup("otfa.deleteRunBefore.logs");
@@ -179,13 +179,13 @@
deleteRuns(in, in.getReferenceOptions().isEffacerRunApres(), in.getCibleOptions().isEffacerRunApres(), logsAfter);
}
}
-
+
private OtfaCampagneLineResult launch(OtfaCampagne campagne, OtfaCampagneLine line) {
final OtfaCampagneLineResult result = new OtfaCampagneLineResult();
final CtuluLogGroup logs = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
logs.setDescription("otfa.launchLine");
logs.setDescriptionArgs(Integer.toString(line.getIndice()));
-
+
result.setInitialLine(line);
result.setLogs(logs);
@@ -202,21 +202,22 @@
if (stoppedAskedByUser()) {
return result;
}
-
- final CoeurConfigContrat coeurForItem = getCoeurForItem(campagne, line.getReference());
+ if (line.isLancerComparaison()) {
+ final CoeurConfigContrat coeurForItem = getCoeurForItem(campagne, line.getReference());
- //la config est celle de la référence.
- CrueConfigMetier config = coeurForItem.getCrueConfigMetier();
- final EMHScenario refScenario = referenceResult == null ? null : referenceResult.getResult();
- final EMHScenario cibleScenario = cibleResult == null ? null : cibleResult.getResult();
-
- if ((refScenario != null) && (cibleScenario != null)) {
- result.setComparisonResult(executor.compare(config, refScenario, cibleScenario, getSelectorType(line)));
+ //la config est celle de la référence.
+ CrueConfigMetier config = coeurForItem.getCrueConfigMetier();
+ final EMHScenario refScenario = referenceResult == null ? null : referenceResult.getResult();
+ final EMHScenario cibleScenario = cibleResult == null ? null : cibleResult.getResult();
+
+ if ((refScenario != null) && (cibleScenario != null)) {
+ result.setComparisonResult(executor.compare(config, refScenario, cibleScenario, getSelectorType(line)));
+ }
}
-
+
return result;
}
-
+
protected ComparaisonSelectorEnum getSelectorType(OtfaCampagneLine line) {
if (line.getReference().isCrue9() && line.getFinalCible().isCrue9()) {
return ComparaisonSelectorEnum.C9_C9;
@@ -226,7 +227,7 @@
}
return ComparaisonSelectorEnum.C9_C10;
}
-
+
public CoeurConfigContrat getCoeurForItem(OtfaCampagne campagne, OtfaCampagneItem item) {
File etuFile = item.getEtuFile(campagne.getOtfaDir());
final CoeurConfigContrat coeur;
@@ -240,11 +241,11 @@
}
CalculCrueContrat currentRunner;
boolean batch;
-
+
public boolean isBatch() {
return batch;
}
-
+
public void setBatch(boolean batch) {
this.batch = batch;
}
@@ -258,6 +259,9 @@
*/
private CrueOperationResult<EMHScenario> launchItem(OtfaCampagne campagne, OtfaCampagneItem item, OtfaCampagneItem ref) {
final CtuluLogGroup logs = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
+ if (item.isEmpty()) {
+ return new CrueOperationResult<>(null, logs.createCleanGroup());
+ }
// Chargement du projet.
final File etuFile = item.getEtuFile(campagne.getOtfaDir());
@@ -273,10 +277,10 @@
if (projetResult.getResult() == null || stoppedAskedByUser()) {
return new CrueOperationResult<EMHScenario>(null, logs.createCleanGroup());
}
-
+
EMHProjet projet = projetResult.getResult();
EMHProjetController controller = new EMHProjetController(projet, user);
-
+
ManagerEMHScenario managerScenario = projet.getScenario(item.getScenarioNom());
// Conversion
if (ref != null) {
@@ -286,12 +290,12 @@
final CrueOperationResult<EMHScenarioContainer> conversionResult = controller.convertScenario(ref.getScenarioNom(), infos,
ref.getEtuFile(
campagne.getOtfaDir()));
-
+
logs.addGroup(conversionResult.getLogs().createCleanGroup());
EMHProjetController.writeProjet(etuFile, projet, logs, user);
projetResult = this.loadProjet(etuFile, getCoeurForItem(campagne, item));
final CtuluLogGroup cleanLogGroup = projetResult.getLogs().createCleanGroup();
-
+
logs.addGroup(cleanLogGroup);
if (projetResult.getResult() == null || cleanLogGroup.containsFatalError()) {
return new CrueOperationResult<EMHScenario>(null, (CtuluLog) null);
@@ -305,7 +309,7 @@
logs.createNewLog("otfa.scenarioNotFound").addError("otfa.scenarionNotFound.detail", item.getScenarioNom());
return new CrueOperationResult<EMHScenario>(null, logs.createCleanGroup());
}
-
+
if (item.isLaunchCompute()) {
// Création du run et sauvegarde dans l'étude
//pour créer le runs on utilise des options sans run afin de forcer le lancement complet des calculs.
@@ -331,7 +335,7 @@
}
}
ScenarioLoader loader = new ScenarioLoader(managerScenario, projet, projet.getCoeurConfig());
-
+
ScenarioLoaderOperation load = loader.load(managerScenario.getRunCourant());//on charge le run courant:
logs.addGroup(load.getLogs().createCleanGroup());
@@ -361,14 +365,14 @@
}
}
}
-
+
return new CrueOperationResult<EMHScenario>(emhScenario, logs.createCleanGroup());
}
-
+
private CrueOperationResult<EMHProjet> loadProjet(File etuFile, CoeurConfigContrat version) {
return EMHProjetController.readProjet(etuFile, version);
}
-
+
public void deleteRuns(OtfaCampagne in, boolean reference, boolean cible, CtuluLogGroup logs) {
//rien a faire:
if (!reference && !cible) {
@@ -390,7 +394,7 @@
}
}
}
-
+
private void deleteRuns(File referenceFile, String scenarioNom, OtfaCampagne campagne,
OtfaCampagneItem item, CtuluLogGroup logs) {
CrueOperationResult<EMHProjet> projetResult = this.loadProjet(referenceFile, getCoeurForItem(campagne, item));
@@ -425,9 +429,9 @@
}
controller.saveProjet(referenceFile, logs);
}
-
+
}
-
+
}
private volatile boolean stoppedByUser;
@@ -440,7 +444,7 @@
currentRunner.stop();
}
}
-
+
private boolean stoppedAskedByUser() {
return Thread.currentThread().isInterrupted() || stoppedByUser;
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java 2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java 2014-02-14 21:12:43 UTC (rev 8623)
@@ -112,7 +112,7 @@
line.setIndice(1);
line.setCommentaire("Commentaire de la LigneCampagne ");
-
+ line.setLancerComparaison(true);
OtfaCampagneItem item = new OtfaCampagneItem();
// /v10.1 est un path absolu:
item.setEtuPath("/v10.1/Etu3-0");
@@ -139,7 +139,7 @@
line.setIndice(2);
line.setCommentaire("Commentaire de la LigneCampagne ");
-
+ line.setLancerComparaison(false);
OtfaCampagneItem item = new OtfaCampagneItem();
item.setEtuPath("/v10.1/Etu3-0");
Modified: trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml 2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml 2014-02-14 21:12:43 UTC (rev 8623)
@@ -40,6 +40,7 @@
</LigneCampagne>
<LigneCampagne Numero="2">
<Commentaire>Commentaire de la LigneCampagne </Commentaire>
+ <LancerComparaison>False</LancerComparaison>
<Reference>
<Etude>/v10.1/Etu3-0</Etude>
<Scenario>Sc_M3-0_c9c10</Scenario>
Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java 2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java 2014-02-14 21:12:43 UTC (rev 8623)
@@ -45,7 +45,7 @@
@Test
public void testSc_M41_c9c9() {
IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M4-1_c9", "Sc_M4-1_c9c9", "M4-1_c9c9", true, 0);
- IntegrationHelper.testScenario(projet, "Sc_M4-1_c9c9", new ErrorBilanTester(0, 0, 6, 2));
+ IntegrationHelper.testScenario(projet, "Sc_M4-1_c9c9", new ErrorBilanTester(0, 0, 5, 2));
}
@Test
@@ -58,13 +58,13 @@
public void testSc_M41_c10c9() {
IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M4-1_c10", "Sc_M4-1_c10c9", "M4-1_c10c9",
Arrays.asList("COM5", "COM1", "COM3", "PNUM1", "OPTR1"));
- IntegrationHelper.testScenario(projet, "Sc_M4-1_c10c9", new ErrorBilanTester(0, 0, 6, 2));
+ IntegrationHelper.testScenario(projet, "Sc_M4-1_c10c9", new ErrorBilanTester(0, 0, 5, 2));
}
@Test
public void testSc_M41_c10c10() {
IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M4-1_c10", "Sc_M4-1_c10c10", "M4-1_c10c10", true, 0);
- IntegrationHelper.testScenario(projet, "Sc_M4-1_c10c10", new ErrorBilanTester(0, 0, 5, 2));
+ IntegrationHelper.testScenario(projet, "Sc_M4-1_c10c10", new ErrorBilanTester(0, 0, 4, 2));
}
@Test
@@ -73,17 +73,17 @@
"COM5", "OCAL4",
"OPTI6", "OPTG4",
"OPTR1"));// différences
- IntegrationHelper.testScenario(projet, "Sc_M4-1_c9c10", new ErrorBilanTester(0, 0, 5, 2));
+ IntegrationHelper.testScenario(projet, "Sc_M4-1_c9c10", new ErrorBilanTester(0, 0, 4, 2));
}
@Test
public void testSc_M41_c9() {
- IntegrationHelper.testScenario(projet, "Sc_M4-1_c9", new ErrorBilanTester(0, 0, 6, 2));
+ IntegrationHelper.testScenario(projet, "Sc_M4-1_c9", new ErrorBilanTester(0, 0, 5, 2));
}
@Test
public void testSc_M41_c10() {
- IntegrationHelper.testScenario(projet, "Sc_M4-1_c10", new ErrorBilanTester(0, 0, 5, 2));
+ IntegrationHelper.testScenario(projet, "Sc_M4-1_c10", new ErrorBilanTester(0, 0, 4, 2));
}
private File getEtuFile() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
