Skip to content

Commit 18afa67

Browse files
phishman3579phishman3579
committed
Moved all the test/timing related classes into test/ directory besides src/
1 parent 1a588c1 commit 18afa67

63 files changed

Lines changed: 24 additions & 9630 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.classpath‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
4+
<classpathentry kind="src" path="test"/>
45
<classpathentry kind="lib" path="lib/junit-4_4.3.1.jar"/>
56
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
67
<classpathentry kind="output" path="bin"/>

‎build.xml‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
<!-- set global properties for this build -->
77
<property name="src" location="src"/>
8+
<property name="test" location="test"/>
89
<property name="build" location="build"/>
910
<property name="dist" location="dist"/>
1011

@@ -58,68 +59,81 @@
5859
<jar jarfile="${dist}/java-algorithms-implementation-${DSTAMP}.jar" basedir="${build}"/>
5960
</target>
6061

61-
<target name="run_tests" depends="dist">
62+
<target name="build_tests" depends="dist" description="build the source">
63+
<!-- Compile the java testing code from ${test} into ${build} -->
64+
<javac includeantruntime="false" srcdir="${test}" destdir="${build}">
65+
<compilerarg value="-Xlint:unchecked"/>
66+
<classpath refid="class.path" />
67+
</javac>
68+
</target>
69+
70+
<target name="tests_jar" depends="build_tests" description="generate the tests jar">
71+
<!-- Put everything in ${build} into the java-algorithms-implementation-tests-${DSTAMP}.jar file -->
72+
<jar jarfile="${dist}/java-algorithms-implementation-tests-${DSTAMP}.jar" basedir="${build}"/>
73+
</target>
74+
75+
<target name="run_tests" depends="tests_jar">
6276
<junit printsummary="on" haltonfailure="yes">
6377
<jvmarg value="-server"/>
6478
<classpath>
6579
<path refid="test.class.path" />
6680
</classpath>
6781
<formatter type="brief" usefile="false" />
6882
<batchtest>
69-
<fileset dir="${src}" includes="**/test/*.java" excludes="**/test/AllTests.java" />
83+
<fileset dir="${test}" includes="**/test/*.java" excludes="**/test/AllTests.java" />
7084
</batchtest>
7185
</junit>
7286
</target>
7387

74-
<target name="data_structures" depends="dist" >
88+
<target name="data_structures" depends="tests_jar" >
7589
<java classname="com.jwetherell.algorithms.data_structures.timing.DataStructuresTiming">
7690
<classpath>
7791
<path refid="test.class.path" />
7892
</classpath>
7993
</java>
8094
</target>
8195

82-
<target name="mathematics" depends="dist" >
96+
<target name="mathematics" depends="tests_jar" >
8397
<java classname="com.jwetherell.algorithms.mathematics.timing.MathematicsTiming">
8498
<classpath>
8599
<path refid="test.class.path" />
86100
</classpath>
87101
</java>
88102
</target>
89103

90-
<target name="numbers" depends="dist" >
104+
<target name="numbers" depends="tests_jar" >
91105
<java classname="com.jwetherell.algorithms.numbers.timing.NumbersTiming">
92106
<classpath>
93107
<path refid="test.class.path" />
94108
</classpath>
95109
</java>
96110
</target>
97111

98-
<target name="search" depends="dist" >
112+
<target name="search" depends="tests_jar" >
99113
<java classname="com.jwetherell.algorithms.search.timing.SearchTiming">
100114
<classpath>
101115
<path refid="test.class.path" />
102116
</classpath>
103117
</java>
104118
</target>
105119

106-
<target name="sequences" depends="dist" >
120+
<target name="sequences" depends="tests_jar" >
107121
<java classname="com.jwetherell.algorithms.sequence.timing.SequencesTiming">
108122
<classpath>
109123
<path refid="test.class.path" />
110124
</classpath>
111125
</java>
112126
</target>
113127

114-
<target name="sorts" depends="dist" >
128+
<target name="sorts" depends="tests_jar" >
115129
<java classname="com.jwetherell.algorithms.sorts.timing.SortsTiming">
116130
<classpath>
117131
<path refid="test.class.path" />
118132
</classpath>
119133
</java>
120134
</target>
121135

122-
<target name="strings" depends="dist" >
136+
<target name="strings" depends="tests_jar" >
123137
<java classname="com.jwetherell.algorithms.strings.timing.StringsTiming">
124138
<classpath>
125139
<path refid="test.class.path" />

‎src/com/jwetherell/algorithms/data_structures/test/AVLTreeTests.java‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎src/com/jwetherell/algorithms/data_structures/test/AllTests.java‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎src/com/jwetherell/algorithms/data_structures/test/BTreeTests.java‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/com/jwetherell/algorithms/data_structures/test/BinaryHeapTests.java‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎src/com/jwetherell/algorithms/data_structures/test/BinarySearchTreeTests.java‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎src/com/jwetherell/algorithms/data_structures/test/CompactSuffixTrieTests.java‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)