From 31a0b8ea0f44018eedf7eb984c683728e5296ca4 Mon Sep 17 00:00:00 2001 From: Stuart Marks <stuart.marks@oracle.com> Date: Sat, 9 Sep 2017 23:05:47 -0700 Subject: [PATCH] Renumber comparators and default methods exercises. Update Map default methods exercises to avoid null values. Update NetBeans project to 20170908 nightly and JDK-9+181. --- LambdaLab/nbproject/build-impl.xml | 749 +++++++++++++----- LambdaLab/nbproject/genfiles.properties | 6 +- LambdaLab/nbproject/project.properties | 17 +- LambdaLab/nbproject/project.xml | 1 + LambdaLab/test/exercises/B_Comparators.java | 47 +- .../test/exercises/C_DefaultMethods.java | 252 +++--- LambdaLab/test/solutions/B_Comparators.java | 44 +- .../test/solutions/C_DefaultMethods.java | 255 +++--- 8 files changed, 874 insertions(+), 497 deletions(-) diff --git a/LambdaLab/nbproject/build-impl.xml b/LambdaLab/nbproject/build-impl.xml index 4b630da..7d54602 100644 --- a/LambdaLab/nbproject/build-impl.xml +++ b/LambdaLab/nbproject/build-impl.xml @@ -19,7 +19,7 @@ is divided into following sections: - cleanup --> -<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="LambdaLab-impl"> +<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="LambdaLab-impl"> <fail message="Please build using Ant 1.8.0 or higher."> <condition> <not> @@ -46,15 +46,116 @@ is divided into following sections: <property file="${user.properties.file}"/> <!-- The two properties below are usually overridden --> <!-- by the active platform. Just a fallback. --> - <property name="default.javac.source" value="1.4"/> - <property name="default.javac.target" value="1.4"/> + <property name="default.javac.source" value="1.6"/> + <property name="default.javac.target" value="1.6"/> </target> <target depends="-pre-init,-init-private,-init-user" name="-init-project"> <property file="nbproject/configs/${config}.properties"/> <property file="nbproject/project.properties"/> </target> - <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> - <property name="platform.java" value="${java.home}/bin/java"/> + <target name="-init-modules-supported"> + <condition property="modules.supported.internal" value="true"> + <not> + <matches pattern="1\.[0-8](\..*)?" string="${javac.source}"/> + </not> + </condition> + </target> + <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-modulename"> + <macrodef name="modulename" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute name="property"/> + <attribute name="sourcepath"/> + <sequential> + <loadresource property="@{property}" quiet="true"> + <javaresource classpath="@{sourcepath}" name="module-info.java" parentFirst="false"/> + <filterchain> + <stripjavacomments/> + <linecontainsregexp> + <regexp pattern="module .* \{"/> + </linecontainsregexp> + <tokenfilter> + <linetokenizer/> + <replaceregex flags="s" pattern="(\s*module\s+)(\S*)(\s*\{.*)" replace="\2"/> + </tokenfilter> + <striplinebreaks/> + </filterchain> + </loadresource> + </sequential> + </macrodef> + </target> + <target depends="-init-modules-supported,-init-macrodef-modulename" if="modules.supported.internal" name="-init-source-module-properties"> + <fail message="Java 9 support requires Ant 1.10.0 or higher."> + <condition> + <not> + <antversion atleast="1.10.0"/> + </not> + </condition> + </fail> + <j2seproject3:modulename property="module.name" sourcepath="${src.dir}"/> + <condition property="named.module.internal"> + <and> + <isset property="module.name"/> + <length length="0" string="${module.name}" when="greater"/> + </and> + </condition> + <condition property="unnamed.module.internal"> + <not> + <isset property="named.module.internal"/> + </not> + </condition> + <property name="javac.modulepath" value=""/> + <property name="run.modulepath" value="${javac.modulepath}"/> + <property name="module.build.classes.dir" value="${build.classes.dir}"/> + <property name="debug.modulepath" value="${run.modulepath}"/> + <property name="javac.upgrademodulepath" value=""/> + <property name="run.upgrademodulepath" value="${javac.upgrademodulepath}"/> + <condition else="" property="javac.systemmodulepath.cmd.line.arg" value="--system '${javac.systemmodulepath}'"> + <and> + <isset property="javac.systemmodulepath"/> + <length length="0" string="${javac.systemmodulepath}" when="greater"/> + </and> + </condition> + <property name="dist.jlink.dir" value="${dist.dir}/jlink"/> + <property name="dist.jlink.output" value="${dist.jlink.dir}/${application.title}"/> + <property name="module.name" value=""/> + </target> + <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init"> + <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/> + <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/> + <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/> + <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/> + <condition property="platform.javac" value="${platform.home}/bin/javac"> + <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/> + </condition> + <property name="platform.javac" value="${platform.javac.tmp}"/> + <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/> + <condition property="platform.java" value="${platform.home}/bin/java"> + <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/> + </condition> + <property name="platform.java" value="${platform.java.tmp}"/> + <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/> + <condition property="platform.javadoc" value="${platform.home}/bin/javadoc"> + <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/> + </condition> + <property name="platform.javadoc" value="${platform.javadoc.tmp}"/> + <condition property="platform.invalid" value="true"> + <or> + <contains string="${platform.javac}" substring="$${platforms."/> + <contains string="${platform.java}" substring="$${platforms."/> + <contains string="${platform.javadoc}" substring="$${platforms."/> + </or> + </condition> + <fail unless="platform.home">Must set platform.home</fail> + <fail unless="platform.bootcp">Must set platform.bootcp</fail> + <fail unless="platform.java">Must set platform.java</fail> + <fail unless="platform.javac">Must set platform.javac</fail> + <fail if="platform.invalid"> + The J2SE Platform is not correctly set up. + Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. + Either open the project in the IDE and setup the Platform with the same name or add it manually. + For example like this: + ant -Duser.properties.file=<path_to_property_file> jar (where you put the property "platforms.${platform.active}.home" in a .properties file) + or ant -Dplatforms.${platform.active}.home=<path_to_JDK_home> jar (where no properties file is used) + </fail> <available file="${manifest.file}" property="manifest.available"/> <condition property="splashscreen.available"> <and> @@ -76,7 +177,9 @@ is divided into following sections: <and> <isset property="javac.profile"/> <length length="0" string="${javac.profile}" when="greater"/> - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/> + <not> + <matches pattern="1\.[0-7](\..*)?" string="${javac.source}"/> + </not> </and> </condition> <condition property="do.archive"> @@ -94,6 +197,9 @@ is divided into following sections: <not> <istrue value="${mkdist.disabled}"/> </not> + <not> + <istrue value="${modules.supported.internal}"/> + </not> </and> </condition> <condition property="do.archive+manifest.available"> @@ -156,6 +262,7 @@ is divided into following sections: <property name="application.args" value=""/> <property name="source.encoding" value="${file.encoding}"/> <property name="runtime.encoding" value="${source.encoding}"/> + <property name="manifest.encoding" value="${source.encoding}"/> <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> <and> <isset property="javadoc.encoding"/> @@ -183,20 +290,6 @@ is divided into following sections: <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}"> <isset property="profile.available"/> </condition> - <condition else="false" property="jdkBug6558476"> - <and> - <matches pattern="1\.[56]" string="${java.specification.version}"/> - <not> - <os family="unix"/> - </not> - </and> - </condition> - <condition else="false" property="javac.fork"> - <or> - <istrue value="${jdkBug6558476}"/> - <istrue value="${javac.external.vm}"/> - </or> - </condition> <property name="jar.index" value="false"/> <property name="jar.index.metainf" value="${jar.index}"/> <property name="copylibs.rebase" value="true"/> @@ -249,11 +342,80 @@ is divided into following sections: </sequential> </macrodef> </target> - <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors"> + <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> <attribute default="${src.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${javac.classpath}" name="classpath"/> + <attribute default="${javac.modulepath}" name="modulepath"/> + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/> + <attribute default="${javac.processorpath}" name="processorpath"/> + <attribute default="${javac.processormodulepath}" name="processormodulepath"/> + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="${javac.debug}" name="debug"/> + <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/> + <attribute default="${src.dir}" if:set="named.module.internal" name="sourcepath"/> + <attribute default="${empty.dir}" name="gensrcdir"/> + <element name="customize" optional="true"/> + <sequential> + <condition property="warn.excludes.internal"> + <and> + <isset property="named.module.internal"/> + <length length="0" string="@{excludes}" trim="true" when="greater"/> + </and> + </condition> + <echo if:set="warn.excludes.internal" level="warning" message="The javac excludes are not supported in the JDK 9 Named Module."/> + <property location="${build.dir}/empty" name="empty.dir"/> + <mkdir dir="${empty.dir}"/> + <mkdir dir="@{apgeneratedsrcdir}"/> + <condition property="processormodulepath.set"> + <resourcecount count="0" when="greater"> + <path> + <pathelement path="@{processormodulepath}"/> + </path> + </resourcecount> + </condition> + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> + <src> + <dirset dir="@{gensrcdir}" erroronmissingdir="false"> + <include name="*"/> + </dirset> + </src> + <classpath> + <path path="@{classpath}"/> + </classpath> + <modulepath> + <path path="@{modulepath}"/> + </modulepath> + <upgrademodulepath> + <path path="@{upgrademodulepath}"/> + </upgrademodulepath> + <compilerarg line="${javac.systemmodulepath.cmd.line.arg}"/> + <compilerarg line="${javac.profile.cmd.line.arg}"/> + <compilerarg line="${javac.compilerargs}"/> + <compilerarg if:set="processormodulepath.set" value="--processor-module-path"/> + <compilerarg if:set="processormodulepath.set" path="@{processormodulepath}"/> + <compilerarg unless:set="processormodulepath.set" value="-processorpath"/> + <compilerarg path="@{processorpath}:${empty.dir}" unless:set="processormodulepath.set"/> + <compilerarg line="${ap.processors.internal}"/> + <compilerarg line="${annotation.processing.processor.options}"/> + <compilerarg value="-s"/> + <compilerarg path="@{apgeneratedsrcdir}"/> + <compilerarg line="${ap.proc.none.internal}"/> + <customize/> + </javac> + </sequential> + </macrodef> + </target> + <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal"> + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${src.dir}" name="srcdir"/> + <attribute default="${build.classes.dir}" name="destdir"/> + <attribute default="${javac.classpath}" name="classpath"/> + <attribute default="${javac.modulepath}" name="modulepath"/> + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/> <attribute default="${javac.processorpath}" name="processorpath"/> <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> <attribute default="${includes}" name="includes"/> @@ -266,7 +428,7 @@ is divided into following sections: <property location="${build.dir}/empty" name="empty.dir"/> <mkdir dir="${empty.dir}"/> <mkdir dir="@{apgeneratedsrcdir}"/> - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> <src> <dirset dir="@{gensrcdir}" erroronmissingdir="false"> <include name="*"/> @@ -290,11 +452,13 @@ is divided into following sections: </sequential> </macrodef> </target> - <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> + <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> <attribute default="${src.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${javac.classpath}" name="classpath"/> + <attribute default="${javac.modulepath}" name="modulepath"/> + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/> <attribute default="${javac.processorpath}" name="processorpath"/> <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> <attribute default="${includes}" name="includes"/> @@ -306,7 +470,7 @@ is divided into following sections: <sequential> <property location="${build.dir}/empty" name="empty.dir"/> <mkdir dir="${empty.dir}"/> - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> <src> <dirset dir="@{gensrcdir}" erroronmissingdir="false"> <include name="*"/> @@ -323,7 +487,7 @@ is divided into following sections: </sequential> </macrodef> </target> - <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> + <target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3"> <attribute default="${src.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> @@ -378,59 +542,99 @@ is divided into following sections: <property name="test.binarytestincludes" value=""/> <property name="test.binaryexcludes" value=""/> </target> - <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}"> - <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3"> + <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-junit-prototype-with-module"> + <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3"> <attribute default="${includes}" name="includes"/> <attribute default="${excludes}" name="excludes"/> - <attribute default="**" name="testincludes"/> - <attribute default="" name="testmethods"/> - <element name="customize" optional="true"/> + <element name="customizePrototype" optional="true"/> <sequential> <property name="junit.forkmode" value="perTest"/> - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> - <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> <syspropertyset> <propertyref prefix="test-sys-prop."/> <mapper from="test-sys-prop.*" to="*" type="glob"/> </syspropertyset> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + <modulepath> + <path path="${run.test.modulepath}"/> + </modulepath> <formatter type="brief" usefile="false"/> <formatter type="xml"/> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg value="-ea"/> - <customize/> + <jvmarg line="${run.test.jvmargs}"/> + <customizePrototype/> </junit> </sequential> </macrodef> </target> - <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}"> - <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3"> + <target depends="-init-modules-supported" name="-init-macrodef-junit-prototype-without-module" unless="modules.supported.internal"> + <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3"> <attribute default="${includes}" name="includes"/> <attribute default="${excludes}" name="excludes"/> - <attribute default="**" name="testincludes"/> - <attribute default="" name="testmethods"/> - <element name="customize" optional="true"/> + <element name="customizePrototype" optional="true"/> <sequential> <property name="junit.forkmode" value="perTest"/> - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> - <batchtest todir="${build.test.results.dir}"> - <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> - <filename name="${test.binarytestincludes}"/> - </fileset> - </batchtest> + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> <syspropertyset> <propertyref prefix="test-sys-prop."/> <mapper from="test-sys-prop.*" to="*" type="glob"/> </syspropertyset> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> <formatter type="brief" usefile="false"/> <formatter type="xml"/> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg value="-ea"/> - <customize/> + <customizePrototype/> </junit> </sequential> </macrodef> </target> + <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}"> + <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="**" name="testincludes"/> + <attribute default="" name="testmethods"/> + <element name="customize" optional="true"/> + <sequential> + <j2seproject3:junit-prototype> + <customizePrototype> + <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> + <customize/> + </customizePrototype> + </j2seproject3:junit-prototype> + </sequential> + </macrodef> + </target> + <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}"> + <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="**" name="testincludes"/> + <attribute default="" name="testmethods"/> + <element name="customize" optional="true"/> + <sequential> + <j2seproject3:junit-prototype> + <customizePrototype> + <batchtest todir="${build.test.results.dir}"> + <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> + <filename name="${test.binarytestincludes}"/> + </fileset> + </batchtest> + <customize/> + </customizePrototype> + </j2seproject3:junit-prototype> + </sequential> + </macrodef> + </target> <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/> <target if="${testng.available}" name="-init-macrodef-testng"> <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3"> @@ -449,12 +653,16 @@ is divided into following sections: </fileset> </union> <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> - <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="LambdaLab" testname="TestNG tests" workingDir="${work.dir}"> + <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="LambdaLab" testname="TestNG tests" workingDir="${work.dir}"> <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> <propertyset> <propertyref prefix="test-sys-prop."/> <mapper from="test-sys-prop.*" to="*" type="glob"/> </propertyset> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <customize/> </testng> </sequential> @@ -509,10 +717,6 @@ is divided into following sections: <sequential> <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> <customize> - <classpath> - <path path="${run.test.classpath}"/> - </classpath> - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg line="${run.jvmargs}"/> <jvmarg line="${run.jvmargs.ide}"/> </customize> @@ -520,74 +724,20 @@ is divided into following sections: </sequential> </macrodef> </target> - <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}"> - <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3"> - <attribute default="${includes}" name="includes"/> - <attribute default="${excludes}" name="excludes"/> - <attribute default="**" name="testincludes"/> - <attribute default="" name="testmethods"/> - <element name="customize" optional="true"/> - <sequential> - <property name="junit.forkmode" value="perTest"/> - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> - <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> - <syspropertyset> - <propertyref prefix="test-sys-prop."/> - <mapper from="test-sys-prop.*" to="*" type="glob"/> - </syspropertyset> - <formatter type="brief" usefile="false"/> - <formatter type="xml"/> - <jvmarg value="-ea"/> - <jvmarg line="${debug-args-line}"/> - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> - <customize/> - </junit> - </sequential> - </macrodef> - </target> - <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch"> - <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3"> - <attribute default="${includes}" name="includes"/> - <attribute default="${excludes}" name="excludes"/> - <attribute default="**" name="testincludes"/> - <attribute default="" name="testmethods"/> - <element name="customize" optional="true"/> - <sequential> - <property name="junit.forkmode" value="perTest"/> - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> - <batchtest todir="${build.test.results.dir}"> - <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> - <filename name="${test.binarytestincludes}"/> - </fileset> - </batchtest> - <syspropertyset> - <propertyref prefix="test-sys-prop."/> - <mapper from="test-sys-prop.*" to="*" type="glob"/> - </syspropertyset> - <formatter type="brief" usefile="false"/> - <formatter type="xml"/> - <jvmarg value="-ea"/> - <jvmarg line="${debug-args-line}"/> - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> - <customize/> - </junit> - </sequential> - </macrodef> - </target> - <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl"> + <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-debug-impl"> <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3"> <attribute default="${includes}" name="includes"/> <attribute default="${excludes}" name="excludes"/> <attribute default="**" name="testincludes"/> <attribute default="" name="testmethods"/> - <element implicit="true" name="customize" optional="true"/> + <element name="customizeDebuggee" optional="true"/> <sequential> - <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> - <customize/> - </j2seproject3:junit-debug> + <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> + <customize> + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> + <customizeDebuggee/> + </customize> + </j2seproject3:junit> </sequential> </macrodef> </target> @@ -606,14 +756,14 @@ is divided into following sections: <delete dir="${build.test.results.dir}" quiet="true"/> <mkdir dir="${build.test.results.dir}"/> <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}"> - <customize> + <customizeDebuggee> <customize2/> <jvmarg value="-ea"/> <arg line="${testng.debug.mode}"/> <arg line="-d ${build.test.results.dir}"/> <arg line="-listener org.testng.reporters.VerboseReporter"/> <arg line="${testng.cmd.args}"/> - </customize> + </customizeDebuggee> </j2seproject3:debug> </sequential> </macrodef> @@ -640,14 +790,10 @@ is divided into following sections: <attribute default="" name="testMethod"/> <sequential> <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> - <customize> - <classpath> - <path path="${run.test.classpath}"/> - </classpath> - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> + <customizeDebuggee> <jvmarg line="${run.jvmargs}"/> <jvmarg line="${run.jvmargs.ide}"/> - </customize> + </customizeDebuggee> </j2seproject3:test-debug-impl> </sequential> </macrodef> @@ -727,13 +873,20 @@ is divided into following sections: <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1"> <attribute default="${main.class}" name="name"/> + <attribute default="${debug.modulepath}" name="modulepath"/> <attribute default="${debug.classpath}" name="classpath"/> <attribute default="" name="stopclassname"/> <sequential> <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}"> + <modulepath> + <path path="@{modulepath}"/> + </modulepath> <classpath> <path path="@{classpath}"/> </classpath> + <bootclasspath> + <path path="${platform.bootcp}"/> + </bootclasspath> </nbjpdastart> </sequential> </macrodef> @@ -749,18 +902,6 @@ is divided into following sections: </macrodef> </target> <target name="-init-debug-args"> - <property name="version-output" value="java version "${ant.java.version}"/> - <condition property="have-jdk-older-than-1.4"> - <or> - <contains string="${version-output}" substring="java version "1.0"/> - <contains string="${version-output}" substring="java version "1.1"/> - <contains string="${version-output}" substring="java version "1.2"/> - <contains string="${version-output}" substring="java version "1.3"/> - </or> - </condition> - <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none"> - <istrue value="${have-jdk-older-than-1.4}"/> - </condition> <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem"> <os family="windows"/> </condition> @@ -770,21 +911,79 @@ is divided into following sections: </target> <target depends="-init-debug-args" name="-init-macrodef-debug"> <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${module.name}" name="modulename"/> <attribute default="${main.class}" name="classname"/> + <attribute default="${debug.modulepath}" name="modulepath"/> <attribute default="${debug.classpath}" name="classpath"/> + <element name="customizeDebuggee" optional="true"/> + <sequential> + <j2seproject1:java classname="@{classname}" classpath="@{classpath}" modulename="@{modulename}" modulepath="@{modulepath}"> + <customize> + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> + <customizeDebuggee/> + </customize> + </j2seproject1:java> + </sequential> + </macrodef> + </target> + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-macrodef-java-with-module"> + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1"> + <attribute default="${module.name}" name="modulename"/> + <attribute default="${main.class}" name="classname"/> + <attribute default="${run.modulepath}" name="modulepath"/> + <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/> + <attribute default="${run.classpath}" name="classpath"/> + <attribute default="jvm" name="jvm"/> <element name="customize" optional="true"/> <sequential> - <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> - <jvmarg line="${debug-args-line}"/> - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}" module="@{modulename}"> + <classpath> + <path path="@{classpath}"/> + </classpath> + <modulepath> + <pathelement path="@{modulepath}"/> + <pathelement location="${module.build.classes.dir}"/> + </modulepath> + <upgrademodulepath> + <path path="@{upgrademodulepath}"/> + </upgrademodulepath> <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> <jvmarg line="${run.jvmargs}"/> <jvmarg line="${run.jvmargs.ide}"/> + <syspropertyset> + <propertyref prefix="run-sys-prop."/> + <mapper from="run-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <customize/> + </java> + </sequential> + </macrodef> + </target> + <target depends="-init-source-module-properties" if="unnamed.module.internal" name="-init-macrodef-java-with-unnamed-module"> + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1"> + <attribute default="" name="modulename"/> + <attribute default="${main.class}" name="classname"/> + <attribute default="${run.modulepath}" name="modulepath"/> + <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/> + <attribute default="${run.classpath}" name="classpath"/> + <attribute default="jvm" name="jvm"/> + <element name="customize" optional="true"/> + <sequential> + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}"> <classpath> <path path="@{classpath}"/> </classpath> + <modulepath> + <path path="@{modulepath}"/> + </modulepath> + <upgrademodulepath> + <path path="@{upgrademodulepath}"/> + </upgrademodulepath> + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> + <jvmarg line="${run.jvmargs}"/> + <jvmarg line="${run.jvmargs.ide}"/> <syspropertyset> <propertyref prefix="run-sys-prop."/> <mapper from="run-sys-prop.*" to="*" type="glob"/> @@ -794,14 +993,16 @@ is divided into following sections: </sequential> </macrodef> </target> - <target name="-init-macrodef-java"> + <target depends="-init-source-module-properties" name="-init-macrodef-java-without-module" unless="modules.supported.internal"> <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1"> + <attribute default="" name="modulename"/> <attribute default="${main.class}" name="classname"/> + <attribute default="" name="modulepath"/> <attribute default="${run.classpath}" name="classpath"/> <attribute default="jvm" name="jvm"/> <element name="customize" optional="true"/> <sequential> - <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}"> <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> @@ -819,6 +1020,7 @@ is divided into following sections: </sequential> </macrodef> </target> + <target depends="-init-macrodef-java-with-module, -init-macrodef-java-with-unnamed-module, -init-macrodef-java-without-module" name="-init-macrodef-java"/> <target name="-init-macrodef-copylibs"> <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3"> <attribute default="${manifest.file}" name="manifest"/> @@ -840,7 +1042,7 @@ is divided into following sections: </chainedmapper> </pathconvert> <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> - <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> <manifest> <attribute name="Class-Path" value="${jar.classpath}"/> @@ -852,7 +1054,7 @@ is divided into following sections: </target> <target name="-init-presetdef-jar"> <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"> + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8"> <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> </jar> </presetdef> @@ -908,7 +1110,9 @@ is divided into following sections: <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/> </target> <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build"> - <antcall target="clean"/> + <antcall target="clean"> + <param name="no.dependencies" value="true"/> + </antcall> </target> <target depends="init,deps-jar" name="-pre-pre-compile"> <mkdir dir="${build.classes.dir}"/> @@ -949,7 +1153,7 @@ is divided into following sections: <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single"> <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> <j2seproject3:force-recompile/> - <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/> + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}"/> </target> <target name="-post-compile-single"> <!-- Empty placeholder for easier customization. --> @@ -969,21 +1173,40 @@ is divided into following sections: <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> + <target depends="init,compile" name="-check-module-main-class"> + <pathconvert property="main.class.file"> + <string value="${main.class}"/> + <unpackagemapper from="*" to="*.class"/> + </pathconvert> + <condition property="do.module.main.class"> + <and> + <isset property="main.class.available"/> + <available file="${build.classes.dir}/module-info.class"/> + <available file="${build.classes.dir}/${main.class.file}"/> + <isset property="libs.CopyLibs.classpath"/> + <available classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}"/> + </and> + </condition> + </target> + <target depends="-check-module-main-class" if="do.module.main.class" name="-set-module-main-class"> + <taskdef classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}" name="modulemainclass"/> + <modulemainclass failonerror="false" mainclass="${main.class}" moduleinfo="${build.classes.dir}/module-info.class"/> + </target> <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available"> <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> <touch file="${tmp.manifest.file}" verbose="false"/> </target> <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest"> <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/> </target> <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass"> - <manifest file="${tmp.manifest.file}" mode="update"> + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> <attribute name="Main-Class" value="${main.class}"/> </manifest> </target> <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile"> - <manifest file="${tmp.manifest.file}" mode="update"> + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> <attribute name="Profile" value="${javac.profile}"/> </manifest> </target> @@ -991,7 +1214,7 @@ is divided into following sections: <basename file="${application.splash}" property="splashscreen.basename"/> <mkdir dir="${build.classes.dir}/META-INF"/> <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> - <manifest file="${tmp.manifest.file}" mode="update"> + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> </manifest> </target> @@ -999,17 +1222,43 @@ is divided into following sections: <j2seproject3:copylibs manifest="${tmp.manifest.file}"/> <echo level="info">To run this application from the command line without Ant, try:</echo> <property location="${dist.jar}" name="dist.jar.resolved"/> - <echo level="info">java -jar "${dist.jar.resolved}"</echo> + <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo> </target> <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist"> <j2seproject1:jar manifest="${tmp.manifest.file}"/> <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> <property location="${dist.jar}" name="dist.jar.resolved"/> + <condition else="${dist.jar.resolved}" property="jar.usage.message.class.path.replacement" value=""> + <isset property="named.module.internal"/> + </condition> <pathconvert property="run.classpath.with.dist.jar"> <path path="${run.classpath}"/> + <map from="${build.classes.dir.resolved}" to="${jar.usage.message.class.path.replacement}"/> + </pathconvert> + <pathconvert property="run.modulepath.with.dist.jar"> + <path location="${dist.jar.resolved}"/> + <path path="${run.modulepath}"/> <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/> </pathconvert> - <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}"> + <condition else="${run.modulepath}" property="jar.usage.message.run.modulepath.with.dist.jar" value="${run.modulepath.with.dist.jar}"> + <isset property="named.module.internal"/> + </condition> + <condition else="" property="jar.usage.message.module.path" value=" -p ${jar.usage.message.run.modulepath.with.dist.jar}"> + <and> + <isset property="modules.supported.internal"/> + <length length="0" string="${jar.usage.message.run.modulepath.with.dist.jar}" when="greater"/> + </and> + </condition> + <condition else="" property="jar.usage.message.class.path" value=" -cp ${run.classpath.with.dist.jar}"> + <length length="0" string="${run.classpath.with.dist.jar}" when="greater"/> + </condition> + <condition else="/${main.class}" property="jar.usage.message.main.class.class.selector" value=""> + <isset property="do.module.main.class"/> + </condition> + <condition else=" ${main.class}" property="jar.usage.message.main.class" value=" -m ${module.name}${jar.usage.message.main.class.class.selector}"> + <isset property="named.module.internal"/> + </condition> + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java}${jar.usage.message.module.path}${jar.usage.message.class.path}${jar.usage.message.main.class}"> <isset property="main.class.available"/> </condition> <condition else="debug" property="jar.usage.level" value="info"> @@ -1028,8 +1277,73 @@ is divided into following sections: <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/> - <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/> + <target depends="init,compile,-pre-jar,-set-module-main-class,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/> + <target depends="init,compile,-pre-jar,-do-jar,-post-jar,deploy" description="Build JAR." name="jar"/> + <!-- + ================= + DEPLOY SECTION + ================= + --> + <target name="-pre-deploy"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init" name="-check-jlink"> + <condition property="do.jlink.internal"> + <and> + <istrue value="${do.jlink}"/> + <isset property="do.archive"/> + <isset property="named.module.internal"/> + </and> + </condition> + </target> + <target depends="init,-do-jar,-post-jar,-pre-deploy,-check-jlink" if="do.jlink.internal" name="-do-deploy"> + <delete dir="${dist.jlink.dir}" failonerror="false" quiet="true"/> + <property name="jlink.launcher.name" value="${application.title}"/> + <condition else="${module.name}" property="jlink.add.modules" value="${module.name},${jlink.additionalmodules}"> + <and> + <isset property="jlink.additionalmodules"/> + <length length="0" string="${jlink.additionalmodules}" when="greater"/> + </and> + </condition> + <condition property="jlink.do.strip.internal"> + <and> + <isset property="jlink.strip"/> + <istrue value="${jlink.strip}"/> + </and> + </condition> + <condition property="jlink.do.additionalparam.internal"> + <and> + <isset property="jlink.additionalparam"/> + <length length="0" string="${jlink.additionalparam}" when="greater"/> + </and> + </condition> + <condition property="jlink.do.launcher.internal"> + <and> + <istrue value="${jlink.launcher}"/> + <isset property="main.class.available"/> + </and> + </condition> + <property name="platform.jlink" value="${platform.home}/bin/jlink"/> + <property name="jlink.systemmodules.internal" value="${platform.home}/jmods"/> + <exec executable="${platform.jlink}"> + <arg value="--module-path"/> + <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/> + <arg value="--add-modules"/> + <arg value="${jlink.add.modules}"/> + <arg if:set="jlink.do.strip.internal" value="--strip-debug"/> + <arg if:set="jlink.do.launcher.internal" value="--launcher"/> + <arg if:set="jlink.do.launcher.internal" value="${jlink.launcher.name}=${module.name}/${main.class}"/> + <arg if:set="jlink.do.additionalparam.internal" line="${jlink.additionalparam}"/> + <arg value="--output"/> + <arg value="${dist.jlink.output}"/> + </exec> + </target> + <target name="-post-deploy"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="-do-jar,-post-jar,-pre-deploy,-do-deploy,-post-deploy" name="deploy"/> <!-- ================= EXECUTION SECTION @@ -1066,9 +1380,9 @@ is divided into following sections: </target> <target depends="init,compile" name="-debug-start-debuggee"> <j2seproject3:debug> - <customize> + <customizeDebuggee> <arg line="${application.args}"/> - </customize> + </customizeDebuggee> </j2seproject3:debug> </target> <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/> @@ -1134,28 +1448,24 @@ is divided into following sections: </customize> </profile> </target> - <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72"> + <target depends="-init-macrodef-junit,profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72"> <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail> <nbprofiledirect> <classpath> <path path="${run.test.classpath}"/> </classpath> </nbprofiledirect> - <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> - <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> - <jvmarg value="${profiler.info.jvmargs.agent}"/> - <jvmarg line="${profiler.info.jvmargs}"/> - <test name="${profile.class}"/> - <classpath> - <path path="${run.test.classpath}"/> - </classpath> - <syspropertyset> - <propertyref prefix="test-sys-prop."/> - <mapper from="test-sys-prop.*" to="*" type="glob"/> - </syspropertyset> - <formatter type="brief" usefile="false"/> - <formatter type="xml"/> - </junit> + <j2seproject3:junit excludes="${excludes}" includes="${includes}" testincludes="${profile.class}" testmethods=""> + <customize> + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> + <jvmarg value="${profiler.info.jvmargs.agent}"/> + <jvmarg line="${profiler.info.jvmargs}"/> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + </customize> + </j2seproject3:junit> </target> <!-- end of pre NB72 profiling section @@ -1186,7 +1496,7 @@ is divided into following sections: <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main"> <fail unless="run.class">Must select one file in the IDE or set run.class</fail> <startprofiler/> - <antcal target="run-test-with-main"/> + <antcall target="run-test-with-main"/> </target> <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent"> <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail> @@ -1208,10 +1518,19 @@ is divided into following sections: </not> </and> </condition> + <exec executable="${platform.java}" failonerror="false" outputproperty="platform.version.output"> + <arg value="-version"/> + </exec> <condition else="" property="bug5101868workaround" value="*.java"> - <matches pattern="1\.[56](\..*)?" string="${java.version}"/> + <matches multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/> </condition> - <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> + <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5"> + <and> + <isset property="javadoc.html5"/> + <available file="${platform.home}${file.separator}lib${file.separator}jrt-fs.jar"/> + </and> + </condition> + <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> <classpath> <path path="${javac.classpath}"/> </classpath> @@ -1223,6 +1542,7 @@ is divided into following sections: <exclude name="*.java"/> </fileset> <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/> + <arg line="${javadoc.html5.cmd.line.arg}"/> </javadoc> <copy todir="${dist.javadoc.dir}"> <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> @@ -1249,11 +1569,63 @@ is divided into following sections: <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module"> + <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}"/> + <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}"> + <and> + <isset property="test.module.name"/> + <length length="0" string="${test.module.name}" when="greater"/> + </and> + </condition> + <condition else="--patch-module ${module.name}=${test.src.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED"> + <and> + <isset property="test.module.name"/> + <length length="0" string="${test.module.name}" when="greater"/> + </and> + </condition> + </target> + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-run-module-properties"> + <condition else="${module.name}" property="run.test.addexport.source.module.internal" value="${test.module.name}"> + <and> + <isset property="test.module.name"/> + <length length="0" string="${test.module.name}" when="greater"/> + </and> + </condition> + <fileset dir="${build.test.classes.dir}" id="run.test.packages.internal" includes="**/*.class"/> + <property location="${build.test.classes.dir}" name="build.test.classes.dir.abs.internal"/> + <pathconvert pathsep=" " property="run.test.addexports.internal" refid="run.test.packages.internal"> + <chainedmapper> + <regexpmapper from="^(.*)\Q${file.separator}\E.*\.class$$" to="\1"/> + <filtermapper> + <uniqfilter/> + <replacestring from="${build.test.classes.dir.abs.internal}" to=""/> + </filtermapper> + <cutdirsmapper dirs="1"/> + <packagemapper from="*" to="--add-exports ${run.test.addexport.source.module.internal}/*=ALL-UNNAMED"/> + </chainedmapper> + </pathconvert> + <condition else="--patch-module ${module.name}=${build.test.classes.dir} --add-modules ${module.name} --add-reads ${module.name}=ALL-UNNAMED ${run.test.addexports.internal}" property="run.test.jvmargs" value="--add-modules ${test.module.name} --add-reads ${test.module.name}=ALL-UNNAMED ${run.test.addexports.internal}"> + <and> + <isset property="test.module.name"/> + <length length="0" string="${test.module.name}" when="greater"/> + </and> + </condition> + </target> + <target depends="-init-source-module-properties" name="-init-test-module-properties-without-module" unless="named.module.internal"> + <property name="javac.test.sourcepath" value="${empty.dir}"/> + <property name="javac.test.compilerargs" value=""/> + <property name="run.test.jvmargs" value=""/> + </target> + <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/> <target if="do.depend.true" name="-compile-test-depend"> <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/> </target> - <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> - <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/> + <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> + <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.src.dir}"> + <customize> + <compilerarg line="${javac.test.compilerargs}"/> + </customize> + </j2seproject3:javac> <copy todir="${build.test.classes.dir}"> <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> </copy> @@ -1267,10 +1639,14 @@ is divided into following sections: <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> + <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> - <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/> + <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"> + <customize> + <compilerarg line="${javac.test.compilerargs}"/> + </customize> + </j2seproject3:javac> <copy todir="${build.test.classes.dir}"> <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> </copy> @@ -1288,7 +1664,7 @@ is divided into following sections: <target depends="init" if="have.tests" name="-pre-test-run"> <mkdir dir="${build.test.results.dir}"/> </target> - <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> + <target depends="init,compile-test,-init-test-run-module-properties,-pre-test-run" if="have.tests" name="-do-test-run"> <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/> </target> <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> @@ -1300,14 +1676,14 @@ is divided into following sections: <target depends="init" if="have.tests" name="-pre-test-run-single"> <mkdir dir="${build.test.results.dir}"/> </target> - <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single"> + <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-do-test-run-single"> <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail> <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/> </target> <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> </target> - <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> + <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method"> <fail unless="test.class">Must select some files in the IDE or set test.class</fail> <fail unless="test.method">Must select some method in the IDE or set test.method</fail> @@ -1316,7 +1692,7 @@ is divided into following sections: <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method"> <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> </target> - <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/> + <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/> <!-- ======================= TEST DEBUGGING SECTION @@ -1334,8 +1710,8 @@ is divided into following sections: <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test"> <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/> </target> - <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> - <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/> + <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> + <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/> <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/> </target> @@ -1361,9 +1737,9 @@ is divided into following sections: <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet"> <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail> <j2seproject3:debug classname="sun.applet.AppletViewer"> - <customize> + <customizeDebuggee> <arg value="${applet.url}"/> - </customize> + </customizeDebuggee> </j2seproject3:debug> </target> <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/> @@ -1390,6 +1766,7 @@ is divided into following sections: </target> <target depends="init" name="-do-clean"> <delete dir="${build.dir}"/> + <delete dir="${dist.jlink.output}"/> <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/> </target> <target name="-post-clean"> diff --git a/LambdaLab/nbproject/genfiles.properties b/LambdaLab/nbproject/genfiles.properties index c762ad8..844bba4 100644 --- a/LambdaLab/nbproject/genfiles.properties +++ b/LambdaLab/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=125f467b build.xml.stylesheet.CRC32=8064a381@1.68.0.46 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=acb17315 -nbproject/build-impl.xml.script.CRC32=90e27af1 -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48 +nbproject/build-impl.xml.data.CRC32=1fc2d32a +nbproject/build-impl.xml.script.CRC32=8c7318cd +nbproject/build-impl.xml.stylesheet.CRC32=bade6ae5@1.88.0.48 diff --git a/LambdaLab/nbproject/project.properties b/LambdaLab/nbproject/project.properties index ba97882..239e9f6 100644 --- a/LambdaLab/nbproject/project.properties +++ b/LambdaLab/nbproject/project.properties @@ -21,8 +21,12 @@ build.test.results.dir=${build.dir}/test/results #debug.transport=dt_socket debug.classpath=\ ${run.classpath} +debug.modulepath=\ + ${run.modulepath} debug.test.classpath=\ ${run.test.classpath} +debug.test.modulepath=\ + ${run.test.modulepath} # Files in build.classes.dir which should be excluded from distribution jar dist.archive.excludes= # This directory is removed when the project is cleaned: @@ -38,6 +42,8 @@ javac.classpath= javac.compilerargs= javac.deprecation=false javac.external.vm=false +javac.modulepath= +javac.processormodulepath= javac.processorpath=\ ${javac.classpath} javac.source=1.8 @@ -47,11 +53,14 @@ javac.test.classpath=\ ${build.classes.dir}:\ ${libs.junit_4.classpath}:\ ${libs.hamcrest.classpath} +javac.test.modulepath=\ + ${javac.modulepath} javac.test.processorpath=\ ${javac.test.classpath} javadoc.additionalparam= javadoc.author=false javadoc.encoding=${source.encoding} +javadoc.html5=false javadoc.noindex=false javadoc.nonavbar=false javadoc.notree=false @@ -60,10 +69,12 @@ javadoc.splitindex=true javadoc.use=true javadoc.version=false javadoc.windowtitle= +jlink.launcher=false +jlink.launcher.name=LambdaLab main.class=support.Dummy meta.inf.dir=${src.dir}/META-INF mkdist.disabled=true -platform.active=default_platform +platform.active=JDK-9_181 run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} @@ -71,9 +82,13 @@ run.classpath=\ # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. # To set system properties for unit tests define test-sys-prop.name=value: run.jvmargs= +run.modulepath=\ + ${javac.modulepath} run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} +run.test.modulepath=\ + ${javac.test.modulepath} source.encoding=UTF-8 src.dir=src test.src.dir=test diff --git a/LambdaLab/nbproject/project.xml b/LambdaLab/nbproject/project.xml index 8e5d831..b279e48 100644 --- a/LambdaLab/nbproject/project.xml +++ b/LambdaLab/nbproject/project.xml @@ -4,6 +4,7 @@ <configuration> <data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <name>LambdaLab</name> + <explicit-platform explicit-source-supported="true"/> <source-roots> <root id="src.dir"/> </source-roots> diff --git a/LambdaLab/test/exercises/B_Comparators.java b/LambdaLab/test/exercises/B_Comparators.java index 1b54b25..24fc85c 100644 --- a/LambdaLab/test/exercises/B_Comparators.java +++ b/LambdaLab/test/exercises/B_Comparators.java @@ -6,6 +6,7 @@ import java.util.function.IntBinaryOperator; import org.junit.Ignore; import org.junit.Test; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -27,13 +28,13 @@ public class B_Comparators { final Person jermaine = new Person("Jermaine", "Jackson", 61); /** - * Write a Comparator that compare intances of String using their length. + * Write a Comparator that compare intances of String using their length. * For instance FOUR (4 letters) is greater than TWO (three letters) */ @Test @Ignore - public void comparator0a() { + public void comparator01() { Comparator<String> compareByLength = null; // TODO - + assertTrue(compareByLength.compare("FOUR", "TWO") > 0); assertTrue(compareByLength.compare("ONE", "SEVEN") < 0); assertTrue(compareByLength.compare("ONE", "TWO") == 0); @@ -44,15 +45,15 @@ public class B_Comparators { // how you implemented functions in the previous exercises. Write it using // a method reference. // </editor-fold> - + /** - * Write a Comparator that compare intances of String using their length. - * If the lengths are the same, then use the alphabetical order. + * Write a Comparator that compare intances of String using their length. + * If the lengths are the same, then use the alphabetical order. */ @Test @Ignore - public void comparator0b() { + public void comparator02() { Comparator<String> compareByLengthThenAlphabetical = null; // TODO - + assertTrue(compareByLengthThenAlphabetical.compare("FOUR", "TWO") > 0); assertTrue(compareByLengthThenAlphabetical.compare("ONE", "SEVEN") < 0); assertTrue(compareByLengthThenAlphabetical.compare("ONE", "TWO") < 0); @@ -61,17 +62,17 @@ public class B_Comparators { } // Hint: // <editor-fold defaultstate="collapsed"> - // Use the previous comparator and check the default methods of the + // Use the previous comparator and check the default methods of the // Comparator interface. - // Check also the factory methods of the Comparator interface, and remember - // that String is comparable. + // Check also the factory methods of the Comparator interface, and remember + // that String is comparable. // </editor-fold> - + /** * Write a Comparator that compares instances of Person using their lastName. */ @Test @Ignore - public void comparator1() { + public void comparator03() { Comparator<Person> comparebyLastName = null; // TODO assertTrue(comparebyLastName.compare(michael, rod) < 0); @@ -90,7 +91,7 @@ public class B_Comparators { * lastName, and if their last name is the same, uses their first name. */ @Test @Ignore - public void comparator2() { + public void comparator04() { Comparator<Person> comparebyLastNameThenFirstName = null; // TODO assertTrue(comparebyLastNameThenFirstName.compare(michael, rod) < 0); @@ -103,11 +104,11 @@ public class B_Comparators { // </editor-fold> /** - * Write a Comparator that compares the people in the reversed order than - * the one you wrote in the comparator2() exercise. + * Write a Comparator that compares the people in the order reversed from + * the one you wrote in the comparator04() exercise. */ @Test @Ignore - public void comparator3() { + public void comparator05() { Comparator<Person> comparebyLastNameThenFirstNameReversed = null; // TODO assertFalse(comparebyLastNameThenFirstNameReversed.compare(michael, rod) < 0); @@ -121,11 +122,11 @@ public class B_Comparators { /** * Write a Comparator that compares the people in the same order than the - * one you wrote in comparator2(), but that supports null values. The null + * one you wrote in comparator04(), but that supports null values. The null * values should be considered greater than any non-null values. */ @Test @Ignore - public void comparator4() { + public void comparator06() { Comparator<Person> comparebyLastNameThenFirstNameWithNull = null; // TODO assertTrue(comparebyLastNameThenFirstNameWithNull.compare(michael, rod) < 0); @@ -144,7 +145,7 @@ public class B_Comparators { * Try to write the comparator so as to avoid boxing of primitives. */ @Test @Ignore - public void comparator5() { + public void comparator07() { Comparator<Person> comparebyAge = null; // TODO assertTrue(comparebyAge.compare(michael, rod) < 0); @@ -165,7 +166,7 @@ public class B_Comparators { * functional interface we use is IntBinaryOperator. */ @Test @Ignore - public void comparator6() { + public void comparator08() { IntBinaryOperator intCompare = null; // TODO assertTrue(intCompare.applyAsInt(0, 1) < 0); @@ -185,7 +186,7 @@ public class B_Comparators { * a comparator. */ @Test @Ignore - public void comparator7() { + public void comparator09() { IntBinaryOperator intCompare = null; // TODO assertTrue(intCompare.applyAsInt(0, 1) < 0); @@ -212,7 +213,7 @@ public class B_Comparators { * and greater than any non-NaN value. */ @Test @Ignore - public void comparator8() { + public void comparator10() { DoubleToIntBiFunction doubleCompare = null; // TODO assertTrue(doubleCompare.applyAsInt(0.0, 1.0) < 0); diff --git a/LambdaLab/test/exercises/C_DefaultMethods.java b/LambdaLab/test/exercises/C_DefaultMethods.java index 196b0d3..f659eec 100644 --- a/LambdaLab/test/exercises/C_DefaultMethods.java +++ b/LambdaLab/test/exercises/C_DefaultMethods.java @@ -7,11 +7,12 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; import java.util.stream.Collectors; +import static org.junit.Assert.assertEquals; import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** @@ -25,7 +26,7 @@ public class C_DefaultMethods { * in-place by appending the string "new" to each one. */ @Test @Ignore - public void c1_appendNew() { + public void c01_appendNew() { List<StringBuilder> sbList = Arrays.asList( new StringBuilder("alfa"), new StringBuilder("bravo"), @@ -48,7 +49,7 @@ public class C_DefaultMethods { * Remove the words that have odd lengths from the list. */ @Test @Ignore - public void c2_removeOddLengthWords() { + public void c02_removeOddLengthWords() { List<String> list = new ArrayList<>(Arrays.asList( "alfa", "bravo", "charlie", "delta", "echo", "foxtrot")); @@ -66,7 +67,7 @@ public class C_DefaultMethods { * Replace every word in the list with its upper case equivalent. */ @Test @Ignore - public void c3_upcaseAllWords() { + public void c03_upcaseAllWords() { List<String> list = Arrays.asList( "alfa", "bravo", "charlie", "delta", "echo", "foxtrot"); @@ -87,7 +88,7 @@ public class C_DefaultMethods { * Integer key. This should mutate each StringBuilder value in-place. */ @Test @Ignore - public void c4_appendToMapValues() { + public void c04_appendToMapValues() { Map<Integer, StringBuilder> map = new TreeMap<>(); map.put(1, new StringBuilder("alfa")); map.put(2, new StringBuilder("bravo")); @@ -110,10 +111,10 @@ public class C_DefaultMethods { /** * Given a map whose keys are Integers and whose values are Strings, * append to each String the string representation of its corresponding - * Integer key. + * Integer key. */ @Test @Ignore - public void c4b_replaceMapValues() { + public void c05_replaceMapValues() { Map<Integer, String> map = new TreeMap<>(); map.put(1, "alfa"); map.put(2, "bravo"); @@ -137,7 +138,7 @@ public class C_DefaultMethods { * each word, and whose values are list of words with that length. */ @Test @Ignore - public void c5_mapOfListOfStringsByLength() { + public void c06_mapOfListOfStringsByLength() { List<String> list = Arrays.asList( "aardvark", "bison", "capybara", "alligator", "bushbaby", "chimpanzee", @@ -165,7 +166,7 @@ public class C_DefaultMethods { * separated by a colon (':'). */ @Test @Ignore - public void c6_mapOfStringByInitialCharacter() { + public void c07_mapOfStringByInitialCharacter() { List<String> list = Arrays.asList( "aardvark", "bison", "capybara", "alligator", "bushbaby", "chimpanzee", @@ -183,172 +184,163 @@ public class C_DefaultMethods { // <editor-fold defaultstate="collapsed"> // Use Map.merge() within Iterable.forEach(). // </editor-fold> - - + + /** - * For some reason the provided map has been filled with null values. - * This is a problem, beacuse everytime we get a value from this map, we - * need to protect our application against NullPointerException. - * Write a code to replace these null values with empty Strings. The - * set of the keys is provided, note that the "g" key is not in the map, - * and it should be. + * For some reason the provided map doesn't have mappings for all the keys. This + * is a problem, because if we call get() on a key that isn't present, it returns + * null, and we need to add checks to protect against NullPointerException. + * Write code to ensure that all missing keys are mapped to the empty string. */ @Test @Ignore - public void c7_mapWithNullValues() { + public void c08_mapWithMissingValues() { List<String> keys = Arrays.asList("a", "b", "c", "d", "e", "f", "g"); - Map<String, String> map = new HashMap<>(); - map.put("a", "alfa"); - map.put("b", "bravo"); - map.put("c", "charlie"); - map.put("d", "delta"); - map.put("e", null); - map.put("f", null); - + Map<String, String> map = new HashMap<>(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta")); + // TODO write code to fix the map - - assertEquals(7, map.size()); - assertEquals("alfa", map.get("a")); - assertEquals("bravo", map.get("b")); - assertEquals("charlie", map.get("c")); - assertEquals("delta", map.get("d")); - assertEquals("", map.get("e")); - assertEquals("", map.get("f")); - assertEquals("", map.get("g")); + + assertEquals(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta", + "e", "", + "f", "", + "g", ""), + map); } // Hint: // <editor-fold defaultstate="collapsed"> // Check the Map.putIfAbsent() default method. // </editor-fold> - - + + /** - * Another way of dealing with the problem of the previous example could - * be to remove the keys if the values are null. - * Write a code that removes the keys of the map if the associated value - * is null. + * In the previous example, we added map entries that had a default value. + * We've now determined that's incorrect, and we want to undo that. This + * time, we want to remove the entry if the value is the empty string. */ @Test @Ignore - public void c8_mapWithNullValues() { + public void c09_mapRemoveEntriesWithEmptyValues() { List<String> keys = Arrays.asList("a", "b", "c", "d", "e", "f", "g"); - Map<String, String> map = new HashMap<>(); - map.put("a", "alfa"); - map.put("b", "bravo"); - map.put("c", "charlie"); - map.put("d", "delta"); - map.put("e", null); - map.put("f", null); - + Map<String, String> map = new HashMap<>(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta", + "e", "", + "f", "", + "g", "")); + // TODO write code to fix the map - - assertEquals(4, map.size()); - assertEquals("alfa", map.get("a")); - assertEquals("bravo", map.get("b")); - assertEquals("charlie", map.get("c")); - assertEquals("delta", map.get("d")); + + assertEquals(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta"), + map); } // Hint: // <editor-fold defaultstate="collapsed"> - // Check the Map.remove() default method. + // Check the two-arg Map.remove() default method. // </editor-fold> - - + + /** - * Another way of dealing with the problem of the previous example could - * be to set the value to the empty string for the keys associated - * with null, without adding the missing "g" key. - * Write a code that sets the value to the empty String for the key that - * are in the maps, and associated with null. + * We need another way to deal with the problem of the previous example. + * Instead of removing entries whose value is the empty string, we want + * to replace the empty-string values with a value that's the key itself. + * Write the code to do that. */ @Test @Ignore - public void c9_mapWithNullValues() { + public void c10_mapReplaceEmptyValues() { List<String> keys = Arrays.asList("a", "b", "c", "d", "e", "f", "g"); - Map<String, String> map = new HashMap<>(); - map.put("a", "alfa"); - map.put("b", "bravo"); - map.put("c", "charlie"); - map.put("d", "delta"); - map.put("e", null); - map.put("f", null); - + Map<String, String> map = new HashMap<>(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta", + "e", "", + "f", "", + "g", "")); + // TODO write code to fix the map - - assertEquals(6, map.size()); - assertEquals("alfa", map.get("a")); - assertEquals("bravo", map.get("b")); - assertEquals("charlie", map.get("c")); - assertEquals("delta", map.get("d")); - assertEquals("", map.get("e")); - assertEquals("", map.get("f")); + + assertEquals(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta", + "e", "e", + "f", "f", + "g", "g"), + map); } // Hint: // <editor-fold defaultstate="collapsed"> // Check the Map.replace() default method that takes 3 arguments. // </editor-fold> - - + + /** - * We are still dealing with a map containing null value. This time, - * we want to put the values in upper case, and replace the null - * values with empty Strings. + * We are still dealing with a map with missing entries. For entries that + * are present, we want to convert the value to upper case; and for keys + * that are not present, we want to add an entry where the value is the + * same as the key. */ @Test @Ignore - public void c10_computeWithNullValues() { + public void c11_computeWithMissingEntries() { List<String> keys = Arrays.asList("a", "b", "c", "d", "e", "f", "g"); - Map<String, String> map = new HashMap<>(); - map.put("a", "alfa"); - map.put("b", "bravo"); - map.put("c", "charlie"); - map.put("d", "delta"); - map.put("e", null); - map.put("f", null); - + Map<String, String> map = new HashMap<>(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta")); + // TODO write code transform the map - - assertEquals(7, map.size()); - assertEquals("ALFA", map.get("a")); - assertEquals("BRAVO", map.get("b")); - assertEquals("CHARLIE", map.get("c")); - assertEquals("DELTA", map.get("d")); - assertEquals("", map.get("e")); - assertEquals("", map.get("f")); - assertEquals("", map.get("g")); + + assertEquals(Map.of("a", "ALFA", + "b", "BRAVO", + "c", "CHARLIE", + "d", "DELTA", + "e", "e", + "f", "f", + "g", "g"), + map); } // Hint: // <editor-fold defaultstate="collapsed"> - // Check the Map.compute() default method, read the Javadoc carefully - // for the handling of null values. + // Check the Map.compute() default method, and read the Javadoc carefully + // regarding the mappings that aren't present. // </editor-fold> - - + + /** - * We are still dealing with a map containing null value. This time, - * we want to put the values in upper case, and leave the null values andd - * absent keys as they are. + * The map now has several entries, some with valid values, and some + * with values that are the empty string. This time, we want to convert + * the non-empty values to upper case, but we want to remove the entries + * for which the values are the empty string. */ @Test @Ignore - public void c11_computeWithNullValues() { + public void c12_computeAndRemoveSomeEntries() { List<String> keys = Arrays.asList("a", "b", "c", "d", "e", "f", "g"); - Map<String, String> map = new HashMap<>(); - map.put("a", "alfa"); - map.put("b", "bravo"); - map.put("c", "charlie"); - map.put("d", "delta"); - map.put("e", null); - map.put("f", null); - + Map<String, String> map = new HashMap<>(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta", + "e", "", + "f", "", + "g", "")); + // TODO write code transform the map - - assertEquals(6, map.size()); - assertEquals("ALFA", map.get("a")); - assertEquals("BRAVO", map.get("b")); - assertEquals("CHARLIE", map.get("c")); - assertEquals("DELTA", map.get("d")); - assertEquals(null, map.get("e")); - assertEquals(null, map.get("f")); + + assertEquals(Map.of("a", "ALFA", + "b", "BRAVO", + "c", "CHARLIE", + "d", "DELTA"), + map); } // Hint: // <editor-fold defaultstate="collapsed"> - // Check the Map.computeIfPresent() default method, read the Javadoc carefully - // for the handling of null values. + // Check the Map.compute() default method, read the Javadoc carefully + // for the handling of null values returned from the function. // </editor-fold> } diff --git a/LambdaLab/test/solutions/B_Comparators.java b/LambdaLab/test/solutions/B_Comparators.java index 49b4d4b..2a2ebaf 100644 --- a/LambdaLab/test/solutions/B_Comparators.java +++ b/LambdaLab/test/solutions/B_Comparators.java @@ -28,16 +28,16 @@ public class B_Comparators { final Person jermaine = new Person("Jermaine", "Jackson", 61); /** - * Write a Comparator that compare intances of String using their length. + * Write a Comparator that compare intances of String using their length. * For instance FOUR (4 letters) is greater than TWO (three letters) */ @Test - public void comparator0a() { + public void comparator01() { //TODO//Comparator<String> compareByLength = null; //BEGINREMOVE Comparator<String> compareByLength = Comparator.comparing(String::length); //ENDREMOVE - + assertTrue(compareByLength.compare("FOUR", "TWO") > 0); assertTrue(compareByLength.compare("ONE", "SEVEN") < 0); assertTrue(compareByLength.compare("ONE", "TWO") == 0); @@ -50,17 +50,17 @@ public class B_Comparators { // </editor-fold> /** - * Write a Comparator that compare intances of String using their length. - * If the lengths are the same, then use the alphabetical order. + * Write a Comparator that compare intances of String using their length. + * If the lengths are the same, then use the alphabetical order. */ @Test - public void comparator0b() { + public void comparator02() { //TODO//Comparator<String> compareByLengthThenAlphabetical = null; //BEGINREMOVE - Comparator<String> compareByLengthThenAlphabetical = + Comparator<String> compareByLengthThenAlphabetical = Comparator.comparing(String::length).thenComparing(Comparator.naturalOrder()); //ENDREMOVE - + assertTrue(compareByLengthThenAlphabetical.compare("FOUR", "TWO") > 0); assertTrue(compareByLengthThenAlphabetical.compare("ONE", "SEVEN") < 0); assertTrue(compareByLengthThenAlphabetical.compare("ONE", "TWO") < 0); @@ -69,17 +69,17 @@ public class B_Comparators { } // Hint: // <editor-fold defaultstate="collapsed"> - // Use the previous comparator and check the default methods of the + // Use the previous comparator and check the default methods of the // Comparator interface. - // Check also the factory methods of the Comparator interface, and remember - // that String is comparable. + // Check also the factory methods of the Comparator interface, and remember + // that String is comparable. // </editor-fold> /** * Write a Comparator that compares instances of Person using their lastName. */ @Test - public void comparator1() { + public void comparator03() { //TODO//Comparator<Person> comparebyLastName = null; //BEGINREMOVE Comparator<Person> comparebyLastName = Comparator.comparing(Person::getLastName); @@ -101,7 +101,7 @@ public class B_Comparators { * lastName, and if their last name is the same, uses their first name. */ @Test - public void comparator2() { + public void comparator04() { //TODO//Comparator<Person> comparebyLastNameThenFirstName = null; //BEGINREMOVE Comparator<Person> comparebyLastNameThenFirstName = @@ -119,11 +119,11 @@ public class B_Comparators { // </editor-fold> /** - * Write a Comparator that compares the people in the reversed order than - * the one you wrote in the comparator2() exercise. + * Write a Comparator that compares the people in the order reversed from + * the one you wrote in the comparator04() exercise. */ @Test - public void comparator3() { + public void comparator05() { //TODO//Comparator<Person> comparebyLastNameThenFirstNameReversed = null; //BEGINREMOVE Comparator<Person> comparebyLastNameThenFirstNameReversed = @@ -143,11 +143,11 @@ public class B_Comparators { /** * Write a Comparator that compares the people in the same order than the - * one you wrote in comparator2(), but that supports null values. The null + * one you wrote in comparator04(), but that supports null values. The null * values should be considered greater than any non-null values. */ @Test - public void comparator4() { + public void comparator06() { //TODO//Comparator<Person> comparebyLastNameThenFirstNameWithNull = null; //BEGINREMOVE Comparator<Person> comparebyLastNameThenFirstNameWithNull = @@ -172,7 +172,7 @@ public class B_Comparators { * Try to write the comparator so as to avoid boxing of primitives. */ @Test - public void comparator5() { + public void comparator07() { //TODO//Comparator<Person> comparebyAge = null; //BEGINREMOVE Comparator<Person> comparebyAge = Comparator.comparingInt(Person::getAge); @@ -196,7 +196,7 @@ public class B_Comparators { * functional interface we use is IntBinaryOperator. */ @Test - public void comparator6() { + public void comparator08() { //TODO//IntBinaryOperator intCompare = null; //BEGINREMOVE IntBinaryOperator intCompare = (a, b) -> (a < b) ? -1 : (a > b) ? 1 : 0; @@ -221,7 +221,7 @@ public class B_Comparators { * a comparator. */ @Test - public void comparator7() { + public void comparator09() { //TODO//IntBinaryOperator intCompare = null; //BEGINREMOVE IntBinaryOperator intCompare = Integer::compare; @@ -251,7 +251,7 @@ public class B_Comparators { * and greater than any non-NaN value. */ @Test - public void comparator8() { + public void comparator10() { //TODO//DoubleToIntBiFunction doubleCompare = null; //BEGINREMOVE DoubleToIntBiFunction doubleCompare = Double::compare; diff --git a/LambdaLab/test/solutions/C_DefaultMethods.java b/LambdaLab/test/solutions/C_DefaultMethods.java index 617728b..74120ba 100644 --- a/LambdaLab/test/solutions/C_DefaultMethods.java +++ b/LambdaLab/test/solutions/C_DefaultMethods.java @@ -26,7 +26,7 @@ public class C_DefaultMethods { * in-place by appending the string "new" to each one. */ @Test - public void c1_appendNew() { + public void c01_appendNew() { List<StringBuilder> sbList = Arrays.asList( new StringBuilder("alfa"), new StringBuilder("bravo"), @@ -52,7 +52,7 @@ public class C_DefaultMethods { * Remove the words that have odd lengths from the list. */ @Test - public void c2_removeOddLengthWords() { + public void c02_removeOddLengthWords() { List<String> list = new ArrayList<>(Arrays.asList( "alfa", "bravo", "charlie", "delta", "echo", "foxtrot")); @@ -75,7 +75,7 @@ public class C_DefaultMethods { * Replace every word in the list with its upper case equivalent. */ @Test - public void c3_upcaseAllWords() { + public void c03_upcaseAllWords() { List<String> list = Arrays.asList( "alfa", "bravo", "charlie", "delta", "echo", "foxtrot"); @@ -101,7 +101,7 @@ public class C_DefaultMethods { * Integer key. This should mutate each StringBuilder value in-place. */ @Test - public void c4_appendToMapValues() { + public void c04_appendToMapValues() { Map<Integer, StringBuilder> map = new TreeMap<>(); map.put(1, new StringBuilder("alfa")); map.put(2, new StringBuilder("bravo")); @@ -127,10 +127,10 @@ public class C_DefaultMethods { /** * Given a map whose keys are Integers and whose values are Strings, * append to each String the string representation of its corresponding - * Integer key. + * Integer key. */ @Test - public void c4b_replaceMapValues() { + public void c05_replaceMapValues() { Map<Integer, String> map = new TreeMap<>(); map.put(1, "alfa"); map.put(2, "bravo"); @@ -157,7 +157,7 @@ public class C_DefaultMethods { * each word, and whose values are list of words with that length. */ @Test - public void c5_mapOfListOfStringsByLength() { + public void c06_mapOfListOfStringsByLength() { List<String> list = Arrays.asList( "aardvark", "bison", "capybara", "alligator", "bushbaby", "chimpanzee", @@ -188,7 +188,7 @@ public class C_DefaultMethods { * separated by a colon (':'). */ @Test - public void c6_mapOfStringByInitialCharacter() { + public void c07_mapOfStringByInitialCharacter() { List<String> list = Arrays.asList( "aardvark", "bison", "capybara", "alligator", "bushbaby", "chimpanzee", @@ -210,186 +210,177 @@ public class C_DefaultMethods { // Use Map.merge() within Iterable.forEach(). // </editor-fold> - + /** - * For some reason the provided map has been filled with null values. - * This is a problem, beacuse everytime we get a value from this map, we - * need to protect our application against NullPointerException. - * Write a code to replace these null values with empty Strings. The - * set of the keys is provided, note that the "g" key is not in the map, - * and it should be. + * For some reason the provided map doesn't have mappings for all the keys. This + * is a problem, because if we call get() on a key that isn't present, it returns + * null, and we need to add checks to protect against NullPointerException. + * Write code to ensure that all missing keys are mapped to the empty string. */ @Test - public void c7_mapWithNullValues() { + public void c08_mapWithMissingValues() { List<String> keys = Arrays.asList("a", "b", "c", "d", "e", "f", "g"); - Map<String, String> map = new HashMap<>(); - map.put("a", "alfa"); - map.put("b", "bravo"); - map.put("c", "charlie"); - map.put("d", "delta"); - map.put("e", null); - map.put("f", null); - + Map<String, String> map = new HashMap<>(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta")); + //UNCOMMENT//// TODO write code to fix the map //BEGINREMOVE keys.forEach(key -> map.putIfAbsent(key, "")); //ENDREMOVE - - assertEquals(7, map.size()); - assertEquals("alfa", map.get("a")); - assertEquals("bravo", map.get("b")); - assertEquals("charlie", map.get("c")); - assertEquals("delta", map.get("d")); - assertEquals("", map.get("e")); - assertEquals("", map.get("f")); - assertEquals("", map.get("g")); + + assertEquals(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta", + "e", "", + "f", "", + "g", ""), + map); } // Hint: // <editor-fold defaultstate="collapsed"> // Check the Map.putIfAbsent() default method. // </editor-fold> - - + + /** - * Another way of dealing with the problem of the previous example could - * be to remove the keys if the values are null. - * Write a code that removes the keys of the map if the associated value - * is null. + * In the previous example, we added map entries that had a default value. + * We've now determined that's incorrect, and we want to undo that. This + * time, we want to remove the entry if the value is the empty string. */ @Test - public void c8_mapWithNullValues() { + public void c09_mapRemoveEntriesWithEmptyValues() { List<String> keys = Arrays.asList("a", "b", "c", "d", "e", "f", "g"); - Map<String, String> map = new HashMap<>(); - map.put("a", "alfa"); - map.put("b", "bravo"); - map.put("c", "charlie"); - map.put("d", "delta"); - map.put("e", null); - map.put("f", null); - + Map<String, String> map = new HashMap<>(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta", + "e", "", + "f", "", + "g", "")); + //UNCOMMENT//// TODO write code to fix the map //BEGINREMOVE - keys.forEach(key -> map.remove(key, null)); + keys.forEach(key -> map.remove(key, "")); //ENDREMOVE - - assertEquals(4, map.size()); - assertEquals("alfa", map.get("a")); - assertEquals("bravo", map.get("b")); - assertEquals("charlie", map.get("c")); - assertEquals("delta", map.get("d")); + + assertEquals(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta"), + map); } // Hint: // <editor-fold defaultstate="collapsed"> - // Check the Map.remove() default method. + // Check the two-arg Map.remove() default method. // </editor-fold> - - + + /** - * Another way of dealing with the problem of the previous example could - * be to set the value to the empty string for the keys associated - * with null, without adding the missing "g" key. - * Write a code that sets the value to the empty String for the key that - * are in the maps, and associated with null. + * We need another way to deal with the problem of the previous example. + * Instead of removing entries whose value is the empty string, we want + * to replace the empty-string values with a value that's the key itself. + * Write the code to do that. */ @Test - public void c9_mapWithNullValues() { + public void c10_mapReplaceEmptyValues() { List<String> keys = Arrays.asList("a", "b", "c", "d", "e", "f", "g"); - Map<String, String> map = new HashMap<>(); - map.put("a", "alfa"); - map.put("b", "bravo"); - map.put("c", "charlie"); - map.put("d", "delta"); - map.put("e", null); - map.put("f", null); - + Map<String, String> map = new HashMap<>(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta", + "e", "", + "f", "", + "g", "")); + //UNCOMMENT//// TODO write code to fix the map //BEGINREMOVE - keys.forEach(key -> map.replace(key, null, "")); + keys.forEach(key -> map.replace(key, "", key)); //ENDREMOVE - - assertEquals(6, map.size()); - assertEquals("alfa", map.get("a")); - assertEquals("bravo", map.get("b")); - assertEquals("charlie", map.get("c")); - assertEquals("delta", map.get("d")); - assertEquals("", map.get("e")); - assertEquals("", map.get("f")); + + assertEquals(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta", + "e", "e", + "f", "f", + "g", "g"), + map); } // Hint: // <editor-fold defaultstate="collapsed"> // Check the Map.replace() default method that takes 3 arguments. // </editor-fold> - - + + /** - * We are still dealing with a map containing null value. This time, - * we want to put the values in upper case, and replace the null - * values with empty Strings. + * We are still dealing with a map with missing entries. For entries that + * are present, we want to convert the value to upper case; and for keys + * that are not present, we want to add an entry where the value is the + * same as the key. */ @Test - public void c10_computeWithNullValues() { + public void c11_computeWithMissingEntries() { List<String> keys = Arrays.asList("a", "b", "c", "d", "e", "f", "g"); - Map<String, String> map = new HashMap<>(); - map.put("a", "alfa"); - map.put("b", "bravo"); - map.put("c", "charlie"); - map.put("d", "delta"); - map.put("e", null); - map.put("f", null); - + Map<String, String> map = new HashMap<>(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta")); + //UNCOMMENT//// TODO write code transform the map //BEGINREMOVE - keys.forEach(key -> map.compute(key, (k, v) -> v == null ? "" : v.toUpperCase())); + keys.forEach(key -> map.compute(key, (k, v) -> v == null ? k : v.toUpperCase())); //ENDREMOVE - - assertEquals(7, map.size()); - assertEquals("ALFA", map.get("a")); - assertEquals("BRAVO", map.get("b")); - assertEquals("CHARLIE", map.get("c")); - assertEquals("DELTA", map.get("d")); - assertEquals("", map.get("e")); - assertEquals("", map.get("f")); - assertEquals("", map.get("g")); + + assertEquals(Map.of("a", "ALFA", + "b", "BRAVO", + "c", "CHARLIE", + "d", "DELTA", + "e", "e", + "f", "f", + "g", "g"), + map); } // Hint: // <editor-fold defaultstate="collapsed"> - // Check the Map.compute() default method, read the Javadoc carefully - // for the handling of null values. + // Check the Map.compute() default method, and read the Javadoc carefully + // regarding the mappings that aren't present. // </editor-fold> - - + + /** - * We are still dealing with a map containing null value. This time, - * we want to put the values in upper case, and leave the null values andd - * absent keys as they are. + * The map now has several entries, some with valid values, and some + * with values that are the empty string. This time, we want to convert + * the non-empty values to upper case, but we want to remove the entries + * for which the values are the empty string. */ @Test - public void c11_computeWithNullValues() { + public void c12_computeAndRemoveSomeEntries() { List<String> keys = Arrays.asList("a", "b", "c", "d", "e", "f", "g"); - Map<String, String> map = new HashMap<>(); - map.put("a", "alfa"); - map.put("b", "bravo"); - map.put("c", "charlie"); - map.put("d", "delta"); - map.put("e", null); - map.put("f", null); - + Map<String, String> map = new HashMap<>(Map.of("a", "alfa", + "b", "bravo", + "c", "charlie", + "d", "delta", + "e", "", + "f", "", + "g", "")); + //UNCOMMENT//// TODO write code transform the map //BEGINREMOVE - keys.forEach(key -> map.computeIfPresent(key, (k, v) -> v.toUpperCase())); + keys.forEach(key -> map.compute(key, (k, v) -> v.isEmpty() ? null : v.toUpperCase())); //ENDREMOVE - - assertEquals(6, map.size()); - assertEquals("ALFA", map.get("a")); - assertEquals("BRAVO", map.get("b")); - assertEquals("CHARLIE", map.get("c")); - assertEquals("DELTA", map.get("d")); - assertEquals(null, map.get("e")); - assertEquals(null, map.get("f")); + + assertEquals(Map.of("a", "ALFA", + "b", "BRAVO", + "c", "CHARLIE", + "d", "DELTA"), + map); } // Hint: // <editor-fold defaultstate="collapsed"> - // Check the Map.computeIfPresent() default method, read the Javadoc carefully - // for the handling of null values. + // Check the Map.compute() default method, read the Javadoc carefully + // for the handling of null values returned from the function. // </editor-fold> } \ No newline at end of file -- GitLab