Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8342] trunk/soft/fudaa-crue/crue-otfa/src
|
From: <de...@us...> - 2013-03-20 07:43:59
|
Revision: 8342
http://fudaa.svn.sourceforge.net/fudaa/?rev=8342&view=rev
Author: deniger
Date: 2013-03-20 07:43:51 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java
trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/log/
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -31,8 +31,8 @@
return metier;
}
- private static RTFALine convertDaoToMetierLine(LigneRTFA dao, CtuluLog analyser) {
- RTFALine metier = new RTFALine();
+ private static RTFAResultLine convertDaoToMetierLine(LigneRTFA dao, CtuluLog analyser) {
+ RTFAResultLine metier = new RTFAResultLine();
metier.setInitialLine(CrueConverterCommonParameter.convertCampagneLineDaoToMetier(dao.LigneCampagne));
metier.setNbDifferences(dao.nbDifferences);
@@ -52,7 +52,7 @@
}
}
- private static LigneRTFA convertMetierToDaoLine(RTFALine metier, CtuluLog analyser) {
+ private static LigneRTFA convertMetierToDaoLine(RTFAResultLine metier, CtuluLog analyser) {
LigneRTFA dao = new LigneRTFA();
dao.LigneCampagne = CrueConverterCommonParameter.convertCampagneLineMetierToDao(metier.getInitialLine());
@@ -71,7 +71,7 @@
public RTFALines convertDaoToMetier(CrueDaoRTFA dao, CrueData dataLinked, CtuluLog analyser) {
RTFALines metier = new RTFALines();
metier.setHeader(convertDaoToMetierHeader(dao, analyser));
- final List<RTFALine> lines = new ArrayList<RTFALine>();
+ final List<RTFAResultLine> lines = new ArrayList<RTFAResultLine>();
for (LigneRTFA ligne : dao.Lignes) {
lines.add(convertDaoToMetierLine(ligne, analyser));
@@ -99,7 +99,7 @@
convertMetierToDaoHeader(dao, metier, analyser);
dao.Lignes = new ArrayList<CrueDaoStructureRTFA.LigneRTFA>();
- for (RTFALine line : metier.getLines()) {
+ for (RTFAResultLine line : metier.getLines()) {
dao.Lignes.add(convertMetierToDaoLine(line, analyser));
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -19,7 +19,7 @@
private OtfaCampagneResultHeader header = new OtfaCampagneResultHeader();
private boolean batch;
- private List<RTFALine> lines = new ArrayList<RTFALine>();
+ private List<RTFAResultLine> lines = new ArrayList<RTFAResultLine>();
/**
* @return the globalValidation
@@ -36,17 +36,17 @@
return line.getIndice() + ".ctfa-line.xml";
}
- public List<RTFALine> getLines() {
+ public List<RTFAResultLine> getLines() {
return Collections.unmodifiableList(lines);
}
- public void addLines(Collection<RTFALine> lines) {
+ public void addLines(Collection<RTFAResultLine> lines) {
if (lines != null) {
this.lines.addAll(lines);
}
}
- public void addLine(RTFALine line) {
+ public void addLine(RTFAResultLine line) {
if (line != null) {
this.lines.add(line);
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -144,7 +144,7 @@
}
public void addResult(OtfaCampagneLineResult launch) {
- RTFALine line = new RTFALine();
+ RTFAResultLine line = new RTFAResultLine();
line.setInitialLine(launch.getInitialLine());
final CtuluLogGroup logs = launch.getLogs();
line.setNbSevereError(logs.getNbOccurence(CtuluLogLevel.SEVERE));
Copied: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java (from rev 8337, trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -0,0 +1,122 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.io.rtfa;
+
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class RTFAResultLine {
+
+ private OtfaCampagneLine initialLine;
+ private int nbDifferences = -1;
+ private int nbSevereError;
+ private int nbError;
+ private int nbWarn;
+ private int nbInfo;
+
+ public RTFAResultLine() {
+ }
+
+ public RTFAResultLine(OtfaCampagneLine initialLine) {
+ this.initialLine = initialLine;
+ }
+
+ public OtfaCampagneLine getInitialLine() {
+ return initialLine;
+ }
+
+ public void setInitialLine(OtfaCampagneLine initialLine) {
+ this.initialLine = initialLine;
+ }
+
+ public int getNbDifferences() {
+ return nbDifferences;
+ }
+
+ public void setNbDifferences(int nbDifferences) {
+ this.nbDifferences = nbDifferences;
+ }
+
+ public int getNbSevereError() {
+ return nbSevereError;
+ }
+
+ public boolean isSameCount(RTFAResultLine other) {
+ if (other == null) {
+ return false;
+ }
+ return nbDifferences == other.nbDifferences
+ && nbSevereError == other.nbSevereError
+ && nbError == other.nbError
+ && nbWarn == other.nbWarn
+ && nbInfo == other.nbInfo;
+ }
+
+ public void setNbSevereError(int nbSevereError) {
+ this.nbSevereError = nbSevereError;
+ }
+
+ public int getNbError() {
+ return nbError;
+ }
+
+ public void setNbError(int nbError) {
+ this.nbError = nbError;
+ }
+
+ public boolean containsErrorOrSevereError() {
+ return nbError > 0 || nbSevereError > 0;
+ }
+
+ public boolean containsWarning() {
+ return nbWarn > 0;
+ }
+
+ public int getNbWarn() {
+ return nbWarn;
+ }
+
+ public void setNbWarn(int nbWarn) {
+ this.nbWarn = nbWarn;
+ }
+
+ public int getNbInfo() {
+ return nbInfo;
+ }
+
+ public void setNbInfo(int nbInfo) {
+ this.nbInfo = nbInfo;
+ }
+
+ public boolean hasLog() {
+ return nbSevereError > 0 || nbError > 0 || nbWarn > 0 || nbInfo > 0;
+ }
+
+ public boolean hasDifferences() {
+ return nbDifferences > 0;
+ }
+
+ public void initForm(RTFAResultLine result) {
+ if (result == null) {
+ return;
+ }
+ initialLine = new OtfaCampagneLine(result.getInitialLine());
+ nbDifferences = result.nbDifferences;
+ nbSevereError = result.nbSevereError;
+ nbError = result.nbError;
+ nbWarn = result.nbWarn;
+ nbInfo = result.nbInfo;
+ }
+
+ public int getNbLogs() {
+ return nbSevereError + nbError + nbWarn + nbInfo;
+ }
+
+ public boolean hasComparaison() {
+ return nbDifferences >= 0;
+ }
+}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -19,7 +19,7 @@
import org.fudaa.dodico.crue.io.AbstractIOTestCase;
import org.fudaa.dodico.crue.io.log.CrueLOGTest;
import org.fudaa.dodico.crue.io.rtfa.CrueRTFAReaderWriter;
-import org.fudaa.dodico.crue.io.rtfa.RTFALine;
+import org.fudaa.dodico.crue.io.rtfa.RTFAResultLine;
import org.fudaa.dodico.crue.io.rtfa.RTFALines;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneResultHeader;
import org.joda.time.LocalDateTime;
@@ -42,7 +42,7 @@
}
public static void assertCorrect(RTFALines compPart) {
- final List<RTFALine> lines = compPart.getLines();
+ final List<RTFAResultLine> lines = compPart.getLines();
assertHeaderCorrect(compPart.getHeader());
assertEquals(2, lines.size());
@@ -50,16 +50,16 @@
assertCorrectCompPartLine2(lines.get(1));
}
- public static void assertCorrectCompPartLine1(RTFALine line) {
+ public static void assertCorrectCompPartLine1(RTFAResultLine line) {
- RTFALine initLine1 = createResultCompPartLine1();
+ RTFAResultLine initLine1 = createResultCompPartLine1();
assertTrue(line.getInitialLine().equals(initLine1.getInitialLine()));
assertTrue(initLine1.isSameCount(line));
}
- public static void assertCorrectCompPartLine2(RTFALine line) {
+ public static void assertCorrectCompPartLine2(RTFAResultLine line) {
- RTFALine initLine2 = createResultCompPartLine2();
+ RTFAResultLine initLine2 = createResultCompPartLine2();
assertTrue(line.getInitialLine().equals(initLine2.getInitialLine()));
assertTrue(initLine2.isSameCount(line));
}
@@ -149,8 +149,8 @@
return part;
}
- public static List<RTFALine> createResultLogsCompLines() {
- final List<RTFALine> lines = new ArrayList<RTFALine>();
+ public static List<RTFAResultLine> createResultLogsCompLines() {
+ final List<RTFAResultLine> lines = new ArrayList<RTFAResultLine>();
lines.add(createResultCompPartLine1());
lines.add(createResultCompPartLine2());
@@ -158,8 +158,8 @@
return lines;
}
- public static RTFALine createResultCompPartLine1() {
- final RTFALine line = new RTFALine();
+ public static RTFAResultLine createResultCompPartLine1() {
+ final RTFAResultLine line = new RTFAResultLine();
line.setInitialLine(TestOtfaCampagneLineCreator.createCampagneLine1());
line.setNbDifferences(10);
line.setNbSevereError(9);
@@ -169,8 +169,8 @@
return line;
}
- public static RTFALine createResultCompPartLine2() {
- final RTFALine line = new RTFALine();
+ public static RTFAResultLine createResultCompPartLine2() {
+ final RTFAResultLine line = new RTFAResultLine();
line.setInitialLine(TestOtfaCampagneLineCreator.createCampagneLine2());
line.setNbDifferences(5);
line.setNbSevereError(4);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
