[Fudaa-svn-commit] SF.net SVN: fudaa:[8292] trunk/soft/fudaa-crue/ui-report/src

[<de...@us...>]

Revision: 8292
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8292&view=rev
Author:   deniger
Date:     2013-02-22 07:33:37 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
correction tests unitaires

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportService.java
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/FormuleContentServiceUpdaterTest.java
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java

Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/AbstracTestWithScenarioTest.java

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportService.java	2013-02-21 22:02:30 UTC (rev 8291)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportService.java	2013-02-22 07:33:37 UTC (rev 8292)
@@ -34,7 +34,6 @@
   private final Result<EMHScenario> resultat;
   protected InstanceContent dynamicContent = new InstanceContent();
   protected Lookup lookup = new AbstractLookup(dynamicContent);
-  
   private ReportTimeFormatter reportTimeFormatter;
   private final ReportRunKey currentRunKey = new ReportRunKey();
 
@@ -90,6 +89,7 @@
   public void unloadCurrentRun() {
     ReportRunContent run = getRunCourant();
     if (run != null) {
+      new Throwable().printStackTrace();
       postRunService.unloadRun();
       dynamicContent.remove(run);
       ModeleResultatTimeKeyContent timeContent = getTimeContent();

Copied: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/AbstracTestWithScenarioTest.java (from rev 8289, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/AbstracTestWithScenarioTest.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/AbstracTestWithScenarioTest.java	2013-02-22 07:33:37 UTC (rev 8292)
@@ -0,0 +1,33 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.report;
+
+import java.io.File;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.fudaa.crue.report.service.ReportService;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.openide.util.Lookup;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public abstract class AbstracTestWithScenarioTest {
+
+  static File toDelete;
+  static ReportService reportService = Lookup.getDefault().lookup(ReportService.class);
+
+  @BeforeClass
+  public static void beforeTest() {
+    if (!reportService.isRunLoaded()) {
+      toDelete = ReportTestHelper.readScenario().second;
+    }
+  }
+
+  @AfterClass
+  public static void afterTest() {
+    CtuluLibFile.deleteDir(toDelete);
+  }
+}

Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/FormuleContentServiceUpdaterTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/FormuleContentServiceUpdaterTest.java	2013-02-21 22:02:30 UTC (rev 8291)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/FormuleContentServiceUpdaterTest.java	2013-02-22 07:33:37 UTC (rev 8292)
@@ -3,40 +3,24 @@
  */
 package org.fudaa.fudaa.crue.report.formule;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.fudaa.ctulu.CtuluLibFile;
 import org.fudaa.ctulu.CtuluLogGroupResult;
 import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
-import org.fudaa.fudaa.crue.report.ReportTestHelper;
-import org.junit.AfterClass;
+import org.fudaa.fudaa.crue.report.AbstracTestWithScenarioTest;
 import org.junit.Test;
 import static org.junit.Assert.*;
-import org.junit.BeforeClass;
 
 /**
  *
  * @author Frederic Deniger
  */
-public class FormuleContentServiceUpdaterTest {
+public class FormuleContentServiceUpdaterTest extends AbstracTestWithScenarioTest {
 
   public FormuleContentServiceUpdaterTest() {
   }
-  static File toDelete;
 
-  @BeforeClass
-  public static void beforeTest() {
-    System.setProperty("test", "true");
-    toDelete = ReportTestHelper.readScenario().second;
-  }
-
-  @AfterClass
-  public static void afterTest() {
-    CtuluLibFile.deleteDir(toDelete);
-  }
-
   @Test
   public void testComputeChanges() {
 

Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java	2013-02-21 22:02:30 UTC (rev 8291)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java	2013-02-22 07:33:37 UTC (rev 8292)
@@ -3,14 +3,12 @@
  */
 package org.fudaa.fudaa.crue.report.formule;
 
-import java.io.File;
 import java.util.Arrays;
 import java.util.Collection;
-import org.fudaa.ctulu.CtuluLibFile;
 import org.fudaa.ctulu.CtuluLog;
 import org.fudaa.ctulu.CtuluLogRecord;
 import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
-import org.fudaa.fudaa.crue.report.ReportTestHelper;
+import org.fudaa.fudaa.crue.report.AbstracTestWithScenarioTest;
 import org.fudaa.fudaa.crue.report.data.ReportRunKey;
 import org.fudaa.fudaa.crue.report.data.ReportRunVariableKey;
 import org.fudaa.fudaa.crue.report.data.ReportVariableTypeEnum;
@@ -18,32 +16,19 @@
 import org.fudaa.fudaa.crue.report.formule.function.FunctionMaxSurT;
 import org.fudaa.fudaa.crue.report.service.RangeSelectedTimeKey;
 import org.fudaa.fudaa.crue.report.service.ReportService;
-import org.junit.AfterClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
-import org.junit.BeforeClass;
 import org.openide.util.Lookup;
 
 /**
  *
  * @author Frederic Deniger
  */
-public class VariableContentFormuleTest {
+public class VariableContentFormuleTest extends AbstracTestWithScenarioTest{
 
   public VariableContentFormuleTest() {
   }
-  static File toDelete;
 
-  @BeforeClass
-  public static void beforeTest() {
-    toDelete = ReportTestHelper.readScenario().second;
-  }
-
-  @AfterClass
-  public static void afterTest() {
-    CtuluLibFile.deleteDir(toDelete);
-  }
-
   @Test
   public void testGoodFormula() {
     FormuleParametersExpr params = new FormuleParametersExpr();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.