Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[7821] trunk/soft/fudaa-mascaret/server/src

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7821
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7821&view=rev
Author:   deniger
Date:     2012-10-29 13:49:58 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
premier support XML

Added Paths:
-----------
    trunk/soft/fudaa-mascaret/server/src/test/
    trunk/soft/fudaa-mascaret/server/src/test/java/
    trunk/soft/fudaa-mascaret/server/src/test/java/org/
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/conv/
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/conv/ConvH1D_MascTest.java
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1dTest.java
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/AbstractMascaretTestCase.java
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriterTest.java

Added: trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/conv/ConvH1D_MascTest.java
===================================================================

--- trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/conv/ConvH1D_MascTest.java	                        (rev 0)
+++ trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/conv/ConvH1D_MascTest.java	2012-10-29 13:49:58 UTC (rev 7821)
@@ -0,0 +1,30 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.hydraulique1d.conv;
+
+import java.io.File;
+import java.io.IOException;
+import org.fudaa.dodico.corba.mascaret.SParametresCAS;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1dTest;
+import org.fudaa.dodico.mascaret.AbstractMascaretTestCase;
+
+/**
+ * Debut de test pour la conversion h1d -> mascaret
+ *
+ * @author Frederic Deniger
+ */
+public class ConvH1D_MascTest extends AbstractMascaretTestCase {
+
+  /**
+   *
+   * @throws IOException
+   */
+  public void testConvert() throws IOException {
+    File mascFile = getMascFile(EX_MODMASC);
+    MetierEtude1d etude1d = MetierEtude1dTest.readZipFile(mascFile);
+    SParametresCAS convertirParametresCas = ConvH1D_Masc.convertirParametresCas(true, etude1d, 0);
+    assertEquals("mascaret0.cas", convertirParametresCas.parametresGen.fichMotsCles);
+  }
+}

Added: trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1dTest.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1dTest.java	                        (rev 0)
+++ trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1dTest.java	2012-10-29 13:49:58 UTC (rev 7821)
@@ -0,0 +1,101 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.hydraulique1d.metier;
+
+import org.fudaa.dodico.mascaret.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class MetierEtude1dTest extends AbstractMascaretTestCase {
+
+  public MetierEtude1dTest() {
+  }
+
+  public void testReadEtude1dPermanent1Bief1Apport() throws IOException {
+    File mascFile = getMascFile(PERMANENT1_BIEF1_APPORTMASC);
+    assertTrue(mascFile.exists());
+    MetierEtude1d metier1d = readZipFile(mascFile);
+    assertNotNull(metier1d);
+  }
+
+  public void testReadEtude1dExMod() throws IOException {
+    File mascFile = getMascFile(EX_MODMASC);
+    assertTrue(mascFile.exists());
+    MetierEtude1d metier1d = readZipFile(mascFile);
+    assertNotNull(metier1d);
+  }
+
+  public void testReadEtude1dNonPermanent3Biefs2CasierSings() throws IOException {
+    File mascFile = getMascFile(NON_PERMANENT3_BIEFS2_CASIER_SINGSMASC);
+    assertTrue(mascFile.exists());
+    MetierEtude1d metier1d = readZipFile(mascFile);
+    assertNotNull(metier1d);
+  }
+
+  public void testReadEtude1dNonPermanent3Biefs3Casier() throws IOException {
+    File mascFile = getMascFile(NON_PERMANENT3_BIEFS3_CASIERMASC);
+    assertTrue(mascFile.exists());
+    MetierEtude1d metier1d = readZipFile(mascFile);
+    assertNotNull(metier1d);
+  }
+
+  public void testReadEtude1dQualiteeEauAvecSeuil() throws IOException {
+    File mascFile = getMascFile(QUALITEE_EAU_AVEC_SEUILMASC);
+    assertTrue(mascFile.exists());
+    MetierEtude1d metier1d = readZipFile(mascFile);
+    assertNotNull(metier1d);
+  }
+
+  public void testReadEtude1dOndeSub7biefs3seuils() throws IOException {
+    File mascFile = getMascFile(ONDE_SUB7BIEFS3SEUILSMASC);
+    assertTrue(mascFile.exists());
+    MetierEtude1d metier1d = readZipFile(mascFile);
+    assertNotNull(metier1d);
+  }
+
+  /**
+   * Copied from org.fudaa.fudaa.hydraulique1d.Hydraulique1dProjet.
+   *
+   * @param fichier
+   * @return
+   */
+  public static MetierEtude1d readZipFile(File fichier) {
+    ZipFile zf = null;
+    MetierEtude1d res = null;
+    try {
+      zf = new ZipFile(fichier);
+      ZipEntry entry;
+      entry = zf.getEntry("etude1d.xml");
+
+      //On recupere la version de l'etude
+      byte[] b = new byte[1000];
+      zf.getInputStream(entry).read(b);
+      String DebutEtude = new String(b);
+      int indexVersion = DebutEtude.indexOf("<single type=\"String\">");
+      String versionEtude = DebutEtude.substring(indexVersion + 22, indexVersion + 25);
+
+      System.err.println("version de l'Etude lu " + versionEtude);
+      res = new MetierEtude1d().readFrom(zf.getInputStream(entry), false, versionEtude);
+    } catch (Exception ex) {
+      Logger.getLogger(MetierEtude1dTest.class.getName()).log(Level.SEVERE, "message {0}", ex);
+    } finally {
+      if (zf != null) {
+        try {
+          zf.close();
+        } catch (IOException ex) {
+          Logger.getLogger(MetierEtude1dTest.class.getName()).log(Level.SEVERE, null, ex);
+        }
+      }
+    }
+    return res;
+  }
+}

