test/test_project/src/java/net/sourceforge/importscrubber/FunctionalTest.java.expected test/test_project/src/java/net/sourceforge/importscrubber/FunctionalTest.java.scoured @@ -1,2 +1,3 @@ build .*.sw? +coverage.ec .gitignore @@ -43,4 +43,10 @@ test.output.dir=${build.dir}/test-output conf.dir=${basedir}/conf -gui.spawn=true +test.project.dir=${basedir}/test/test_project + +test.project.src.dir=${test.project.dir}/src/java + +test.project.classes.dir=${test.project.dir}/build/classes + +test.source.file=net/sourceforge/importscrubber/FunctionalTest.java build.properties @@ -35,6 +35,7 @@ <filter includes="net.sourceforge.importscrubber.*,net.sourceforge.importscrubber.ant.*" /> </instr> </emma> +  + + <copy overwrite="true" file="${test.project.src.dir}/${test.source.file}.orig" tofile="${test.project.src.dir}/${test.source.file}" /> + <ant antfile="${test.project.dir}/build.xml" target="compile" inheritAll="false" /> + <java + classname="net.sourceforge.importscrubber.CLI" + classpathref="emma.classpath" + > + <arg line="${test.project.classes.dir} ${test.project.src.dir} ${test.source.file}" /> + <jvmarg value="-Demma.coverage.out.file=${emma.coverage.dir}/coverage2.emma" /> + <jvmarg value="-Demma.coverage.out.merge=true" /> + </java> <emma enabled="${emma.enabled}"> <report sourcepath="${java.src.dir}" > @@ -56,6 +69,12 @@ <html outfile="${emma.dir}/coverage.html" /> </report> </emma> + <copy overwrite="true" file="${test.project.src.dir}/${test.source.file}" tofile="${test.project.src.dir}/${test.source.file}.scoured" /> + <copy overwrite="true" file="${test.project.src.dir}/${test.source.file}.orig" tofile="${test.project.src.dir}/${test.source.file}" /> + <exec executable="diff" failonerror="true"> + <arg value="${test.project.src.dir}/${test.source.file}.scoured" /> + <arg value="${test.project.src.dir}/${test.source.file}.expected" /> + </exec> </target> src/ant/test.xml @@ -14,7 +14,6 @@ <import file="${ant.src.dir}/javadoc.xml" /> <import file="${ant.src.dir}/test.xml" /> <import file="${ant.src.dir}/checkstyle.xml" /> - <import file="${ant.src.dir}/run.xml" /> <path id="scrub.classpath"> <path refid="compile.classpath" /> <pathelement location="${basedir}/../../build/emma/classes" /> test/test_project/build.xml @@ -15,6 +15,8 @@ import java.util.Map.Entry; import javax.swing.JLabel; import javax.swing.JTextField; +import static java.lang.Math.*; + /** * This class encapsulates an piece of code on which to run importscrubber */ @@ -29,6 +31,7 @@ public class FunctionalTest implements Runnable { public class Foo extends JLabel { public String getText() { + int blah = abs(-45); return super.getText(); } } test/test_project/src/java/net/sourceforge/importscrubber/FunctionalTest.java @@ -15,6 +15,8 @@ import java.util.Map.Entry; import javax.swing.JLabel; import javax.swing.JTextField; +import static java.lang.Math.*; + /** * This class encapsulates an piece of code on which to run importscrubber */ @@ -29,6 +31,7 @@ public class FunctionalTest implements Runnable { public class Foo extends JLabel { public String getText() { + int blah = abs(-45); return super.getText(); } } test/test_project/src/java/net/sourceforge/importscrubber/FunctionalTest.java.orig 09c7c5480150a4a0a71fe5b980b0815dbfdcfd79 David Copeland davetron5000@gmail.com http://github.com/davetron5000/importscour/commit/27c5fd21fb13c39a6aa1d784545649ec4f43658e 27c5fd21fb13c39a6aa1d784545649ec4f43658e

2008-12-08T16:40:28-08:00

Runs on a test file and compares the output to see if it's correct fbb4f3df9b95f548a2d5ccded45b48ff98ae65a8 David Copeland davetron5000@gmail.com