test/jdk/tools/jpackage/junit/jdk/jpackage/internal/CompareDottedVersionTest.java
author herrick
Fri, 01 Nov 2019 10:25:15 -0400
branchJDK-8200758-branch
changeset 58890 6539ad1d90aa
parent 58696 61c44899b4eb
permissions -rw-r--r--
8233333 : Incorrect comparison of number version strings in ToolValidator Submitted-by: asemenyuk Reviewed-by: aherrick, almatvee
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
     1
/*
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
     2
 * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
     4
 *
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
     8
 *
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    13
 * accompanied this code).
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    14
 *
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    18
 *
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    21
 * questions.
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    22
 */
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    23
package jdk.jpackage.internal;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    24
58890
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    25
import java.util.ArrayList;
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    26
import java.util.List;
58890
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    27
import java.util.function.Function;
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    28
import org.junit.Test;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    29
import org.junit.runner.RunWith;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    30
import org.junit.runners.Parameterized;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    31
import org.junit.runners.Parameterized.Parameters;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    32
import static org.junit.Assert.*;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    33
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    34
@RunWith(Parameterized.class)
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    35
public class CompareDottedVersionTest {
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    36
58890
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    37
    public CompareDottedVersionTest(boolean greedy, String version1,
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    38
            String version2, int result) {
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    39
        this.version1 = version1;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    40
        this.version2 = version2;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    41
        this.expectedResult = result;
58890
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    42
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    43
        if (greedy) {
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    44
            createTestee = DottedVersion::greedy;
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    45
        } else {
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    46
            createTestee = DottedVersion::lazy;
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    47
        }
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    48
    }
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    49
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    50
    @Parameters
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    51
    public static List<Object[]> data() {
58890
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    52
        List<Object[]> data = new ArrayList<>();
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    53
        for (var greedy : List.of(true, false)) {
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    54
            data.addAll(List.of(new Object[][] {
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    55
                { greedy, "00.0.0", "0", 0 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    56
                { greedy, "0.035", "0.0035", 0 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    57
                { greedy, "1", "1", 0 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    58
                { greedy, "2", "2.0", 0 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    59
                { greedy, "2.00", "2.0", 0 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    60
                { greedy, "1.2.3.4", "1.2.3.4.5", -1 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    61
                { greedy, "34", "33", 1 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    62
                { greedy, "34.0.78", "34.1.78", -1 }
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    63
            }));
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    64
        }
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    65
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    66
        data.addAll(List.of(new Object[][] {
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    67
            { false, "", "1", -1 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    68
            { false, "1.2.4-R4", "1.2.4-R5", 0 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    69
            { false, "1.2.4.-R4", "1.2.4.R5", 0 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    70
            { false, "7+1", "7+4", 0 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    71
            { false, "2+14", "2-14", 0 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    72
            { false, "23.4.RC4", "23.3.RC10", 1 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    73
            { false, "77.0", "77.99999999999999999999999999999999999999999999999", 0 },
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    74
        }));
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    75
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    76
        return data;
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    77
    }
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    78
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    79
    @Test
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    80
    public void testIt() {
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    81
        int actualResult = compare(version1, version2);
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    82
        assertEquals(expectedResult, actualResult);
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    83
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    84
        int actualNegateResult = compare(version2, version1);
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    85
        assertEquals(actualResult, -1 * actualNegateResult);
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    86
    }
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    87
58890
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    88
    private int compare(String x, String y) {
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
    89
        int result = createTestee.apply(x).compareTo(y);
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    90
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    91
        if (result < 0) {
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    92
            return -1;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    93
        }
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    94
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    95
        if (result > 0) {
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    96
            return 1;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    97
        }
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    98
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
    99
        return 0;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
   100
    }
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
   101
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
   102
    private final String version1;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
   103
    private final String version2;
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
   104
    private final int expectedResult;
58890
6539ad1d90aa 8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents: 58696
diff changeset
   105
    private final Function<String, DottedVersion> createTestee;
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents:
diff changeset
   106
}