Attachment #38542 for bug #93297

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

Lines 148-153 Link Here

(-)nbbuild/antsrc/org/netbeans/nbbuild/ShorterPaths.java (+4 lines)
148	for (Iterator it = properties.keySet().iterator(); it.hasNext();) {	148	for (Iterator it = properties.keySet().iterator(); it.hasNext();) {
149	String name = (String) it.next();	149	String name = (String) it.next();
150	if (name.startsWith(extraProp)) {	150	if (name.startsWith(extraProp)) {
		151	if (name.equals("test-unit-sys-prop.xtest.data")) {
		152	// ignore overring xtest.data.dir, data.zip placed to standard location
		153	continue;
		154	}
151	//	155	//
152	outProp.setLength(0);	156	outProp.setLength(0);
153	StringTokenizer tokenizer = new StringTokenizer(properties.get(name).toString(), ":;");	157	StringTokenizer tokenizer = new StringTokenizer(properties.get(name).toString(), ":;");




    <target name="test-init" depends="init,test-preinit,test-lib-init">
        <property name="test.unit.dir" location="test/unit"/>
        <property name="test.unit.src.dir" location="${test.unit.dir}/src"/>
        <property name="test.unit.data.dir" location="${test.unit.dir}/data"/>
        <property name="build.test.unit.dir" location="build/test/unit"/>
        <property name="build.test.unit.classes.dir" location="${build.test.unit.dir}/classes"/>
        <property name="build.test.unit.results.dir" location="${build.test.unit.dir}/results"/>

            </fileset>
        </copy>
        
        <available file="${test.unit.data.dir}" type="dir" property="exists.test.data"/>
        <!-- test distribution -->
           <mkdir dir="${test.dist.dir}/extralibs"/>
           <mkdir dir="${test.unit.out.folder}"/>

    </target>
    
    <target name="test-build-datajar" depends="do-test-build" if="exists.test.data">
           <zip destfile="${test.unit.out.folder}/data.zip" basedir="${test.unit.data.dir}"/> 
    </target>

    

Lines 79-84 Link Here

(-)nbbuild/test/unit/src/org/netbeans/nbbuild/ShorterPathsTest.java (+1 lines)
79	assertEquals("test.unit.run.cp","${nb.root.test.dir}/module.jar",props.getProperty("test.unit.run.cp"));	79	assertEquals("test.unit.run.cp","${nb.root.test.dir}/module.jar",props.getProperty("test.unit.run.cp"));
80	assertEquals("test-unit-sys-prop.prop1","value1",props.getProperty("test-unit-sys-prop.prop1"));	80	assertEquals("test-unit-sys-prop.prop1","value1",props.getProperty("test-unit-sys-prop.prop1"));
81	assertEquals("test-unit-sys-prop.prop2","${nb.root.test.dir}/module.jar",props.getProperty("test-unit-sys-prop.prop2"));	81	assertEquals("test-unit-sys-prop.prop2","${nb.root.test.dir}/module.jar",props.getProperty("test-unit-sys-prop.prop2"));
		82	assertNull(props.getProperty("test-unit-sys-prop.xtest.data"));
82	assertEquals("props.size()",4,props.size());	83	assertEquals("props.size()",4,props.size());
83		84
84		85

Lines 19-24 Link Here

(-)nbbuild/test/unit/src/org/netbeans/nbbuild/ShorterPathsTest.xml (+1 lines)
19	<property name="nb.root.test.prop" location="${test.modules.dir}"/>	19	<property name="nb.root.test.prop" location="${test.modules.dir}"/>
20	<property name="test-unit-sys-prop.prop1" value="value1"/>	20	<property name="test-unit-sys-prop.prop1" value="value1"/>
21	<property name="test-unit-sys-prop.prop2" value="${test.modules.dir}/module.jar"/>	21	<property name="test-unit-sys-prop.prop2" value="${test.modules.dir}/module.jar"/>
		22	<property name="test-unit-sys-prop.xtest.data" value="${test.modules.dir}"/>
22	<path id="in.test.prop">	23	<path id="in.test.prop">
23	<path location="${test.modules.dir}/module.jar"/>	24	<path location="${test.modules.dir}/module.jar"/>
24	<path location="${test.ext.lib}"/>	25	<path location="${test.ext.lib}"/>

Lines 23-28 Link Here

(-)java/freeform/nbproject/project.properties (+1 lines)
23	# XXX using a data dir from another module means that test4u will not be able to run these tests!	23	# XXX using a data dir from another module means that test4u will not be able to run these tests!
24	# Better to fix by not using a data dir (just generator), or copying required files into java/freeform/test/unit/data	24	# Better to fix by not using a data dir (just generator), or copying required files into java/freeform/test/unit/data
25	test-unit-sys-prop.xtest.data=${nb_all}/ant/freeform/test/unit/data	25	test-unit-sys-prop.xtest.data=${nb_all}/ant/freeform/test/unit/data
		26	test.unit.data.dir=${nb_all}/ant/freeform/test/unit/data
26	# masterfs needed for the usual reasons	27	# masterfs needed for the usual reasons
27	# core needed for ArchiveURLMapper	28	# core needed for ArchiveURLMapper
28	test-unit-sys-prop.test.ant.home=${ant.dir}/ant	29	test-unit-sys-prop.test.ant.home=${ant.dir}/ant

Return to bug 93297

Lines 301-306 Link Here

(-)nbbuild/templates/common.xml (-2 / +3 lines)
301	<target name="test-init" depends="init,test-preinit,test-lib-init">	301	<target name="test-init" depends="init,test-preinit,test-lib-init">
302	<property name="test.unit.dir" location="test/unit"/>	302	<property name="test.unit.dir" location="test/unit"/>
303	<property name="test.unit.src.dir" location="${test.unit.dir}/src"/>	303	<property name="test.unit.src.dir" location="${test.unit.dir}/src"/>
		304	<property name="test.unit.data.dir" location="${test.unit.dir}/data"/>
304	<property name="build.test.unit.dir" location="build/test/unit"/>	305	<property name="build.test.unit.dir" location="build/test/unit"/>
305	<property name="build.test.unit.classes.dir" location="${build.test.unit.dir}/classes"/>	306	<property name="build.test.unit.classes.dir" location="${build.test.unit.dir}/classes"/>
306	<property name="build.test.unit.results.dir" location="${build.test.unit.dir}/results"/>	307	<property name="build.test.unit.results.dir" location="${build.test.unit.dir}/results"/>
Lines 374-380 Link Here
374	</fileset>	375	</fileset>
375	</copy>	376	</copy>
376		377
377	<available file="${test.unit.dir}/data" type="dir" property="exists.test.data"/>	378	<available file="${test.unit.data.dir}" type="dir" property="exists.test.data"/>
378	<!-- test distribution -->	379	<!-- test distribution -->
379	<mkdir dir="${test.dist.dir}/extralibs"/>	380	<mkdir dir="${test.dist.dir}/extralibs"/>
380	<mkdir dir="${test.unit.out.folder}"/>	381	<mkdir dir="${test.unit.out.folder}"/>
Lines 401-407 Link Here
401	</target>	402	</target>
402		403
403	<target name="test-build-datajar" depends="do-test-build" if="exists.test.data">	404	<target name="test-build-datajar" depends="do-test-build" if="exists.test.data">
404	<zip destfile="${test.unit.out.folder}/data.zip" basedir="${test.unit.dir}/data"/>	405	<zip destfile="${test.unit.out.folder}/data.zip" basedir="${test.unit.data.dir}"/>
405	</target>	406	</target>
406		407
407		408