This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 251213
Collapse All | Expand All

(-)a/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java (-1 / +18 lines)
Lines 46-51 Link Here
46
import java.util.ArrayList;
46
import java.util.ArrayList;
47
import java.util.List;
47
import java.util.List;
48
import org.netbeans.api.annotations.common.NonNull;
48
import org.netbeans.api.annotations.common.NonNull;
49
import org.netbeans.modules.maven.options.MavenSettings;
49
import org.openide.util.Utilities;
50
import org.openide.util.Utilities;
50
51
51
/**
52
/**
Lines 65-71 Link Here
65
        //if maven.bat file is in space containing path, we need to quote with simple quotes.
66
        //if maven.bat file is in space containing path, we need to quote with simple quotes.
66
        String quote = "\"";
67
        String quote = "\"";
67
        List<String> toRet = new ArrayList<String>();
68
        List<String> toRet = new ArrayList<String>();
68
        String ex = Utilities.isWindows() ? "mvn.bat" : "mvn"; //NOI18N
69
        String ex = "mvn"; //NOI18N
70
        if (Utilities.isWindows()) {
71
            String version = MavenSettings.getCommandLineMavenVersion(mavenHome);
72
            if (null == version) {
73
                ex = "mvn.bat"; // NOI18N
74
            } else {
75
                String[] v = version.split("\\."); // NOI18N
76
                int major = Integer.parseInt(v[0]);
77
                int minor = Integer.parseInt(v[1]);
78
                // starting with 3.3.0 maven stop using .bat file
79
                if ((major < 3) || (major == 3 && minor < 3)) {
80
                    ex = "mvn.bat"; //NOI18N
81
                } else {
82
                    ex = "mvn.cmd"; //NOI18N
83
                }
84
            }
85
        }
69
        File bin = new File(mavenHome, "bin" + File.separator + ex);//NOI18N
86
        File bin = new File(mavenHome, "bin" + File.separator + ex);//NOI18N
70
        toRet.add(quoteSpaces(bin.getAbsolutePath(), quote));
87
        toRet.add(quoteSpaces(bin.getAbsolutePath(), quote));
71
88
(-)a/maven/test/unit/src/org/netbeans/modules/maven/execute/cmd/ShellConstructorTest.java (+123 lines)
Line 0 Link Here
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
8
 *
9
 * The contents of this file are subject to the terms of either the GNU
10
 * General Public License Version 2 only ("GPL") or the Common
11
 * Development and Distribution License("CDDL") (collectively, the
12
 * "License"). You may not use this file except in compliance with the
13
 * License. You can obtain a copy of the License at
14
 * http://www.netbeans.org/cddl-gplv2.html
15
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16
 * specific language governing permissions and limitations under the
17
 * License.  When distributing the software, include this License Header
18
 * Notice in each file and include the License file at
19
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
20
 * particular file as subject to the "Classpath" exception as provided
21
 * by Oracle in the GPL Version 2 section of the License file that
22
 * accompanied this code. If applicable, add the following below the
23
 * License Header, with the fields enclosed by brackets [] replaced by
24
 * your own identifying information:
25
 * "Portions Copyrighted [year] [name of copyright owner]"
26
 *
27
 * If you wish your version of this file to be governed by only the CDDL
28
 * or only the GPL Version 2, indicate your decision by adding
29
 * "[Contributor] elects to include this software in this distribution
30
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
31
 * single choice of license, a recipient has the option to distribute
32
 * your version of this file under either the CDDL, the GPL Version 2 or
33
 * to extend the choice of license to its licensees as provided above.
34
 * However, if you add GPL Version 2 code and therefore, elected the GPL
35
 * Version 2 license, then the option applies only if the new code is
36
 * made subject to such option by the copyright holder.
37
 *
38
 * Contributor(s):
39
 *
40
 * Portions Copyrighted 2015 Sun Microsystems, Inc.
41
 */
42
package org.netbeans.modules.maven.execute.cmd;
43
44
import java.io.File;
45
import java.io.FileNotFoundException;
46
import java.io.IOException;
47
import java.lang.reflect.Method;
48
import java.util.List;
49
import org.junit.Test;
50
import org.netbeans.junit.NbTestCase;
51
import org.netbeans.modules.maven.options.MavenSettings;
52
import org.openide.util.Utilities;
53
54
/**
55
 *
56
 * 
57
 */
58
public class ShellConstructorTest extends NbTestCase {
59
60
    public ShellConstructorTest(String name) throws FileNotFoundException, IOException {
61
        super(name);
62
    }
63
64
    private void resetOs() throws Exception {
65
        // hack to call reset OS of BaseUtilies
66
        Class<?> classz = Class.forName("org.openide.util.BaseUtilities");
67
        Method m = classz.getDeclaredMethod("resetOperatingSystem");
68
        m.setAccessible(true);
69
        m.invoke(null);
70
    }
71
72
    /**
73
     * Test of construct method, of class ShellConstructor.
74
     *
75
     * @throws java.lang.Exception
76
     */
77
    @Test
78
    public void testShellConstructoronLinux() throws Exception {
79
        resetOs();
80
        String previous = System.getProperty("os.name");
81
        System.getProperties().put("os.name", "Linux");
82
        assertFalse("Must be linux", Utilities.isWindows());
83
        System.getProperties().put("os.name", previous);
84
85
        assertTrue("2.2 linux", getCLI("2.2", "2.2.1", "mvn"));
86
        assertTrue("3.0.5 linux", getCLI("3.0.5", "3.0.5", "mvn"));
87
        assertTrue("3.3.1 linux", getCLI("3.3.1", "3.3.1", "mvn"));
88
        assertTrue("4.0.0 linux", getCLI("4.0.0", "4.0.0", "mvn"));
89
        System.getProperties().put("os.name", previous);
90
        resetOs();
91
92
    }
93
94
    @Test
95
    public void testShellconstructoronWindows() throws Exception {
96
        resetOs();
97
        String previous = System.getProperty("os.name");
98
        System.getProperties().put("os.name", "Windows ");
99
        assertTrue("Must be windows", Utilities.isWindows());
100
        System.getProperties().put("os.name", previous);
101
        assertTrue("2.2 windows", getCLI("2.2", "2.2.1", "mvn.bat"));
102
        assertTrue("3.0.5 windows", getCLI("3.0.5", "3.0.5", "mvn.bat"));
103
        assertTrue("3.3.1 windows", getCLI("3.3.1", "3.3.1", "mvn.cmd"));
104
        assertTrue("4.0.0 windows", getCLI("4.0.0", "4.0.0", "mvn.cmd"));
105
        
106
        System.getProperties().put("os.name", previous);
107
        resetOs();
108
    }
109
110
    private boolean getCLI(String folder, String requestedversion, String mvn) {
111
        File sourceJar = new File(this.getDataDir(), "mavenmock/" + folder + "/");
112
        String version = MavenSettings.getCommandLineMavenVersion(sourceJar);
113
        assertEquals(requestedversion, version);
114
        ShellConstructor shellConstructor = new ShellConstructor(sourceJar);
115
        List<String> construct = shellConstructor.construct();
116
        if (Utilities.isWindows()) {
117
            assertTrue("cli must contains " + mvn, construct.get(2).contains(mvn));
118
        } else {
119
            assertTrue("cli must contains " + mvn, construct.get(0).contains(mvn));
120
        }
121
        return true;
122
    }
123
}

Return to bug 251213