Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8652] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2014-03-04 23:30:40
|
Revision: 8652
http://sourceforge.net/p/fudaa/svn/8652
Author: deniger
Date: 2014-03-04 23:30:37 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
CRUE-617
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-project/pom.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/IndexSaverTest.java
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/ReportViewLineInfoTest.java
trunk/soft/fudaa-crue/crue-project/src/test/resources/org/
trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/
trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/
trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/
trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/
trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/report/
trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/report/index.xml
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfoTest.java
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/IndexSaverTest.java
Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml 2014-03-04 23:30:10 UTC (rev 8651)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml 2014-03-04 23:30:37 UTC (rev 8652)
@@ -49,6 +49,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-api-progress</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
Copied: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/IndexSaverTest.java (from rev 8645, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/IndexSaverTest.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/IndexSaverTest.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/IndexSaverTest.java 2014-03-04 23:30:37 UTC (rev 8652)
@@ -0,0 +1,62 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.projet.report;
+
+import java.io.File;
+import java.util.List;
+import org.fudaa.dodico.crue.common.transformer.DateDurationConverter;
+import org.fudaa.dodico.crue.io.AbstractIOTestCase;
+import org.fudaa.dodico.crue.common.io.CrueIOResu;
+import org.fudaa.dodico.crue.test.FileTest;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class IndexSaverTest extends FileTest {
+
+ private String auteurCreation = "AuteurCreation";
+ private String auteurDerniereModif = "AuteurDerniereModif";
+
+ public IndexSaverTest() {
+ }
+
+ @Test
+ public void testRead() {
+ File file = AbstractIOTestCase.getFile("/org/fudaa/dodico/crue/projet/report/index.xml");
+ assertTrue(file.exists());
+ ReportIndexReader saver = new ReportIndexReader();
+ CrueIOResu<List<ReportViewLineInfo>> read = saver.read(file);
+ List<ReportViewLineInfo> metier = read.getMetier();
+ testResult(metier,
+ DateDurationConverter.getDate("2012-10-09T12:02:23.853").toDateTime().getMillis(),
+ DateDurationConverter.getDate("2012-10-09T12:02:33.853").toDateTime().getMillis(), "fileName 1", "fileName 2");
+ file.delete();
+
+ }
+
+ private void testGeneralInfos(final ReportViewLineInfo line, final long creationDate, final long modificationDate) {
+ assertEquals(auteurCreation, line.getAuteurCreation());
+ assertEquals(auteurDerniereModif, line.getAuteurDerniereModif());
+ assertEquals(creationDate, line.getDateCreation().toDateTime().getMillis());
+ assertEquals(modificationDate, line.getDateDerniereModif().toDateTime().getMillis());
+ }
+
+ private void testResult(List<ReportViewLineInfo> metier, final long creationDate, final long modificationDate, final String fileNameOne,
+ final String fileNameTwo) {
+ assertEquals(2, metier.size());
+ ReportViewLineInfo line = metier.get(0);
+ assertEquals("Vue 1", line.getNom());
+ assertEquals(fileNameOne, line.getFilename());
+ assertEquals(fileNameOne, line.getCommentaire());
+ testGeneralInfos(line, creationDate, modificationDate);
+ line = metier.get(1);
+ assertEquals("Vue 2", line.getNom());
+ assertEquals(fileNameTwo, line.getFilename());
+ assertEquals(fileNameTwo, line.getCommentaire());
+ testGeneralInfos(line, creationDate, modificationDate);
+ }
+}
Copied: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/ReportViewLineInfoTest.java (from rev 8645, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfoTest.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/ReportViewLineInfoTest.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/ReportViewLineInfoTest.java 2014-03-04 23:30:37 UTC (rev 8652)
@@ -0,0 +1,58 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.projet.report;
+
+import org.fudaa.dodico.crue.common.ConnexionInformationDefault;
+import org.fudaa.dodico.crue.common.ConnexionInformationFixed;
+import org.joda.time.LocalDateTime;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ReportViewLineInfoTest {
+
+ public ReportViewLineInfoTest() {
+ }
+
+ @Test
+ public void testCloned() {
+ ReportViewLineInfo info = new ReportViewLineInfo();
+ info.setCommentaire("commentaire");
+ info.setDateCreation(new LocalDateTime());
+ info.setAuteurCreation("Tester");
+ ReportViewLineInfo cloned = info.clone();
+ assertEquals(info.getCommentaire(), cloned.getCommentaire());
+ assertEquals(info.getDateCreation(), cloned.getDateCreation());
+
+ ConnexionInformationFixed ci = new ConnexionInformationFixed(new ConnexionInformationDefault());
+ info.updateEdited(ci);
+ assertEquals(info.getAuteurDerniereModif(), ci.getCurrentUser());
+ assertEquals(info.getDateDerniereModif(), ci.getCurrentDate());
+ }
+
+ @Test
+ public void testCopy() {
+ ReportViewLineInfo info = new ReportViewLineInfo();
+ info.setCommentaire("commentaire");
+ info.setDateCreation(new LocalDateTime(0));
+ info.setAuteurCreation("Tester");
+ info.setAuteurDerniereModif("modifier");
+ info.setDateDerniereModif(new LocalDateTime(10));
+ info.setFilename("filename");
+
+ ConnexionInformationFixed ci = new ConnexionInformationFixed(new ConnexionInformationDefault());
+ assertNotSame(info.getAuteurCreation(), ci.getCurrentUser());
+ assertNotSame(info.getAuteurDerniereModif(), ci.getCurrentUser());
+ ReportViewLineInfo copy = info.copy(ci);
+ assertEquals(info.getCommentaire(), copy.getCommentaire());
+ assertEquals(ci.getCurrentUser(), copy.getAuteurCreation());
+ assertEquals(ci.getCurrentUser(), copy.getAuteurDerniereModif());
+ assertEquals(ci.getCurrentDate(), copy.getDateCreation());
+ assertEquals(ci.getCurrentDate(), copy.getDateDerniereModif());
+ assertNull(copy.getFilename());
+ }
+}
Added: trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/report/index.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/report/index.xml (rev 0)
+++ trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/report/index.xml 2014-03-04 23:30:37 UTC (rev 8652)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ReportIndex xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/report-index-1.0.xsd">
+ <Commentaire></Commentaire>
+ <Type>longitudinal</Type>
+ <VueConfig>
+ <Nom>Vue 1</Nom>
+ <Commentaire>fileName 1</Commentaire>
+ <Filename>fileName 1</Filename>
+ <AuteurCreation>AuteurCreation</AuteurCreation>
+ <DateCreation>2012-10-09T12:02:23.853</DateCreation>
+ <AuteurDerniereModif>AuteurDerniereModif</AuteurDerniereModif>
+ <DateDerniereModif>2012-10-09T12:02:33.853</DateDerniereModif>
+ </VueConfig>
+ <VueConfig>
+ <Nom>Vue 2</Nom>
+ <Commentaire>fileName 2</Commentaire>
+ <Filename>fileName 2</Filename>
+ <AuteurCreation>AuteurCreation</AuteurCreation>
+ <DateCreation>2012-10-09T12:02:23.853</DateCreation>
+ <AuteurDerniereModif>AuteurDerniereModif</AuteurDerniereModif>
+ <DateDerniereModif>2012-10-09T12:02:33.853</DateDerniereModif>
+ </VueConfig>
+</ReportIndex>
\ No newline at end of file
Deleted: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfoTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfoTest.java 2014-03-04 23:30:10 UTC (rev 8651)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfoTest.java 2014-03-04 23:30:37 UTC (rev 8652)
@@ -1,58 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.fudaa.crue.report.view;
-
-import org.fudaa.dodico.crue.common.ConnexionInformationDefault;
-import org.fudaa.dodico.crue.common.ConnexionInformationFixed;
-import org.joda.time.LocalDateTime;
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class ReportViewLineInfoTest {
-
- public ReportViewLineInfoTest() {
- }
-
- @Test
- public void testCloned() {
- ReportViewLineInfo info = new ReportViewLineInfo();
- info.setCommentaire("commentaire");
- info.setDateCreation(new LocalDateTime());
- info.setAuteurCreation("Tester");
- ReportViewLineInfo cloned = info.clone();
- assertEquals(info.getCommentaire(), cloned.getCommentaire());
- assertEquals(info.getDateCreation(), cloned.getDateCreation());
-
- ConnexionInformationFixed ci = new ConnexionInformationFixed(new ConnexionInformationDefault());
- info.updateEdited(ci);
- assertEquals(info.getAuteurDerniereModif(), ci.getCurrentUser());
- assertEquals(info.getDateDerniereModif(), ci.getCurrentDate());
- }
-
- @Test
- public void testCopy() {
- ReportViewLineInfo info = new ReportViewLineInfo();
- info.setCommentaire("commentaire");
- info.setDateCreation(new LocalDateTime(0));
- info.setAuteurCreation("Tester");
- info.setAuteurDerniereModif("modifier");
- info.setDateDerniereModif(new LocalDateTime(10));
- info.setFilename("filename");
-
- ConnexionInformationFixed ci = new ConnexionInformationFixed(new ConnexionInformationDefault());
- assertNotSame(info.getAuteurCreation(), ci.getCurrentUser());
- assertNotSame(info.getAuteurDerniereModif(), ci.getCurrentUser());
- ReportViewLineInfo copy = info.copy(ci);
- assertEquals(info.getCommentaire(), copy.getCommentaire());
- assertEquals(ci.getCurrentUser(), copy.getAuteurCreation());
- assertEquals(ci.getCurrentUser(), copy.getAuteurDerniereModif());
- assertEquals(ci.getCurrentDate(), copy.getDateCreation());
- assertEquals(ci.getCurrentDate(), copy.getDateDerniereModif());
- assertNull(copy.getFilename());
- }
-}
Deleted: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/IndexSaverTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/IndexSaverTest.java 2014-03-04 23:30:10 UTC (rev 8651)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/IndexSaverTest.java 2014-03-04 23:30:37 UTC (rev 8652)
@@ -1,99 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.fudaa.crue.report.view.persist;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.dodico.crue.common.transformer.DateDurationConverter;
-import org.fudaa.dodico.crue.io.AbstractIOTestCase;
-import org.fudaa.dodico.crue.common.io.CrueIOResu;
-import org.fudaa.fudaa.crue.report.data.ReportContentType;
-import org.fudaa.fudaa.crue.report.view.ReportViewLine;
-import org.fudaa.fudaa.crue.report.view.ReportViewLineInfo;
-import org.joda.time.LocalDateTime;
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class IndexSaverTest extends FileTest {
-
- private String auteurCreation = "AuteurCreation";
- private String auteurDerniereModif = "AuteurDerniereModif";
-
- public IndexSaverTest() {
- }
-
- @Test
- public void testRead() {
- File file = AbstractIOTestCase.getFile("/org/fudaa/fudaa/crue/report/view/persist/index.xml");
- assertTrue(file.exists());
- IndexSaver saver = new IndexSaver();
- CrueIOResu<List<ReportViewLineInfo>> read = saver.read(file);
- List<ReportViewLineInfo> metier = read.getMetier();
- testResult(metier,
- DateDurationConverter.getDate("2012-10-09T12:02:23.853").toDateTime().getMillis(),
- DateDurationConverter.getDate("2012-10-09T12:02:33.853").toDateTime().getMillis(), "fileName 1", "fileName 2");
- file.delete();
-
- }
-
- @Test
- public void testWrite() throws IOException {
- IndexSaver saver = new IndexSaver();
- File target = createTempFile("index", ".xml");
- final long creationDate = System.currentTimeMillis() - 10000;
- final long modificationDate = System.currentTimeMillis();
- final String fileNameOne = "fileName 1";
- final String fileNameTwo = "fileName 2";
- ReportViewLine lineOne = new ReportViewLine(ReportContentType.LONGITUDINAL, createInfo(creationDate, modificationDate, fileNameOne), null, null, null);
- ReportViewLine lineTwo = new ReportViewLine(ReportContentType.LONGITUDINAL, createInfo(creationDate, modificationDate, fileNameTwo), null, null, null);
- lineOne.getInfo().setNom("Vue 1");
- lineTwo.getInfo().setNom("Vue 2");
- CtuluLog save = saver.save(target, Arrays.asList(lineOne, lineTwo), "longitudinal");
-
- assertTrue(save.isEmpty());
- CrueIOResu<List<ReportViewLineInfo>> read = saver.read(target);
- assertTrue(read.getAnalyse().isEmpty());
- List<ReportViewLineInfo> metier = read.getMetier();
- testResult(metier, creationDate, modificationDate, fileNameOne, fileNameTwo);
- }
-
- private ReportViewLineInfo createInfo(final long creationDate, final long modificationDate, final String fileName) {
- ReportViewLineInfo info = new ReportViewLineInfo();
- info.setAuteurCreation(auteurCreation);
- info.setAuteurDerniereModif(auteurDerniereModif);
- info.setDateCreation(new LocalDateTime(creationDate));
- info.setDateDerniereModif(new LocalDateTime(modificationDate));
- info.setFilename(fileName);
- info.setCommentaire(fileName);
- return info;
- }
-
- private void testGeneralInfos(final ReportViewLineInfo line, final long creationDate, final long modificationDate) {
- assertEquals(auteurCreation, line.getAuteurCreation());
- assertEquals(auteurDerniereModif, line.getAuteurDerniereModif());
- assertEquals(creationDate, line.getDateCreation().toDateTime().getMillis());
- assertEquals(modificationDate, line.getDateDerniereModif().toDateTime().getMillis());
- }
-
- private void testResult(List<ReportViewLineInfo> metier, final long creationDate, final long modificationDate, final String fileNameOne, final String fileNameTwo) {
- assertEquals(2, metier.size());
- ReportViewLineInfo line = metier.get(0);
- assertEquals("Vue 1", line.getNom());
- assertEquals(fileNameOne, line.getFilename());
- assertEquals(fileNameOne, line.getCommentaire());
- testGeneralInfos(line, creationDate, modificationDate);
- line = metier.get(1);
- assertEquals("Vue 2", line.getNom());
- assertEquals(fileNameTwo, line.getFilename());
- assertEquals(fileNameTwo, line.getCommentaire());
- testGeneralInfos(line, creationDate, modificationDate);
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
