Skip to content

Commit eb0c1f3

Browse files
author
nat.pryce
committed
moved test pattern matchers to new module because they are currently immature
1 parent 3e98e48 commit eb0c1f3

30 files changed

Lines changed: 20 additions & 5 deletions

‎.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="build/temp/hamcrest-library/generated-code"/>
4+
<classpathentry kind="src" path="hamcrest-text/src/main/java"/>
45
<classpathentry kind="src" path="hamcrest-core/src/main/java"/>
56
<classpathentry kind="src" path="build/temp/hamcrest-core/generated-code"/>
67
<classpathentry kind="src" path="hamcrest-generator/src/main/java"/>

‎build.xml‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,16 @@
9494
classpath="build/hamcrest-core-${version}.jar"/>
9595
</target>
9696

97+
<target name="text"
98+
depends="core, library"
99+
description="Build text pattern matcher">
100+
<java-to-jar srcdir="hamcrest-text/src/main/java"
101+
destjar="build/hamcrest-text-${version}.jar"
102+
classpath="
103+
build/hamcrest-core-${version}.jar;
104+
build/hamcrest-library-${version}.jar"/>
105+
</target>
106+
97107
<target name="integration"
98108
depends="core, library"
99109
description="Build integration with external tools">
@@ -103,15 +113,16 @@
103113
build/hamcrest-core-${version}.jar;
104114
build/hamcrest-library-${version}.jar"/>
105115
</target>
106-
116+
107117
<target name="unit-test"
108-
depends="core, library, integration, generator"
118+
depends="core, library, text, integration, generator"
109119
description="Build and run unit tests.">
110120
<java-to-jar srcdir="hamcrest-unit-test/src/main/java"
111121
destjar="build/hamcrest-unit-test-${version}.jar"
112122
classpath="
113123
build/hamcrest-core-${version}.jar;
114-
build/hamcrest-library-${version}.jar;
124+
build/hamcrest-library-${version}.jar;
125+
build/hamcrest-text-${version}.jar;
115126
build/hamcrest-integration-${version}.jar;
116127
build/hamcrest-generator-${version}.jar"/>
117128
<junit printsummary="no" fork="no" haltonfailure="${haltonfailure}">
@@ -122,6 +133,7 @@
122133
</fileset>
123134
<pathelement path="build/hamcrest-core-${version}.jar"/>
124135
<pathelement path="build/hamcrest-library-${version}.jar"/>
136+
<pathelement path="build/hamcrest-text-${version}.jar"/>
125137
<pathelement path="build/hamcrest-integration-${version}.jar"/>
126138
<pathelement path="build/hamcrest-generator-${version}.jar"/>
127139
<pathelement path="build/hamcrest-unit-test-${version}.jar"/>
@@ -147,18 +159,19 @@
147159
</target>
148160

149161
<target name="bigjar"
150-
depends="core, library, integration, generator"
162+
depends="core, library, text, integration, generator"
151163
description="Build a single Jar (hamcrest-all.jar) that contains core, library, generator and integration.">
152164
<jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
153165
<zipfileset src="build/hamcrest-core-${version}.jar"/>
154166
<zipfileset src="build/hamcrest-library-${version}.jar"/>
167+
<zipfileset src="build/hamcrest-text-${version}.jar"/>
155168
<zipfileset src="build/hamcrest-generator-${version}.jar"/>
156169
<zipfileset src="build/hamcrest-integration-${version}.jar"/>
157170
</jar>
158171
</target>
159172

160173
<target name="package"
161-
depends="core,generator,library,integration,bigjar,unit-test,examples"
174+
depends="core, generator, library, text, integration, bigjar, unit-test, examples"
162175
description="Package for distribution">
163176
<zip zipfile="build/hamcrest-${version}.zip">
164177
<zipfileset dir="." prefix="hamcrest-${version}">
@@ -207,6 +220,7 @@
207220

208221
<packageset dir="hamcrest-core/src/main/java"/>
209222
<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
223+
<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
210224
<packageset dir="hamcrest-integration/src/main/java"/>
211225
<packageset dir="build/generated-code"/>
212226

hamcrest-library/src/main/java/org/hamcrest/text/pattern/Field.java renamed to hamcrest-text/src/main/java/org/hamcrest/text/pattern/Field.java

File renamed without changes.

hamcrest-library/src/main/java/org/hamcrest/text/pattern/FromTo.java renamed to hamcrest-text/src/main/java/org/hamcrest/text/pattern/FromTo.java

File renamed without changes.

hamcrest-library/src/main/java/org/hamcrest/text/pattern/Parse.java renamed to hamcrest-text/src/main/java/org/hamcrest/text/pattern/Parse.java

File renamed without changes.

hamcrest-library/src/main/java/org/hamcrest/text/pattern/PatternComponent.java renamed to hamcrest-text/src/main/java/org/hamcrest/text/pattern/PatternComponent.java

File renamed without changes.

hamcrest-library/src/main/java/org/hamcrest/text/pattern/PatternMatchException.java renamed to hamcrest-text/src/main/java/org/hamcrest/text/pattern/PatternMatchException.java

File renamed without changes.

hamcrest-library/src/main/java/org/hamcrest/text/pattern/PatternMatcher.java renamed to hamcrest-text/src/main/java/org/hamcrest/text/pattern/PatternMatcher.java

File renamed without changes.

hamcrest-library/src/main/java/org/hamcrest/text/pattern/Patterns.java renamed to hamcrest-text/src/main/java/org/hamcrest/text/pattern/Patterns.java

File renamed without changes.

hamcrest-library/src/main/java/org/hamcrest/text/pattern/SeparablePatternComponent.java renamed to hamcrest-text/src/main/java/org/hamcrest/text/pattern/SeparablePatternComponent.java

File renamed without changes.

0 commit comments

Comments
 (0)