Attachment #22767 for bug #50943

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 50943
Collapse All | Expand All

Lines 681-689 final class NbInstaller extends ModuleIn Link Here

(-)core/startup/src/org/netbeans/core/startup/NbInstaller.java (-2 / +12 lines)
681		681
682	public String[] refineProvides (Module m) {	682	public String[] refineProvides (Module m) {
683	if (m.getCodeNameBase ().equals ("org.openide.modules")) { // NOI18N	683	if (m.getCodeNameBase ().equals ("org.openide.modules")) { // NOI18N
684	ArrayList arr = new ArrayList (3);	684	ArrayList arr = new ArrayList (4);
		685
		686	boolean isMac = (org.openide.util.Utilities.getOperatingSystem () & org.openide.util.Utilities.OS_MAC) != 0;
		687	boolean isOS2 = (org.openide.util.Utilities.getOperatingSystem () & org.openide.util.Utilities.OS_OS2) != 0;
		688
685	if (org.openide.util.Utilities.isUnix ()) {	689	if (org.openide.util.Utilities.isUnix ()) {
686	arr.add ("org.openide.modules.os.Unix"); // NOI18N	690	arr.add ("org.openide.modules.os.Unix"); // NOI18N
		691	if (!isMac) {
		692	arr.add("org.openide.modules.os.PlainUnix"); // NOI18N
		693	}
687	}	694	}
688		695
689	if (	696	if (
Lines 692-699 final class NbInstaller extends ModuleIn Link Here
692	arr.add ("org.openide.modules.os.Windows"); // NOI18N	699	arr.add ("org.openide.modules.os.Windows"); // NOI18N
693	}	700	}
694		701
695	if ((org.openide.util.Utilities.getOperatingSystem () & org.openide.util.Utilities.OS_MAC) != 0) {	702	if (isMac) {
696	arr.add ("org.openide.modules.os.MacOSX"); // NOI18N	703	arr.add ("org.openide.modules.os.MacOSX"); // NOI18N
		704	}
		705	if (isOS2) {
		706	arr.add ("org.openide.modules.os.OS2"); // NOI18N
697	}	707	}
698		708
699	// module format is now 1	709	// module format is now 1




        assertEnableModule("org.openide.modules.os.Windows", true);
        assertEnableModule("org.openide.modules.os.MacOSX", false);
        assertEnableModule("org.openide.modules.os.Unix", false);
        assertEnableModule("org.openide.modules.os.PlainUnix", false);
        assertEnableModule("org.openide.modules.os.Garbage", false);
        assertEnableModule("org.openide.modules.os.OS2", false);
    }
    
    public void testMacOSX() throws Exception {

        assertEnableModule("org.openide.modules.os.Windows", false);
        assertEnableModule("org.openide.modules.os.MacOSX", true);
        assertEnableModule("org.openide.modules.os.Unix", true);
        assertEnableModule("org.openide.modules.os.PlainUnix", false);
        assertEnableModule("org.openide.modules.os.Garbage", false);
        assertEnableModule("org.openide.modules.os.OS2", false);
    }

    public void testDarwin() throws Exception {

        assertEnableModule("org.openide.modules.os.Windows", false);
        assertEnableModule("org.openide.modules.os.MacOSX", true);
        assertEnableModule("org.openide.modules.os.Unix", true);
        assertEnableModule("org.openide.modules.os.PlainUnix", false);
        assertEnableModule("org.openide.modules.os.Garbage", false);
        assertEnableModule("org.openide.modules.os.OS2", false);
    }
    
    public void testLinux() throws Exception {

        assertEnableModule("org.openide.modules.os.Windows", false);
        assertEnableModule("org.openide.modules.os.MacOSX", false);
        assertEnableModule("org.openide.modules.os.Unix", true);
        assertEnableModule("org.openide.modules.os.PlainUnix", true);
        assertEnableModule("org.openide.modules.os.Garbage", false);
        assertEnableModule("org.openide.modules.os.OS2", false);
    }

    public void testBSD() throws Exception {

        assertEnableModule("org.openide.modules.os.Windows", false);
        assertEnableModule("org.openide.modules.os.MacOSX", false);
        assertEnableModule("org.openide.modules.os.Unix", true);
        assertEnableModule("org.openide.modules.os.PlainUnix", true);
        assertEnableModule("org.openide.modules.os.Garbage", false);
        assertEnableModule("org.openide.modules.os.OS2", false);
    }

    public void testOS2() throws Exception {
        System.setProperty("os.name", "OS/2");
        assertEquals ("We are on os/2", org.openide.util.Utilities.OS_OS2, org.openide.util.Utilities.getOperatingSystem());
        
        assertEnableModule("org.openide.modules.os.Windows", false);
        assertEnableModule("org.openide.modules.os.MacOSX", false);
        assertEnableModule("org.openide.modules.os.Unix", false);
        assertEnableModule("org.openide.modules.os.PlainUnix", false);
        assertEnableModule("org.openide.modules.os.Garbage", false);
        assertEnableModule("org.openide.modules.os.OS2", true);
    }
    
    /**  */

        Manifest man = new Manifest ();
        man.getMainAttributes ().putValue ("Manifest-Version", "1.0");
        man.getMainAttributes ().putValue ("OpenIDE-Module", "org.test.PlatformDependency/1");
        man.getMainAttributes ().putValue ("OpenIDE-Module-Public-Packages", "-");
        assertNotNull ("This test is supposed to run on windows, unix and macosx, fail otherwise on this line", req);
        
        man.getMainAttributes ().putValue ("OpenIDE-Module-Requires", req);
        

Return to bug 50943

Lines 59-65 public class PlatformDependencySatisfied Link Here

(-)core/startup/test/unit/src/org/netbeans/core/startup/PlatformDependencySatisfiedTest.java (-2 / +23 lines)
59	assertEnableModule("org.openide.modules.os.Windows", true);	59	assertEnableModule("org.openide.modules.os.Windows", true);
60	assertEnableModule("org.openide.modules.os.MacOSX", false);	60	assertEnableModule("org.openide.modules.os.MacOSX", false);
61	assertEnableModule("org.openide.modules.os.Unix", false);	61	assertEnableModule("org.openide.modules.os.Unix", false);
		62	assertEnableModule("org.openide.modules.os.PlainUnix", false);
62	assertEnableModule("org.openide.modules.os.Garbage", false);	63	assertEnableModule("org.openide.modules.os.Garbage", false);
		64	assertEnableModule("org.openide.modules.os.OS2", false);
63	}	65	}
64		66
65	public void testMacOSX() throws Exception {	67	public void testMacOSX() throws Exception {
Lines 69-75 public class PlatformDependencySatisfied Link Here
69	assertEnableModule("org.openide.modules.os.Windows", false);	71	assertEnableModule("org.openide.modules.os.Windows", false);
70	assertEnableModule("org.openide.modules.os.MacOSX", true);	72	assertEnableModule("org.openide.modules.os.MacOSX", true);
71	assertEnableModule("org.openide.modules.os.Unix", true);	73	assertEnableModule("org.openide.modules.os.Unix", true);
		74	assertEnableModule("org.openide.modules.os.PlainUnix", false);
72	assertEnableModule("org.openide.modules.os.Garbage", false);	75	assertEnableModule("org.openide.modules.os.Garbage", false);
		76	assertEnableModule("org.openide.modules.os.OS2", false);
73	}	77	}
74		78
75	public void testDarwin() throws Exception {	79	public void testDarwin() throws Exception {
Lines 79-85 public class PlatformDependencySatisfied Link Here
79	assertEnableModule("org.openide.modules.os.Windows", false);	83	assertEnableModule("org.openide.modules.os.Windows", false);
80	assertEnableModule("org.openide.modules.os.MacOSX", true);	84	assertEnableModule("org.openide.modules.os.MacOSX", true);
81	assertEnableModule("org.openide.modules.os.Unix", true);	85	assertEnableModule("org.openide.modules.os.Unix", true);
		86	assertEnableModule("org.openide.modules.os.PlainUnix", false);
82	assertEnableModule("org.openide.modules.os.Garbage", false);	87	assertEnableModule("org.openide.modules.os.Garbage", false);
		88	assertEnableModule("org.openide.modules.os.OS2", false);
83	}	89	}
84		90
85	public void testLinux() throws Exception {	91	public void testLinux() throws Exception {
Lines 89-95 public class PlatformDependencySatisfied Link Here
89	assertEnableModule("org.openide.modules.os.Windows", false);	95	assertEnableModule("org.openide.modules.os.Windows", false);
90	assertEnableModule("org.openide.modules.os.MacOSX", false);	96	assertEnableModule("org.openide.modules.os.MacOSX", false);
91	assertEnableModule("org.openide.modules.os.Unix", true);	97	assertEnableModule("org.openide.modules.os.Unix", true);
		98	assertEnableModule("org.openide.modules.os.PlainUnix", true);
92	assertEnableModule("org.openide.modules.os.Garbage", false);	99	assertEnableModule("org.openide.modules.os.Garbage", false);
		100	assertEnableModule("org.openide.modules.os.OS2", false);
93	}	101	}
94		102
95	public void testBSD() throws Exception {	103	public void testBSD() throws Exception {
Lines 99-105 public class PlatformDependencySatisfied Link Here
99	assertEnableModule("org.openide.modules.os.Windows", false);	107	assertEnableModule("org.openide.modules.os.Windows", false);
100	assertEnableModule("org.openide.modules.os.MacOSX", false);	108	assertEnableModule("org.openide.modules.os.MacOSX", false);
101	assertEnableModule("org.openide.modules.os.Unix", true);	109	assertEnableModule("org.openide.modules.os.Unix", true);
		110	assertEnableModule("org.openide.modules.os.PlainUnix", true);
102	assertEnableModule("org.openide.modules.os.Garbage", false);	111	assertEnableModule("org.openide.modules.os.Garbage", false);
		112	assertEnableModule("org.openide.modules.os.OS2", false);
		113	}
		114
		115	public void testOS2() throws Exception {
		116	System.setProperty("os.name", "OS/2");
		117	assertEquals ("We are on os/2", org.openide.util.Utilities.OS_OS2, org.openide.util.Utilities.getOperatingSystem());
		118
		119	assertEnableModule("org.openide.modules.os.Windows", false);
		120	assertEnableModule("org.openide.modules.os.MacOSX", false);
		121	assertEnableModule("org.openide.modules.os.Unix", false);
		122	assertEnableModule("org.openide.modules.os.PlainUnix", false);
		123	assertEnableModule("org.openide.modules.os.Garbage", false);
		124	assertEnableModule("org.openide.modules.os.OS2", true);
103	}	125	}
104		126
105	/** */	127	/** */
Lines 107-114 public class PlatformDependencySatisfied Link Here
107	Manifest man = new Manifest ();	129	Manifest man = new Manifest ();
108	man.getMainAttributes ().putValue ("Manifest-Version", "1.0");	130	man.getMainAttributes ().putValue ("Manifest-Version", "1.0");
109	man.getMainAttributes ().putValue ("OpenIDE-Module", "org.test.PlatformDependency/1");	131	man.getMainAttributes ().putValue ("OpenIDE-Module", "org.test.PlatformDependency/1");
110		132	man.getMainAttributes ().putValue ("OpenIDE-Module-Public-Packages", "-");
111	assertNotNull ("This test is supposed to run on windows, unix and macosx, fail otherwise on this line", req);
112		133
113	man.getMainAttributes ().putValue ("OpenIDE-Module-Requires", req);	134	man.getMainAttributes ().putValue ("OpenIDE-Module-Requires", req);
114		135