Author: glandais Date: 2008-03-20 16:43:11 +0000 (Thu, 20 Mar 2008) New Revision: 1431 Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/VersionGenerator.java Log: Simplified Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/VersionGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/VersionGenerator.java 2008-03-20 16:42:48 UTC (rev 1430) +++ trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/VersionGenerator.java 2008-03-20 16:43:11 UTC (rev 1431) @@ -69,7 +69,7 @@ */ public Version generateVersion() { StringBuilder sb = new StringBuilder(); - for (int i = 0, size = generateNotNullAbsInt(MAX_SIZE); i < size; i++) { + for (int i = 0, size = generateAbsInt(MAX_SIZE); i < size; i++) { sb.append('.').append(generateAbsInt(MAX_VERSION_NUMBER)); } return Version.valueOf(sb.substring(1)); @@ -81,7 +81,7 @@ * @return the version[] */ public Version[] generateVersions() { - int nb = generateNotNullAbsInt(MAX_NB_VERSIONS); + int nb = generateAbsInt(MAX_NB_VERSIONS); return generateVersions(nb); } @@ -94,7 +94,7 @@ * @return the version[] */ public Version[] generateVersions(Version mandatory) { - int nb = generateNotNullAbsInt(MAX_NB_VERSIONS); + int nb = generateAbsInt(MAX_NB_VERSIONS); Version[] versions = generateVersions(nb); List<Version> list = new ArrayList<Version>(Arrays.asList(versions)); if (!list.contains(mandatory)) { @@ -125,7 +125,7 @@ } /** - * Generate abs int. + * Generate not null abs int. * * @param max * the max @@ -133,26 +133,10 @@ * @return the int */ protected int generateAbsInt(int max) { - return Math.abs(r.nextInt()) % max; + return 1 + r.nextInt(max - 1); } /** - * Generate not null abs int. - * - * @param max - * the max - * - * @return the int - */ - protected int generateNotNullAbsInt(int max) { - int nb = 0; - while (nb == 0) { - nb = generateAbsInt(max); - } - return nb; - } - - /** * Instantiates a new version generator. */ protected VersionGenerator() {