February 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r915 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 12:58:44 +0000 (Wed, 13 Feb 2008) New Revision: 915 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java Log: revert TODO Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java 2008-02-13 12:57:04 UTC (rev 914) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java 2008-02-13 12:58:44 UTC (rev 915) @@ -71,10 +71,7 @@ // Create a stub, used in init ris = new SimpleRemoteInputStream(bis).export(); } catch (RemoteException e) { - ris = null; - //TODO Error :) - //TODO si on ne traitepas l'exception, on ne connaitra jamais - //TODO Tl'origine de l'erreur + ris = null; } initialized = false;

1 0

r914 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 12:57:04 +0000 (Wed, 13 Feb 2008) New Revision: 914 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java Log: formattage classe : methodes abstraites tout en haut methodes publiques methodes protegees methodes privees Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-13 12:33:36 UTC (rev 913) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-13 12:57:04 UTC (rev 914) @@ -23,7 +23,6 @@ import java.io.PipedInputStream; import java.io.PipedOutputStream; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -53,7 +52,7 @@ public abstract class StorageServiceCommon implements StorageService, XmlConstants { /** The xml attachment. */ - private Attachment xmlAttachment = null; + protected Attachment xmlAttachment = null; /** * Gets the storage engine. @@ -65,18 +64,13 @@ protected abstract StorageEngine getStorageEngine() throws SimExplorerStorageException; /** - * Gets the xML attachment. - * - * @return the xML attachment + * Increment version. + * + * @param version the version + * + * @return the version */ - private Attachment getXMLAttachment() { - if (xmlAttachment == null) { - xmlAttachment = new Attachment(); - xmlAttachment.setDataHash(""); - xmlAttachment.setFileName("entity.xml"); - } - return xmlAttachment; - } + protected abstract Version incrementVersion(Version version); /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getMetadata(java.lang.String, java.lang.String) @@ -172,9 +166,9 @@ * * @param token the token * @param zipStream the zip stream - * + * * @return the meta data - * + * * @throws SimExplorerServiceException the sim explorer service exception */ public MetaData saveElement(String token, SimExplorerServiceStream zipStream) throws SimExplorerServiceException { @@ -234,7 +228,7 @@ * @param token the token * @param xmlFile the xml file * @param attachments the attachments - * + * * @return the meta data * * @throws SimExplorerServiceException the exception @@ -262,14 +256,14 @@ /** * Retrieve element data. - * + * * @param token the token * @param uuid the uuid * @param version the version * @param attachment the attachment - * + * * @return the input stream - * + * * @throws SimExplorerServiceException the sim explorer service exception */ public InputStream retrieveElementData(String token, String uuid, String version, Attachment attachment) @@ -286,13 +280,13 @@ /** * Retrieve element xml common. - * + * * @param token the token * @param uuid the uuid * @param version the version - * + * * @return the input stream - * + * * @throws SimExplorerServiceException the sim explorer service exception */ public InputStream retrieveElementXML(String token, String uuid, String version) throws SimExplorerServiceException { @@ -308,13 +302,13 @@ /** * Retrieve element full. - * + * * @param token the token * @param uuid the uuid * @param version the version - * + * * @return the input stream - * + * * @throws SimExplorerServiceException the sim explorer service exception */ public InputStream retrieveElementFull(String token, String uuid, String version) @@ -348,15 +342,152 @@ } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#update(java.lang.String, java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.Version, fr.cemagref.simexplorer.is.entities.metadata.MetaData) + */ + public void update(String token, String oldUuid, Version oldVersion, MetaData newVersion, boolean deleteOldElement) + throws SimExplorerServiceException { + Map<Attachment, InputStream> attachments = new HashMap<Attachment, InputStream>(); + try { + MetaData oldMetaData = getStorageEngine().getMetadata(token, oldUuid, oldVersion); + + InputStream oldXml = getStorageEngine().retrieveData(token, oldMetaData, getXMLAttachment()); + + MetaDataFactory<MetaData> mdeFactory = MetaDataFactory.getFactory(MetaData.class); + InputStream newXml = mdeFactory.replaceElementInParentXML(oldXml, newVersion); + + attachments.put(getXMLAttachment(), newXml); + + List<Attachment> realAttachments = oldMetaData.getAttachments(); + for (Attachment attachment : realAttachments) { + attachments.put(attachment, getStorageEngine().retrieveData(token, oldMetaData, attachment)); + } + + if (deleteOldElement) { + getStorageEngine().deleteElement(token, oldUuid, oldVersion); + } + getStorageEngine().saveElement(token, newVersion, attachments); + getStorageEngine().commit(); + } catch (Exception e) { + throw new SimExplorerServiceException(e); + } + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) + */ + public Version[] getVersions(String token, String uuid) throws SimExplorerServiceException { + try { + Set<MetaData> versions = getStorageEngine().getElementVersions(token, uuid); + Version[] result = new Version[versions.size()]; + int i = 0; + for (MetaData metaData : versions) { + result[i] = metaData.getVersion(); + i++; + } + return result; + } catch (SimExplorerStorageException e) { + throw new SimExplorerServiceException(e); + } + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String, java.lang.String) + */ + public void deleteElement(String token, String uuid, String version) throws SimExplorerServiceException { + try { + getStorageEngine().deleteElement(token, uuid, new Version(version)); + getStorageEngine().commit(); + } catch (SimExplorerStorageException e) { + throw new SimExplorerServiceException(e); + } + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String) + */ + public void deleteElement(String token, String uuid) throws SimExplorerServiceException { + try { + getStorageEngine().deleteElements(token, uuid); + getStorageEngine().commit(); + } catch (SimExplorerStorageException e) { + throw new SimExplorerServiceException(e); + } + } + /** + * Process version rules. + * + * @param token the token + * @param metaData the meta data + * + * @return true, if process version rules + * + * @throws Exception the exception + */ + protected boolean processVersionRules(String token, MetaData metaData) throws Exception { + // This one will always be the latest + metaData.setLatest(true); + + // Check existing version in storage + MetaData previousVersion = getStorageEngine().getMetadata(token, metaData.getUuid()); + + // Version rules + if (previousVersion != null) { + previousVersion.setLatest(false); + update(token, previousVersion.getUuid(), previousVersion.getVersion(), previousVersion, false); + + // Increment version only if needed + if (metaData.getVersion().compareTo(incrementVersion(previousVersion.getVersion())) <= 0) { + metaData.setVersion(incrementVersion(previousVersion.getVersion()).toString()); + } + + return true; + } + return false; + } + + /** + * Gets the xML attachment. + * + * @return the xML attachment + */ + private Attachment getXMLAttachment() { + if (xmlAttachment == null) { + xmlAttachment = new Attachment(); + xmlAttachment.setDataHash(""); + xmlAttachment.setFileName("entity.xml"); + } + return xmlAttachment; + } + + private boolean notExists(String token, MetaData metaData) throws Exception { + MetaData previousVersion = getStorageEngine().getMetadata(token, metaData.getUuid()); + + if (previousVersion != null && previousVersion.getHash().equals(metaData.getHash())) { + + if (metaData.getVersion().compareTo(previousVersion.getVersion()) < 0) { + metaData.setVersion(previousVersion.getVersion().toString()); + } else { + Version versionToUpgrade = previousVersion.getVersion().clone(); + previousVersion.setVersion(metaData.getVersion().toString()); + update(token, previousVersion.getUuid(), versionToUpgrade, previousVersion, false); + } + + return false; + } + return true; + } + + /** * Real implementation of saveElement. - * + * * @param token the token * @param idxml the idxml * @param idsattachment the idsattachment - * + * * @return the meta data - * + * * @throws Exception the exception */ private MetaData saveElement(String token, String idxml, Map<Attachment, String> idsattachment) throws Exception { @@ -419,13 +550,13 @@ /** * Save sub elements. - * + * * @param token the token * @param idxml the idxml * @param entitiesNode the entities node * @param entityNode the entity node * @param idsattachment the idsattachment - * + * * @throws Exception the exception */ private void saveSubElements(String token, String idxml, String entitiesNode, String entityNode, @@ -448,137 +579,4 @@ } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#update(java.lang.String, java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.Version, fr.cemagref.simexplorer.is.entities.metadata.MetaData) - */ - public void update(String token, String oldUuid, Version oldVersion, MetaData newVersion, boolean deleteOldElement) - throws SimExplorerServiceException { - Map<Attachment, InputStream> attachments = new HashMap<Attachment, InputStream>(); - try { - MetaData oldMetaData = getStorageEngine().getMetadata(token, oldUuid, oldVersion); - - InputStream oldXml = getStorageEngine().retrieveData(token, oldMetaData, getXMLAttachment()); - - MetaDataFactory<MetaData> mdeFactory = MetaDataFactory.getFactory(MetaData.class); - InputStream newXml = mdeFactory.replaceElementInParentXML(oldXml, newVersion); - - attachments.put(getXMLAttachment(), newXml); - - List<Attachment> realAttachments = oldMetaData.getAttachments(); - for (Attachment attachment : realAttachments) { - attachments.put(attachment, getStorageEngine().retrieveData(token, oldMetaData, attachment)); - } - - if (deleteOldElement) { - getStorageEngine().deleteElement(token, oldUuid, oldVersion); - } - getStorageEngine().saveElement(token, newVersion, attachments); - getStorageEngine().commit(); - } catch (Exception e) { - throw new SimExplorerServiceException(e); - } - } - - /** - * Process version rules. - * - * @param token the token - * @param metaData the meta data - * - * @return true, if process version rules - * - * @throws Exception the exception - */ - protected boolean processVersionRules(String token, MetaData metaData) throws Exception { - // This one will always be the latest - metaData.setLatest(true); - - // Check existing version in storage - MetaData previousVersion = getStorageEngine().getMetadata(token, metaData.getUuid()); - - // Version rules - if (previousVersion != null) { - previousVersion.setLatest(false); - update(token, previousVersion.getUuid(), previousVersion.getVersion(), previousVersion, false); - - // Increment version only if needed - if (metaData.getVersion().compareTo(incrementVersion(previousVersion.getVersion())) <= 0) { - metaData.setVersion(incrementVersion(previousVersion.getVersion()).toString()); - } - - return true; - } - return false; - } - - private boolean notExists(String token, MetaData metaData) throws Exception { - MetaData previousVersion = getStorageEngine().getMetadata(token, metaData.getUuid()); - - if (previousVersion != null && previousVersion.getHash().equals(metaData.getHash())) { - - if (metaData.getVersion().compareTo(previousVersion.getVersion()) < 0) { - metaData.setVersion(previousVersion.getVersion().toString()); - } else { - Version versionToUpgrade = previousVersion.getVersion().clone(); - previousVersion.setVersion(metaData.getVersion().toString()); - update(token, previousVersion.getUuid(), versionToUpgrade, previousVersion, false); - } - - return false; - } - return true; - } - - /** - * Increment version. - * - * @param version the version - * - * @return the version - */ - protected abstract Version incrementVersion(Version version); - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) - */ - public Version[] getVersions(String token, String uuid) throws SimExplorerServiceException { - try { - Set<MetaData> versions = getStorageEngine().getElementVersions(token, uuid); - Iterator<MetaData> iterator = versions.iterator(); - Version[] result = new Version[versions.size()]; - int i = 0; - for (MetaData metaData : versions) { - result[i] = metaData.getVersion(); - i++; - } - return result; - } catch (SimExplorerStorageException e) { - throw new SimExplorerServiceException(e); - } - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String, java.lang.String) - */ - public void deleteElement(String token, String uuid, String version) throws SimExplorerServiceException { - try { - getStorageEngine().deleteElement(token, uuid, new Version(version)); - getStorageEngine().commit(); - } catch (SimExplorerStorageException e) { - throw new SimExplorerServiceException(e); - } - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String) - */ - public void deleteElement(String token, String uuid) throws SimExplorerServiceException { - try { - getStorageEngine().deleteElements(token, uuid); - getStorageEngine().commit(); - } catch (SimExplorerStorageException e) { - throw new SimExplorerServiceException(e); - } - } - }

1 0

r913 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 12:33:36 +0000 (Wed, 13 Feb 2008) New Revision: 913 Modified: trunk/simexplorer-is/.classpath Log: suppression module entities Modified: trunk/simexplorer-is/.classpath =================================================================== --- trunk/simexplorer-is/.classpath 2008-02-13 12:21:16 UTC (rev 912) +++ trunk/simexplorer-is/.classpath 2008-02-13 12:33:36 UTC (rev 913) @@ -17,8 +17,6 @@ <classpathentry kind="src" path="simexplorer-is-storage/src/java"/> <classpathentry kind="src" path="simexplorer-is-storage/src/test"/> <classpathentry kind="src" path="simexplorer-is-storage/src/resources"/> - <classpathentry kind="src" path="simexplorer-is-entities/src/resources"/> - <classpathentry kind="src" path="simexplorer-is-entities/src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/> <classpathentry kind="output" path="bin"/>

1 0

r912 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 12:21:16 +0000 (Wed, 13 Feb 2008) New Revision: 912 Removed: trunk/simexplorer-is/simexplorer-is-entities/ Log: suppression module entities

1 0

r911 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 12:18:56 +0000 (Wed, 13 Feb 2008) New Revision: 911 Modified: trunk/simexplorer-is/pom.xml Log: dependance testng uniquement sur le module web (pour tapestry) suppression module entities docs... Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-02-13 12:18:03 UTC (rev 910) +++ trunk/simexplorer-is/pom.xml 2008-02-13 12:18:56 UTC (rev 911) @@ -55,9 +55,7 @@ <maven.compile.source>1.6</maven.compile.source> <maven.compile.target>1.6</maven.compile.target>  - <maven.compile.encoding> - ISO-8859-15 - </maven.compile.encoding> + <maven.compile.encoding>ISO-8859-15</maven.compile.encoding> </properties> </profile> </profiles> @@ -101,9 +99,8 @@ <version>0.8</version> <executions> <execution> - <id>jrst</id> - <phase>test</phase> -  +  + <phase>test</phase> <goals> <goal>jrst</goal> </goals> @@ -114,8 +111,7 @@ <directoryOut> ${basedir}/target/generated-site/xdoc </directoryOut> - <verbose>true</verbose> -  + <verbose>${maven.verbose}</verbose> </configuration> </plugin> <plugin> @@ -187,13 +183,6 @@ <dependencies> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.1</version> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - <dependency> <groupId>lutinlib</groupId> <artifactId>lutinutil</artifactId> <version>0.29-SNAPSHOT</version> @@ -203,7 +192,6 @@ <modules> <module>simexplorer-is-security</module> - <module>simexplorer-is-entities</module> <module>simexplorer-is-storage</module> <module>simexplorer-is-service</module> <module>simexplorer-is-web</module>

1 0

r910 - trunk/simexplorer-is/simexplorer-is-service
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 12:18:03 +0000 (Wed, 13 Feb 2008) New Revision: 910 Modified: trunk/simexplorer-is/simexplorer-is-service/pom.xml Log: suppression groupId (on utilise celui du pom parent) ajout doc sur le repo Modified: trunk/simexplorer-is/simexplorer-is-service/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/pom.xml 2008-02-13 12:14:37 UTC (rev 909) +++ trunk/simexplorer-is/simexplorer-is-service/pom.xml 2008-02-13 12:18:03 UTC (rev 910) @@ -4,7 +4,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-service</artifactId> <name>Service</name> @@ -46,6 +45,7 @@ <repositories> +  <repository> <id>openhms</id> <url>http://open.hmsonline.com/repo/maven2</url>

1 0

r909 - trunk/simexplorer-is/simexplorer-is-web
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 12:14:37 +0000 (Wed, 13 Feb 2008) New Revision: 909 Modified: trunk/simexplorer-is/simexplorer-is-web/pom.xml Log: dependance testng uniquement sur le module web (pour tapestry) Modified: trunk/simexplorer-is/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-02-13 11:57:01 UTC (rev 908) +++ trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-02-13 12:14:37 UTC (rev 909) @@ -133,5 +133,12 @@ <version>4.2.2.GA</version> <scope>provided</scope> </dependency> - </dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.1</version> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + </dependencies> </project> \ No newline at end of file

1 0

r908 - trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 11:57:01 +0000 (Wed, 13 Feb 2008) New Revision: 908 Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/help-faq.png Log: icones pour l'aide contextuelle Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/help-faq.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/help-faq.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r907 - trunk/simexplorer-is/simexplorer-is-storage
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 11:56:38 +0000 (Wed, 13 Feb 2008) New Revision: 907 Modified: trunk/simexplorer-is/simexplorer-is-storage/pom.xml Log: reunification des modules entities et storage en un unique module storage Modified: trunk/simexplorer-is/simexplorer-is-storage/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2008-02-13 11:55:25 UTC (rev 906) +++ trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2008-02-13 11:56:38 UTC (rev 907) @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>simexplorer-is</groupId> +  <artifactId>simexplorer-is-storage</artifactId> <name>Storage</name> @@ -31,7 +31,7 @@ </profile> </profiles> -  + </build> <dependencies> <dependency> @@ -68,15 +68,15 @@ <version>1.1</version> </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> + </dependency> + <dependency> <groupId>jboss</groupId> <artifactId>jboss-ejb3x</artifactId> <version>4.2.2.GA</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is-entities</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> </dependencies> </project> \ No newline at end of file

1 0

r906 - in trunk/simexplorer-is: simexplorer-is-entities/src/test/fr/cemagref/simexplorer/is/entities/metadata simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/entities/metadata
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 11:55:25 +0000 (Wed, 13 Feb 2008) New Revision: 906 Added: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/entities/metadata/VersionTest.java Removed: trunk/simexplorer-is/simexplorer-is-entities/src/test/fr/cemagref/simexplorer/is/entities/metadata/VersionTest.java Log: reunification des modules entities et storage en un unique module storage Deleted: trunk/simexplorer-is/simexplorer-is-entities/src/test/fr/cemagref/simexplorer/is/entities/metadata/VersionTest.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/test/fr/cemagref/simexplorer/is/entities/metadata/VersionTest.java 2008-02-13 11:54:29 UTC (rev 905) +++ trunk/simexplorer-is/simexplorer-is-entities/src/test/fr/cemagref/simexplorer/is/entities/metadata/VersionTest.java 2008-02-13 11:55:25 UTC (rev 906) @@ -1,187 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais, Tony Chemit -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.entities.metadata; - -import junit.framework.TestCase; - -/** - * Version Tester. - * - * @author chemit - * @version 1.0 - * @since - * - * <pre> - * 02 / 02 / 2008 - * </pre> - */ -public class VersionTest extends TestCase { - - /** The v0. */ - Version v0; - - /** The v1. */ - Version v1; - - /** - * Instantiates a new version test. - * - * @param name - * the name - */ - public VersionTest(String name) { - super(name); - } - - /** - * Test set get version. - * - * @throws Exception - * the exception - */ - public void testSetGetVersion() throws Exception { - // TODO: Test goes here... - } - - /** - * Test get length. - * - * @throws Exception - * the exception - */ - public void testGetLength() throws Exception { - - v0 = Version.valueOf(""); - assertEquals(0, v0.getLength()); - - v0 = Version.valueOf("0"); - assertEquals(1, v0.getLength()); - - v0 = Version.valueOf("0.1"); - assertEquals(2, v0.getLength()); - - v0 = Version.valueOf("0.0.1"); - assertEquals(3, v0.getLength()); - } - - /** - * Test equals. - * - * @throws Exception - * the exception - */ - public void testEquals() throws Exception { - - v0 = Version.valueOf(""); - v1 = Version.valueOf(""); - assertEquals(v0, v1); - - v0 = Version.valueOf("0"); - v1 = Version.valueOf("0"); - assertEquals(v0, v1); - - v0 = Version.valueOf("0.1"); - v1 = Version.valueOf("0.1"); - assertEquals(v0, v1); - - v0 = Version.valueOf("0.0.1"); - v1 = Version.valueOf("0.0.1"); - assertEquals(v0, v1); - } - - /** - * Test inc sub version. - * - * @throws Exception - * the exception - */ - public void testIncSubVersion() throws Exception { - v0 = Version.valueOf("0.1"); - - v1 = v0.incVersion(0); - assertEquals(Version.valueOf("0.1"), v0); - assertEquals(Version.valueOf("1.1"), v1); - - v1 = v0.incVersion(1); - assertEquals(Version.valueOf("0.1"), v0); - assertEquals(Version.valueOf("0.2"), v1); - - v1 = v0.incVersion(2); - assertEquals(Version.valueOf("0.1"), v0); - assertEquals(Version.valueOf("0.1.1"), v1); - } - - /** - * Test order. - * - * @throws Exception - * the exception - */ - public void testOrder() throws Exception { - v0 = Version.valueOf("1"); - v1 = Version.valueOf("1"); - assertEqualsVersion(v0, v1); - - v1 = Version.valueOf("1.0"); - assertSmallerVersion(v0, v1); - v1 = Version.valueOf("2"); - assertSmallerVersion(v0, v1); - - v1 = Version.valueOf("0"); - assertGreaterVersion(v0, v1); - v1 = Version.valueOf("0.1"); - assertGreaterVersion(v0, v1); - } - - /** - * Assert equals version. - * - * @param va - * the va - * @param vb - * the vb - */ - private void assertEqualsVersion(Version va, Version vb) { - assertEquals(0, va.compareTo(vb)); - } - - /** - * Assert smaller version. - * - * @param va - * the va - * @param vb - * the vb - */ - private void assertSmallerVersion(Version va, Version vb) { - assertEquals(-1, va.compareTo(vb)); - } - - /** - * Assert greater version. - * - * @param va - * the va - * @param vb - * the vb - */ - private void assertGreaterVersion(Version va, Version vb) { - assertEquals(1, va.compareTo(vb)); - } - -} Copied: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/entities/metadata/VersionTest.java (from rev 899, trunk/simexplorer-is/simexplorer-is-entities/src/test/fr/cemagref/simexplorer/is/entities/metadata/VersionTest.java) =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/entities/metadata/VersionTest.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/entities/metadata/VersionTest.java 2008-02-13 11:55:25 UTC (rev 906) @@ -0,0 +1,187 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais, Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.entities.metadata; + +import junit.framework.TestCase; + +/** + * Version Tester. + * + * @author chemit + * @version 1.0 + * @since + * + * <pre> + * 02 / 02 / 2008 + * </pre> + */ +public class VersionTest extends TestCase { + + /** The v0. */ + Version v0; + + /** The v1. */ + Version v1; + + /** + * Instantiates a new version test. + * + * @param name + * the name + */ + public VersionTest(String name) { + super(name); + } + + /** + * Test set get version. + * + * @throws Exception + * the exception + */ + public void testSetGetVersion() throws Exception { + // TODO: Test goes here... + } + + /** + * Test get length. + * + * @throws Exception + * the exception + */ + public void testGetLength() throws Exception { + + v0 = Version.valueOf(""); + assertEquals(0, v0.getLength()); + + v0 = Version.valueOf("0"); + assertEquals(1, v0.getLength()); + + v0 = Version.valueOf("0.1"); + assertEquals(2, v0.getLength()); + + v0 = Version.valueOf("0.0.1"); + assertEquals(3, v0.getLength()); + } + + /** + * Test equals. + * + * @throws Exception + * the exception + */ + public void testEquals() throws Exception { + + v0 = Version.valueOf(""); + v1 = Version.valueOf(""); + assertEquals(v0, v1); + + v0 = Version.valueOf("0"); + v1 = Version.valueOf("0"); + assertEquals(v0, v1); + + v0 = Version.valueOf("0.1"); + v1 = Version.valueOf("0.1"); + assertEquals(v0, v1); + + v0 = Version.valueOf("0.0.1"); + v1 = Version.valueOf("0.0.1"); + assertEquals(v0, v1); + } + + /** + * Test inc sub version. + * + * @throws Exception + * the exception + */ + public void testIncSubVersion() throws Exception { + v0 = Version.valueOf("0.1"); + + v1 = v0.incVersion(0); + assertEquals(Version.valueOf("0.1"), v0); + assertEquals(Version.valueOf("1.1"), v1); + + v1 = v0.incVersion(1); + assertEquals(Version.valueOf("0.1"), v0); + assertEquals(Version.valueOf("0.2"), v1); + + v1 = v0.incVersion(2); + assertEquals(Version.valueOf("0.1"), v0); + assertEquals(Version.valueOf("0.1.1"), v1); + } + + /** + * Test order. + * + * @throws Exception + * the exception + */ + public void testOrder() throws Exception { + v0 = Version.valueOf("1"); + v1 = Version.valueOf("1"); + assertEqualsVersion(v0, v1); + + v1 = Version.valueOf("1.0"); + assertSmallerVersion(v0, v1); + v1 = Version.valueOf("2"); + assertSmallerVersion(v0, v1); + + v1 = Version.valueOf("0"); + assertGreaterVersion(v0, v1); + v1 = Version.valueOf("0.1"); + assertGreaterVersion(v0, v1); + } + + /** + * Assert equals version. + * + * @param va + * the va + * @param vb + * the vb + */ + private void assertEqualsVersion(Version va, Version vb) { + assertEquals(0, va.compareTo(vb)); + } + + /** + * Assert smaller version. + * + * @param va + * the va + * @param vb + * the vb + */ + private void assertSmallerVersion(Version va, Version vb) { + assertEquals(-1, va.compareTo(vb)); + } + + /** + * Assert greater version. + * + * @param va + * the va + * @param vb + * the vb + */ + private void assertGreaterVersion(Version va, Version vb) { + assertEquals(1, va.compareTo(vb)); + } + +}

1 0