Added: trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/AbstractMascaretTestCase.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/AbstractMascaretTestCase.java	                        (rev 0)
+++ trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/AbstractMascaretTestCase.java	2012-10-29 13:49:58 UTC (rev 7821)
@@ -0,0 +1,49 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.mascaret;
+
+import java.io.File;
+import java.io.IOException;
+import junit.framework.TestCase;
+import org.fudaa.ctulu.CtuluLibFile;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class AbstractMascaretTestCase extends TestCase {
+
+  private static File tempFile;
+  public static final String EX_MODMASC = "ExMod.masc";
+  public static final String NON_PERMANENT3_BIEFS2_CASIER_SINGSMASC = "NonPermanent3Biefs2CasierSings.masc";
+  public static final String NON_PERMANENT3_BIEFS3_CASIERMASC = "NonPermanent3Biefs3Casier.masc";
+  public static final String ONDE_SUB7BIEFS3SEUILSMASC = "ondeSub7biefs3seuils.masc";
+  public static final String PERMANENT1_BIEF1_APPORTMASC = "permanent1Bief1Apport.masc";
+  public static final String QUALITEE_EAU_AVEC_SEUILMASC = "QualiteeEauAvecSeuil.masc";
+
+  public AbstractMascaretTestCase() {
+  }
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    tempFile = CtuluLibFile.createTempDir();
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    super.tearDown();
+    CtuluLibFile.deleteDir(tempFile);
+  }
+
+  protected File getMascFile(String filename) throws IOException {
+    final String extension = ".masc";
+    File target = createTempFile(extension);
+    return CtuluLibFile.getFileFromJar("/masc/" + filename, target);
+  }
+
+  protected File createTempFile(final String extension) throws IOException {
+    return File.createTempFile("test", extension, tempFile);
+  }
+}

Added: trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriterTest.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriterTest.java	                        (rev 0)
+++ trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriterTest.java	2012-10-29 13:49:58 UTC (rev 7821)
@@ -0,0 +1,75 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.mascaret;
+
+import com.thoughtworks.xstream.XStream;
+import java.io.File;
+import java.io.IOException;
+import org.fudaa.ctulu.CtuluIOResult;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.corba.mascaret.SParametresCAS;
+import org.fudaa.dodico.hydraulique1d.conv.ConvH1D_Masc;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class EdamoxXmlReaderWriterTest extends AbstractMascaretTestCase {
+
+  public void testWriteExMod() throws IOException {
+    testWrite(getMascFile(EX_MODMASC));
+  }
+
+  public void testWriteOndeSub7biefs3seuils() throws IOException {
+    testWrite(getMascFile(ONDE_SUB7BIEFS3SEUILSMASC));
+  }
+
+  public void testWriteNonPermanent3Biefs2CasierSings() throws IOException {
+    testWrite(getMascFile(NON_PERMANENT3_BIEFS2_CASIER_SINGSMASC));
+  }
+
+  public void testWriteNonPermanent3Biefs3Casier() throws IOException {
+    testWrite(getMascFile(NON_PERMANENT3_BIEFS3_CASIERMASC));
+  }
+
+  public void testWritePermanent1Bief1Apport() throws IOException {
+    testWrite(getMascFile(PERMANENT1_BIEF1_APPORTMASC));
+  }
+
+  public void testWriteQualiteeEauAvecSeuil() throws IOException {
+    testWrite(getMascFile(QUALITEE_EAU_AVEC_SEUILMASC));
+  }
+
+  /**
+   * It's not an optimal solution but it works for tests...
+   *
+   * @param cas1
+   * @param cas2
+   * @return
+   */
+  public boolean compare(SParametresCAS cas1, SParametresCAS cas2) {
+    XStream xstream = new XStream();
+//    cas2.parametresGen.code=3;
+    String cas1ToXml = xstream.toXML(cas1);
+    String cas2ToXml = xstream.toXML(cas2);
+    return cas1ToXml.equals(cas2ToXml);
+
+  }
+
+  private void testWrite(File f) throws IOException {
+    MetierEtude1d etude1d = org.fudaa.dodico.hydraulique1d.metier.MetierEtude1dTest.readZipFile(f);
+    SParametresCAS initContent = ConvH1D_Masc.convertirParametresCas(true, etude1d, "essai");
+//    File target = createTempFile(".xml");
+    File target = new File("C:\\data\\tmp\\toto.xmas");
+    EdamoxXmlReaderWriter xmlWriter = new EdamoxXmlReaderWriter("1.0", "masc");
+    EdamoxXMLContent content = new EdamoxXMLContent(initContent);
+    CtuluLog writeXML = xmlWriter.writeXML(content, target);
+    assertTrue(writeXML.isEmpty());
+    CtuluIOResult<EdamoxXMLContent> readXML = xmlWriter.readXML(target);
+    assertTrue(readXML.getAnalyze().isEmpty());
+    EdamoxXMLContent readContent = readXML.getSource();
+    assertTrue(compare(initContent, readContent.getParametresCas()));
+  }
+}

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





Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[7821] trunk/soft/fudaa-mascaret/server/src

https://gitlab.com/fudaa

fudaa-svn-commit