Menu
▾
▴
junit-devel — junit developers
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(80) |
Nov
(42) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(11) |
Feb
(50) |
Mar
(70) |
Apr
(102) |
May
(28) |
Jun
(45) |
Jul
(14) |
Aug
(75) |
Sep
(17) |
Oct
(15) |
Nov
(11) |
Dec
(4) |
| 2003 |
Jan
(16) |
Feb
(19) |
Mar
(21) |
Apr
(20) |
May
(29) |
Jun
(7) |
Jul
(5) |
Aug
|
Sep
|
Oct
(2) |
Nov
(3) |
Dec
(3) |
| 2004 |
Jan
(5) |
Feb
(4) |
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(6) |
Nov
(1) |
Dec
(2) |
| 2005 |
Jan
(4) |
Feb
(4) |
Mar
(15) |
Apr
(1) |
May
|
Jun
(4) |
Jul
(6) |
Aug
(6) |
Sep
|
Oct
(4) |
Nov
(2) |
Dec
(4) |
| 2006 |
Jan
|
Feb
(91) |
Mar
(47) |
Apr
(7) |
May
(4) |
Jun
(9) |
Jul
(1) |
Aug
|
Sep
(5) |
Oct
(36) |
Nov
(95) |
Dec
(12) |
| 2007 |
Jan
(11) |
Feb
(31) |
Mar
(45) |
Apr
(11) |
May
(9) |
Jun
(1) |
Jul
(146) |
Aug
(15) |
Sep
|
Oct
(3) |
Nov
(6) |
Dec
(1) |
| 2008 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(19) |
Sep
(1) |
Oct
(10) |
Nov
|
Dec
(8) |
| 2009 |
Jan
(3) |
Feb
(1) |
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(4) |
Jul
(2) |
Aug
(1) |
Sep
(2) |
Oct
(13) |
Nov
(13) |
Dec
(4) |
| 2010 |
Jan
(1) |
Feb
(2) |
Mar
(1) |
Apr
(2) |
May
|
Jun
(1) |
Jul
(3) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2011 |
Jan
(1) |
Feb
(4) |
Mar
(3) |
Apr
(4) |
May
|
Jun
(12) |
Jul
(16) |
Aug
(4) |
Sep
(7) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
|
From: David S. <ds...@us...> - 2007-07-12 17:08:03
|
Update of /cvsroot/junit/junit/src/org/junit/experimental/test/imposterization In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25694/src/org/junit/experimental/test/imposterization Log Message: Directory /cvsroot/junit/junit/src/org/junit/experimental/test/imposterization added to the repository |
|
From: David S. <ds...@us...> - 2007-07-12 17:08:03
|
Update of /cvsroot/junit/junit/src/org/junit/experimental/test/javamodel In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25694/src/org/junit/experimental/test/javamodel Log Message: Directory /cvsroot/junit/junit/src/org/junit/experimental/test/javamodel added to the repository |
|
From: David S. <ds...@us...> - 2007-07-12 16:44:14
|
Update of /cvsroot/junit/junit/src/org/junit/internal/runners In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15926/src/org/junit/internal/runners Added Files: TestClassRunner.java OldTestClassRunner.java Log Message: Re-added OldTestClassRunner and TestClassRunner, since they may have been used with @RunWith to override JUnit default behavior in the past. |
|
From: David S. <ds...@us...> - 2007-07-09 20:54:03
|
Update of /cvsroot/junit/junit/src/junit/runner In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21339/src/junit/runner Modified Files: Version.java Log Message: Fixed build.xml after adding Theories Index: Version.java =================================================================== RCS file: /cvsroot/junit/junit/src/junit/runner/Version.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Version.java 2 Jul 2007 18:10:58 -0000 1.4 +++ Version.java 9 Jul 2007 20:53:58 -0000 1.5 @@ -9,7 +9,7 @@ } public static String id() { - return "4.4-snapshot-20070629-0646"; + return "4.4-snapshot-20070709-1651"; } public static void main(String[] args) { |
|
From: David S. <ds...@us...> - 2007-07-09 20:54:03
|
Update of /cvsroot/junit/junit In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21339 Modified Files: build.xml Log Message: Fixed build.xml after adding Theories Index: build.xml =================================================================== RCS file: /cvsroot/junit/junit/build.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- build.xml 9 Jul 2007 18:49:22 -0000 1.30 +++ build.xml 9 Jul 2007 20:53:58 -0000 1.31 @@ -49,9 +49,10 @@ destdir="${bin}" debug="on" classpath="${hamcrestlib}" + includeantruntime="false" + excludes="**/imposterization/**,**/theories/test/**" > <compilerarg value="-Xlint:unchecked" /> - <classpath /> </javac> <unjar src="${hamcrestlib}" dest="${bin}" /> |
|
From: David S. <ds...@us...> - 2007-07-09 20:54:02
|
Update of /cvsroot/junit/junit/org/junit/experimental In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21339/org/junit/experimental Removed Files: Invariant.java Log Message: Fixed build.xml after adding Theories --- Invariant.java DELETED --- |
|
From: David S. <ds...@us...> - 2007-07-09 20:54:02
|
Update of /cvsroot/junit/junit/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21339/src Removed Files: JUnitTestCase.java Log Message: Fixed build.xml after adding Theories --- JUnitTestCase.java DELETED --- |
|
From: David S. <ds...@us...> - 2007-07-09 20:54:02
|
Update of /cvsroot/junit/junit/org/junit/tests In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21339/org/junit/tests Removed Files: InvariantTest.java Log Message: Fixed build.xml after adding Theories --- InvariantTest.java DELETED --- |
|
From: Build A. <vim...@vi...> - 2007-07-09 19:54:11
|
BUILD result ------------------------------------------------------------ BUILD for junit (#38) on localhost was BROKEN: Script returned non-zero code "1" Build status: http://parabuild.viewtier.com:8080/parabuild/index.htm?view=detailed&buildid=5 Suspect Changes ------------------------------------------------------------ Change(s) by dsaff : - Checked in new tests to clarify behavior of JUnit4TestAdapto; Time: 12:38 PM 07/09/2007; Change list: 7376 - No tests rely on hamcrest-all; Time: 11:49 AM 07/09/2007; Change list: 7373 - Tests pass without hamcrest-library; Time: 09:04 AM 07/06/2007; Change list: 7255 - Fixed bug 1745048: @After method not called after my test ti; Time: 01:59 PM 07/02/2007; Change list: 7142 - - The hamcrest-core-1.1 library is now included in the JUnit; Time: 11:11 AM 07/02/2007; Change list: 7134 - - The hamcrest-core-1.1 library is now included in the JUnit; Time: 11:10 AM 07/02/2007; Change list: 7133 Change(s) Details: http://parabuild.viewtier.com:8080/parabuild/build/changes.htm?buildrunid=4663 BUILD logs ------------------------------------------------------------ BUILD log: http://parabuild.viewtier.com:8080/parabuild/build/log.htm?logid=6394 Error lines: http://parabuild.viewtier.com:8080/parabuild/build/log.htm?logid=6395 Log Lines Around Error ------------------------------------------------------------ Buildfile: build.xml clean: init: versiontag: [copy] Copying 1 file to /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/junit/runner build: [javac] Compiling 221 source files to /opt/parabuild/etc/build/b5co/a/u/t/o/junit/bin [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/JUnitTestCase.java:77: illegal start of expression [javac] }) [javac] ^ [javac] 1 error BUILD FAILED /opt/parabuild/etc/build/b5co/a/u/t/o/junit/build.xml:52: Compile failed; see the compiler error output for details. Total time: 5 seconds Timings ------------------------------------------------------------ BUILD took 06 seconds |
|
From: David S. <ds...@us...> - 2007-07-09 19:38:33
|
Update of /cvsroot/junit/junit/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18825/src Added Files: JUnitTestCase.java Log Message: Checked in new tests to clarify behavior of JUnit4TestAdaptor in the presence of @Ignore'd tests and suite() methods, in response to bug 1700187 --- NEW FILE: JUnitTestCase.java --- import junit.framework.JUnit4TestAdapter; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; /** * Correct structure: * * JUnitTestCase * | * |- JUnitTestCase.MyTestSuite * | | * | |- JUnitTestCase.MyTestSuite.MyTestCase * | | * | |- test1 * | | * | |- test2 * | * |- JUnitTestCase.StopTest * | * |- testStop * * Wrong structure when test.MyTestSuite is created using JUnit4TestAdapter * * JUnitTestCase * | * |- JUnitTestCase.MyTestSuite * | | * | |- JUnitTestCase.MyTestSuite.MyTestCase * | | | * | | |- test1 * | | | * | | |- test2 * | | * x |- JUnitTestCase.StopTest * | * |- testStop */ public final class JUnitTestCase { public static void buildUserTests(TestSuite suite) { // Cause a problem because there are 2 tests suite.addTest(new JUnit4TestAdapter(MyTestSuite.class)); // This works with 2 tests or more // suite.addTest(MyTestSuite.suite()); } public static Test suite() { TestSuite suite = new TestSuite(JUnitTestCase.class.getName()); buildUserTests(suite); suite.addTest(new TestSuite(StopTest.class)); return suite; } public static class MyTestCase { @org.junit.Test public void test1() { } @org.junit.Test public void test2() { } } @SuiteClasses ({ MyTestCase.class, }) @RunWith(Suite.class) public static class MyTestSuite { public static Test suite() { TestSuite suite = new TestSuite(MyTestSuite.class.getName()); suite.addTest(new JUnit4TestAdapter(MyTestCase.class)); return suite; } } public static class StopTest extends TestCase { public void testStop() throws Exception { } } } |
|
From: David S. <ds...@us...> - 2007-07-09 19:38:33
|
Update of /cvsroot/junit/junit In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18825 Modified Files: acknowledgements.txt Log Message: Checked in new tests to clarify behavior of JUnit4TestAdaptor in the presence of @Ignore'd tests and suite() methods, in response to bug 1700187 Index: acknowledgements.txt =================================================================== RCS file: /cvsroot/junit/junit/acknowledgements.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- acknowledgements.txt 8 Feb 2007 22:45:21 -0000 1.4 +++ acknowledgements.txt 9 Jul 2007 19:38:30 -0000 1.5 @@ -10,4 +10,7 @@ Ben Maurer: Found bug with timeouts taking twice as long as specified (1536198) 2007 February 08 - Kazimierz Pogoda: Found bug with null array elements (1438163) \ No newline at end of file + Kazimierz Pogoda: Found bug with null array elements (1438163) + +2007 July 09 + wangqq: Found bug with @After not running after a timeout (1745048) \ No newline at end of file |
|
From: David S. <ds...@us...> - 2007-07-09 19:38:33
|
Update of /cvsroot/junit/junit/src/org/junit/tests In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18825/src/org/junit/tests Modified Files: SuiteMethodTest.java Log Message: Checked in new tests to clarify behavior of JUnit4TestAdaptor in the presence of @Ignore'd tests and suite() methods, in response to bug 1700187 Index: SuiteMethodTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/tests/SuiteMethodTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SuiteMethodTest.java 26 Apr 2007 19:56:30 -0000 1.2 +++ SuiteMethodTest.java 9 Jul 2007 19:38:30 -0000 1.3 @@ -70,4 +70,49 @@ Description description= Request.aClass(CompatibilityTest.class).getRunner().getDescription(); assertEquals(0, description.getChildren().size()); } + + static public class NewTestSuiteFails { + @Test public void sample() { + wasRun= true; + } + + public static junit.framework.Test suite() { + fail("should not be called with JUnit 4 runner"); + return null; + } + } + + @Test public void makeSureSuiteNotUsedWithJUnit4Classes() { + wasRun= false; + Result res= JUnitCore.runClasses(NewTestSuiteFails.class); + assertEquals(1, res.getFailureCount()); + assertFalse(wasRun); + } + + static public class NewTestSuiteNotUsed { + private static boolean wasIgnoredRun; + + @Test public void sample() { + wasRun= true; + } + + @Ignore @Test public void ignore() { + wasIgnoredRun= true; + } + + public static junit.framework.Test suite() { + return new JUnit4TestAdapter(NewTestSuiteNotUsed.class); + } + } + + @Test public void makeSureSuiteNotUsedWithJUnit4Classes2() { + wasRun= false; + NewTestSuiteNotUsed.wasIgnoredRun= false; + Result res= JUnitCore.runClasses(NewTestSuiteNotUsed.class); + assertTrue(wasRun); + assertFalse(NewTestSuiteNotUsed.wasIgnoredRun); + assertEquals(0, res.getFailureCount()); + assertEquals(1, res.getRunCount()); + assertEquals(0, res.getIgnoreCount()); + } } |
|
From: Build A. <vim...@vi...> - 2007-07-09 19:12:09
|
BUILD result ------------------------------------------------------------ BUILD for junit (#37) on localhost was BROKEN: Script returned non-zero code "1" Build status: http://parabuild.viewtier.com:8080/parabuild/index.htm?view=detailed&buildid=5 Suspect Changes ------------------------------------------------------------ Change(s) by dsaff : - No tests rely on hamcrest-all; Time: 11:49 AM 07/09/2007; Change list: 7373 - Tests pass without hamcrest-library; Time: 09:04 AM 07/06/2007; Change list: 7255 - Fixed bug 1745048: @After method not called after my test ti; Time: 01:59 PM 07/02/2007; Change list: 7142 - - The hamcrest-core-1.1 library is now included in the JUnit; Time: 11:11 AM 07/02/2007; Change list: 7134 - - The hamcrest-core-1.1 library is now included in the JUnit; Time: 11:10 AM 07/02/2007; Change list: 7133 Change(s) Details: http://parabuild.viewtier.com:8080/parabuild/build/changes.htm?buildrunid=4661 BUILD logs ------------------------------------------------------------ BUILD log: http://parabuild.viewtier.com:8080/parabuild/build/log.htm?logid=6391 Error lines: http://parabuild.viewtier.com:8080/parabuild/build/log.htm?logid=6392 Log Lines Around Error ------------------------------------------------------------ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/imposterization/PopperImposterizer.java:11: cannot find symbol [javac] symbol : class Invokable [javac] location: class org.junit.experimental.imposterization.PopperImposterizer [javac] private final Invokable invokable; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/imposterization/PopperImposterizer.java:13: cannot find symbol [javac] symbol : class Invokable [javac] location: class org.junit.experimental.imposterization.PopperImposterizer [javac] public PopperImposterizer(Invokable invokable) { [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/imposterization/ThrownMatcher.java:8: package org.jmock.api does not exist [javac] import org.jmock.api.Invocation; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/imposterization/ThrownMatcher.java:9: package org.jmock.api does not exist [javac] import org.jmock.api.Invokable; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/imposterization/AssumePassing.java:19: cannot find symbol [javac] symbol : class Invokable [javac] location: class org.junit.experimental.imposterization.AssumePassing [javac] return new PopperImposterizer(new Invokable() { [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/imposterization/FunctionPointer.java:19: cannot find symbol [javac] symbol : class Invokable [javac] location: class org.junit.experimental.imposterization.FunctionPointer [javac] Invokable invokable = new Invokable() { [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/imposterization/FunctionPointer.java:19: cannot find symbol [javac] symbol : class Invokable [javac] location: class org.junit.experimental.imposterization.FunctionPointer [javac] Invokable invokable = new Invokable() { [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/imposterization/PopperImposterizer.java:18: cannot find symbol [javac] symbol : class Imposteriser [javac] location: class org.junit.experimental.imposterization.PopperImposterizer [javac] Imposteriser imposterizer = ClassImposteriser.INSTANCE; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/imposterization/PopperImposterizer.java:18: cannot find symbol [javac] symbol : variable ClassImposteriser [javac] location: class org.junit.experimental.imposterization.PopperImposterizer [javac] Imposteriser imposterizer = ClassImposteriser.INSTANCE; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/imposterization/ThrownMatcher.java:32: cannot find symbol [javac] symbol : class Invokable [javac] location: class org.junit.experimental.imposterization.ThrownMatcher [javac] return new PopperImposterizer(new Invokable() { [javac] ^ [javac] 17 errors BUILD FAILED /opt/parabuild/etc/build/b5co/a/u/t/o/junit/build.xml:52: Compile failed; see the compiler error output for details. Total time: 13 seconds Timings ------------------------------------------------------------ BUILD took 14 seconds |
|
From: David S. <ds...@us...> - 2007-07-09 18:50:18
|
Update of /cvsroot/junit/junit/src/org/junit/experimental/results In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28163/src/org/junit/experimental/results Modified Files: ResultMatchers.java Log Message: No tests rely on hamcrest-all Index: ResultMatchers.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/results/ResultMatchers.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ResultMatchers.java 2 Jul 2007 18:10:58 -0000 1.1 +++ ResultMatchers.java 9 Jul 2007 18:49:22 -0000 1.2 @@ -1,8 +1,5 @@ package org.junit.experimental.results; -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.hasToString; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; @@ -25,7 +22,15 @@ } @SuppressWarnings("unchecked") - public static Matcher<Object> hasSingleFailureContaining(String string) { - return allOf(hasToString(containsString(string)), failureCountIs(1)); + public static Matcher<Object> hasSingleFailureContaining(final String string) { + return new BaseMatcher<Object>() { + public boolean matches(Object item) { + return item.toString().contains(string) && failureCountIs(1).matches(item); + } + + public void describeTo(Description description) { + description.appendText("has single failure containing " + string); + } + }; } } |
|
From: David S. <ds...@us...> - 2007-07-09 18:50:17
|
Update of /cvsroot/junit/junit/src/org/junit/experimental/theories/test/results In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28163/src/org/junit/experimental/theories/test/results Modified Files: ResultMatchersTest.java PrintableResultTest.java Log Message: No tests rely on hamcrest-all Index: ResultMatchersTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/results/ResultMatchersTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ResultMatchersTest.java 2 Jul 2007 18:10:57 -0000 1.1 +++ ResultMatchersTest.java 9 Jul 2007 18:49:21 -0000 1.2 @@ -1,13 +1,11 @@ package org.junit.experimental.theories.test.results; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.hasToString; import static org.junit.Assert.assertThat; -import org.hamcrest.Matchers; +import static org.junit.experimental.theories.matchers.api.StringContains.containsString; import org.junit.Test; import org.junit.experimental.results.ResultMatchers; import org.junit.experimental.theories.methods.api.Theory; - public class ResultMatchersTest { @Test public void hasFailuresHasGoodDescription() { @@ -18,6 +16,6 @@ @Theory public void hasFailuresDescriptionReflectsInput(int i) { assertThat(ResultMatchers.failureCountIs(i).toString(), - hasToString(Matchers.containsString("" + i))); + containsString("" + i)); } } Index: PrintableResultTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/results/PrintableResultTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PrintableResultTest.java 2 Jul 2007 18:10:57 -0000 1.1 +++ PrintableResultTest.java 9 Jul 2007 18:49:21 -0000 1.2 @@ -1,12 +1,12 @@ package org.junit.experimental.theories.test.results; import static java.util.Arrays.asList; -import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.CoreMatchers.allOf; import static org.junit.Assert.assertThat; +import static org.junit.experimental.theories.matchers.api.StringContains.containsString; import java.util.Arrays; -import org.hamcrest.Matchers; import org.junit.experimental.results.PrintableResult; import org.junit.experimental.theories.methods.api.Theory; import org.junit.experimental.theories.runner.api.Theories; @@ -32,8 +32,7 @@ }); assertThat(new PrintableResult(asList(failure)).toString(), allOf( - Matchers.containsString(descriptionName), Matchers - .containsString(stackTraceClassName))); + containsString(descriptionName), containsString(stackTraceClassName))); } public static String SHELL_POINT= "Shell Point"; @@ -45,7 +44,6 @@ new RuntimeException("firstException")), new Failure( Description.createSuiteDescription("secondName"), new RuntimeException(secondExceptionName)))); - assertThat(backtrace.toString(), Matchers - .containsString(secondExceptionName)); + assertThat(backtrace.toString(), containsString(secondExceptionName)); } } |
|
From: David S. <ds...@us...> - 2007-07-09 18:50:17
|
Update of /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28163/src/org/junit/experimental/theories/test/matchers Modified Files: CamelCaseNameTest.java MatcherCharacterization.java StackTraceTest.java EachTest.java ClassNamedMatcherTest.java MethodNamedMatcherTest.java Log Message: No tests rely on hamcrest-all Index: CamelCaseNameTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/CamelCaseNameTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CamelCaseNameTest.java 2 Jul 2007 18:11:09 -0000 1.1 +++ CamelCaseNameTest.java 9 Jul 2007 18:49:21 -0000 1.2 @@ -1,6 +1,6 @@ package org.junit.experimental.theories.test.matchers; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import org.junit.Test; import org.junit.experimental.theories.matchers.api.CamelCaseName; Index: MatcherCharacterization.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/MatcherCharacterization.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MatcherCharacterization.java 2 Jul 2007 18:11:08 -0000 1.1 +++ MatcherCharacterization.java 9 Jul 2007 18:49:21 -0000 1.2 @@ -1,6 +1,6 @@ package org.junit.experimental.theories.test.matchers; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.util.regex.Matcher; Index: StackTraceTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/StackTraceTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- StackTraceTest.java 2 Jul 2007 18:11:09 -0000 1.1 +++ StackTraceTest.java 9 Jul 2007 18:49:21 -0000 1.2 @@ -1,9 +1,9 @@ package org.junit.experimental.theories.test.matchers; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.hasToString; -import static org.hamcrest.Matchers.is; + +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; +import static org.junit.experimental.theories.matchers.api.StringContains.containsString; import org.junit.Test; import org.junit.experimental.theories.matchers.api.StackTrace; @@ -32,6 +32,6 @@ methodNames += element.getMethodName() + ":"; } - assertThat(methodNames, hasToString(containsString(":<init>:"))); + assertThat(methodNames.toString(), containsString(":<init>:")); } } Index: EachTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/EachTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EachTest.java 2 Jul 2007 18:11:08 -0000 1.1 +++ EachTest.java 9 Jul 2007 18:49:21 -0000 1.2 @@ -1,14 +1,13 @@ package org.junit.experimental.theories.test.matchers; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import org.hamcrest.Matchers; import org.junit.Test; import org.junit.experimental.theories.matchers.api.Each; public class EachTest { @Test public void eachDescription() { - assertThat(Each.each(Matchers.is("a")).toString(), is("each is \"a\"")); + assertThat(Each.each(is("a")).toString(), is("each is \"a\"")); } } Index: ClassNamedMatcherTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/ClassNamedMatcherTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ClassNamedMatcherTest.java 2 Jul 2007 18:11:09 -0000 1.1 +++ ClassNamedMatcherTest.java 9 Jul 2007 18:49:21 -0000 1.2 @@ -3,7 +3,7 @@ */ package org.junit.experimental.theories.test.matchers; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import org.junit.Test; import org.junit.experimental.theories.matchers.api.ClassNamedMatcher; Index: MethodNamedMatcherTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/MethodNamedMatcherTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MethodNamedMatcherTest.java 2 Jul 2007 18:11:09 -0000 1.1 +++ MethodNamedMatcherTest.java 9 Jul 2007 18:49:21 -0000 1.2 @@ -1,7 +1,7 @@ package org.junit.experimental.theories.test.matchers; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; import org.hamcrest.Matcher; import org.junit.Test; |
|
From: David S. <ds...@us...> - 2007-07-09 18:50:17
|
Update of /cvsroot/junit/junit/src/org/junit/experimental/theories/test/imposterization In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28163/src/org/junit/experimental/theories/test/imposterization Modified Files: PopperImposterizerTest.java ThrownMatcherTest.java AssumePassingTest.java Log Message: No tests rely on hamcrest-all Index: PopperImposterizerTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/imposterization/PopperImposterizerTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PopperImposterizerTest.java 2 Jul 2007 18:11:03 -0000 1.1 +++ PopperImposterizerTest.java 9 Jul 2007 18:49:22 -0000 1.2 @@ -1,10 +1,10 @@ package org.junit.experimental.theories.test.imposterization; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; import java.util.List; -import org.hamcrest.Matchers; import org.junit.Test; import org.junit.experimental.imposterization.PopperImposterizer; @@ -13,6 +13,6 @@ public void canWrapImposterizedObjects() { List<?> list= new PopperImposterizer(null).imposterize(List.class); assertThat(new PopperImposterizer(null).imposterize(list.getClass()), - Matchers.notNullValue()); + notNullValue()); } } Index: ThrownMatcherTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/imposterization/ThrownMatcherTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ThrownMatcherTest.java 2 Jul 2007 18:11:03 -0000 1.1 +++ ThrownMatcherTest.java 9 Jul 2007 18:49:22 -0000 1.2 @@ -1,9 +1,9 @@ package org.junit.experimental.theories.test.imposterization; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; +import static org.junit.experimental.theories.matchers.api.StringContains.containsString; import java.util.ArrayList; Index: AssumePassingTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/imposterization/AssumePassingTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AssumePassingTest.java 2 Jul 2007 18:11:03 -0000 1.1 +++ AssumePassingTest.java 9 Jul 2007 18:49:22 -0000 1.2 @@ -7,7 +7,6 @@ import java.util.List; -import org.hamcrest.Matchers; import org.junit.Test; import org.junit.Assume.AssumptionViolatedException; import org.junit.experimental.imposterization.AssumePassing; @@ -41,8 +40,7 @@ @SuppressWarnings("unchecked") @Test public void removedParameterizedFailureWhenZeroParams() { - assertThat(onlyIfPassingFailures().get(0).getException(), Matchers - .is(AssertionError.class)); + assertThat(onlyIfPassingFailures().get(0).getException(), is(AssertionError.class)); } private List<Failure> onlyIfPassingFailures() { |
|
From: David S. <ds...@us...> - 2007-07-09 18:50:17
|
Update of /cvsroot/junit/junit/src/org/junit/experimental/theories/test/assertion In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28163/src/org/junit/experimental/theories/test/assertion Modified Files: AssumptionViolatedExceptionTest.java Log Message: No tests rely on hamcrest-all Index: AssumptionViolatedExceptionTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/assertion/AssumptionViolatedExceptionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AssumptionViolatedExceptionTest.java 2 Jul 2007 18:11:20 -0000 1.1 +++ AssumptionViolatedExceptionTest.java 9 Jul 2007 18:49:22 -0000 1.2 @@ -1,10 +1,9 @@ package org.junit.experimental.theories.test.assertion; +import static org.junit.experimental.theories.matchers.api.StringContains.containsString; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.hasToString; import static org.junit.Assert.assertThat; import org.hamcrest.Matcher; -import org.hamcrest.Matchers; import org.hamcrest.StringDescription; import org.junit.Test; import org.junit.Assume.AssumptionViolatedException; @@ -21,7 +20,7 @@ @Theory public void toStringIsUseful(Object actual, Matcher<?> matcher) { assertThat(new AssumptionViolatedException(actual, matcher).toString(), - hasToString(Matchers.containsString(matcher.toString()))); + containsString(matcher.toString())); } @Test |
|
From: David S. <ds...@us...> - 2007-07-09 18:50:15
|
Update of /cvsroot/junit/junit In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28163 Modified Files: build.xml .classpath Log Message: No tests rely on hamcrest-all Index: build.xml =================================================================== RCS file: /cvsroot/junit/junit/build.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- build.xml 2 Jul 2007 18:10:57 -0000 1.29 +++ build.xml 9 Jul 2007 18:49:22 -0000 1.30 @@ -15,7 +15,7 @@ <property name="javadocdir" value="${dist}/javadoc" /> <property name="javadoczip" value="${dist}-javadoc.zip" /> <property name="javadocpackages" value="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners, org.hamcrest.core" /> - <property name="hamcrestlib" value="lib/hamcrest-core-SNAPSHOT.jar" /> + <property name="hamcrestlib" value="lib/hamcrest-core-1.1.jar" /> <property name="hamcrestsrc" value="${dist}/temp.hamcrest.source" /> <target name="init"> Index: .classpath =================================================================== RCS file: /cvsroot/junit/junit/.classpath,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- .classpath 6 Jul 2007 16:04:09 -0000 1.12 +++ .classpath 9 Jul 2007 18:49:22 -0000 1.13 @@ -2,10 +2,9 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="lib/hamcrest-core-1.1.jar"/> + <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.1.jar"/> <classpathentry kind="lib" path="testlib/jmock-2.2.0-RC1.jar"/> <classpathentry kind="lib" path="testlib/cglib-nodep-2.2_beta1.jar"/> <classpathentry kind="lib" path="testlib/objenesis-1.0.jar"/> - <classpathentry kind="lib" path="testlib/hamcrest-library-SNAPSHOT.jar"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: David S. <ds...@us...> - 2007-07-09 18:50:15
|
Update of /cvsroot/junit/junit/src/org/junit/experimental/imposterization In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28163/src/org/junit/experimental/imposterization Modified Files: ThrownMatcher.java Log Message: No tests rely on hamcrest-all Index: ThrownMatcher.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/imposterization/ThrownMatcher.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ThrownMatcher.java 2 Jul 2007 18:11:02 -0000 1.1 +++ ThrownMatcher.java 9 Jul 2007 18:49:21 -0000 1.2 @@ -3,8 +3,8 @@ */ package org.junit.experimental.imposterization; +import static org.hamcrest.CoreMatchers.is; import org.hamcrest.Matcher; -import org.hamcrest.Matchers; import org.jmock.api.Invocation; import org.jmock.api.Invokable; import org.junit.Assert; @@ -47,7 +47,7 @@ } public static ThrownMatcher assertReturnsNormally() { - return assertThrownException(Matchers.is(((Object) null))); + return assertThrownException(is(((Object) null))); } public static ThrownMatcher assertThrownException(Matcher<?> theMatcher) { |
|
From: David S. <ds...@us...> - 2007-07-09 18:50:15
|
Update of /cvsroot/junit/junit/src/org/junit/tests In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28163/src/org/junit/tests Modified Files: AllTests.java Log Message: No tests rely on hamcrest-all Index: AllTests.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/tests/AllTests.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- AllTests.java 6 Jul 2007 16:04:09 -0000 1.13 +++ AllTests.java 9 Jul 2007 18:49:22 -0000 1.14 @@ -2,8 +2,6 @@ import junit.framework.JUnit4TestAdapter; import junit.framework.Test; -import org.hamcrest.CoreMatchers; -import org.hamcrest.core.AllOf; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; |
Update of /cvsroot/junit/junit/src/org/junit/experimental/theories/test/runner In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28163/src/org/junit/experimental/theories/test/runner Modified Files: TheoriesTest.java DataPointMethodTest.java TheoryContainerReferenceTest.java ParameterizedAssertionErrorTest.java Log Message: No tests rely on hamcrest-all Index: TheoriesTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/runner/TheoriesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TheoriesTest.java 2 Jul 2007 18:11:10 -0000 1.1 +++ TheoriesTest.java 9 Jul 2007 18:49:20 -0000 1.2 @@ -1,11 +1,12 @@ package org.junit.experimental.theories.test.runner; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; +import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; import static org.junit.Assume.assumeThat; +import static org.junit.experimental.results.ResultMatchers.failureCountIs; import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining; +import static org.junit.experimental.theories.matchers.api.StringContains.containsString; import org.hamcrest.Matcher; import org.junit.Test; import org.junit.experimental.results.PrintableResult; @@ -160,8 +161,7 @@ @Test public void honorTimeout() throws Exception { - assertThat(PrintableResult.testResult(HonorTimeout.class) - .getFailures().size(), is(1)); + assertThat(PrintableResult.testResult(HonorTimeout.class), failureCountIs(1)); } @RunWith(Theories.class) Index: DataPointMethodTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/runner/DataPointMethodTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- DataPointMethodTest.java 2 Jul 2007 18:11:10 -0000 1.1 +++ DataPointMethodTest.java 9 Jul 2007 18:49:20 -0000 1.2 @@ -1,13 +1,13 @@ package org.junit.experimental.theories.test.runner; -import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; +import static org.junit.experimental.theories.matchers.api.Each.each; import java.util.List; import org.hamcrest.Matcher; import org.junit.Test; -import org.junit.experimental.theories.matchers.api.Each; import org.junit.experimental.theories.methods.api.DataPoint; import org.junit.experimental.theories.methods.api.Theory; import org.junit.experimental.theories.runner.api.Theories; @@ -16,7 +16,6 @@ import org.junit.runner.notification.Failure; public class DataPointMethodTest { - @RunWith(Theories.class) public static class HasDataPointMethod { @DataPoint @@ -64,6 +63,6 @@ private Matcher<Iterable<Failure>> empty() { Matcher<Failure> nullValue= nullValue(); - return Each.each(nullValue); + return each(nullValue); } } Index: TheoryContainerReferenceTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/runner/TheoryContainerReferenceTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TheoryContainerReferenceTest.java 2 Jul 2007 18:11:11 -0000 1.1 +++ TheoryContainerReferenceTest.java 9 Jul 2007 18:49:20 -0000 1.2 @@ -1,14 +1,12 @@ package org.junit.experimental.theories.test.runner; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.hasToString; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; import java.util.Date; import java.util.List; -import org.hamcrest.Matchers; import org.junit.Test; import org.junit.experimental.imposterization.FunctionPointer; import org.junit.experimental.theories.methods.api.DataPoint; @@ -17,6 +15,7 @@ import org.junit.experimental.theories.runner.TheoryContainerReference; import org.junit.experimental.theories.runner.api.Theories; import org.junit.runner.RunWith; +import static org.junit.experimental.theories.matchers.api.StringContains.containsString; public class TheoryContainerReferenceTest { private FunctionPointer method = new FunctionPointer(); @@ -48,15 +47,14 @@ @Test public void pickUpDataPointMethods() throws SecurityException, InstantiationException, IllegalAccessException { method.calls(test).allIntsOk(0); - assertThat(potentialValues(), hasToString(containsString("100"))); + assertThat(potentialValues().toString(), containsString("100")); } @Test public void ignoreDataPointMethodsWithWrongTypes() throws SecurityException, InstantiationException, IllegalAccessException { method.calls(test).onlyStringsOk(null); - assertThat(potentialValues().toString(), Matchers - .not(hasToString(containsString("100")))); + assertThat(potentialValues().toString(), not(containsString("100"))); } @Test public void ignoreDataPointMethodsWithoutAnnotation() Index: ParameterizedAssertionErrorTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/runner/ParameterizedAssertionErrorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ParameterizedAssertionErrorTest.java 2 Jul 2007 18:11:11 -0000 1.1 +++ ParameterizedAssertionErrorTest.java 9 Jul 2007 18:49:20 -0000 1.2 @@ -1,10 +1,10 @@ package org.junit.experimental.theories.test.runner; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; +import static org.junit.experimental.theories.matchers.api.StringContains.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; import static org.junit.Assume.assumeThat; -import org.hamcrest.Matchers; import org.junit.experimental.theories.methods.api.Theory; import org.junit.experimental.theories.runner.ParameterizedAssertionError; import org.junit.experimental.theories.runner.api.Theories; @@ -54,7 +54,6 @@ @Theory(nullsAccepted= false) public void buildParameterizedAssertionError(String methodName, String param) { assertThat(new ParameterizedAssertionError(new RuntimeException(), - methodName, param).toString(), Matchers - .containsString(methodName)); + methodName, param).toString(), containsString(methodName)); } } |
|
From: David S. <ds...@us...> - 2007-07-09 18:50:15
|
Update of /cvsroot/junit/junit/src/org/junit/experimental/theories/test/javamodel In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28163/src/org/junit/experimental/theories/test/javamodel Modified Files: ConcreteFunctionTest.java FunctionTest.java Log Message: No tests rely on hamcrest-all Index: ConcreteFunctionTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/javamodel/ConcreteFunctionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ConcreteFunctionTest.java 2 Jul 2007 18:10:58 -0000 1.1 +++ ConcreteFunctionTest.java 9 Jul 2007 18:49:21 -0000 1.2 @@ -1,11 +1,10 @@ package org.junit.experimental.theories.test.javamodel; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.hasToString; -import static org.hamcrest.Matchers.not; +import static org.hamcrest.CoreMatchers.allOf; +import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; import static org.junit.Assume.assumeThat; +import static org.junit.experimental.theories.matchers.api.StringContains.containsString; import java.lang.reflect.Method; @@ -71,8 +70,8 @@ try { new ConcreteFunction(this, TO_STRING).invoke(string); } catch (Exception e) { - assertThat(e, allOf(hasToString(containsString(string)), - hasToString(containsString(TO_STRING.toString())))); + assertThat(e.toString(), allOf(containsString(string), + containsString(TO_STRING.toString()))); } } } Index: FunctionTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/javamodel/FunctionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- FunctionTest.java 2 Jul 2007 18:10:58 -0000 1.1 +++ FunctionTest.java 9 Jul 2007 18:49:21 -0000 1.2 @@ -1,7 +1,7 @@ package org.junit.experimental.theories.test.javamodel; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; import org.junit.Before; import org.junit.Test; |
|
From: Build A. <vim...@vi...> - 2007-07-06 16:18:41
|
BUILD result ------------------------------------------------------------ BUILD for junit (#36) on localhost was BROKEN: Script returned non-zero code "1" Build status: http://parabuild.viewtier.com:8080/parabuild/index.htm?view=detailed&buildid=5 Suspect Changes ------------------------------------------------------------ Change(s) by dsaff : - Tests pass without hamcrest-library; Time: 09:04 AM 07/06/2007; Change list: 7255 - Fixed bug 1745048: @After method not called after my test ti; Time: 01:59 PM 07/02/2007; Change list: 7142 - - The hamcrest-core-1.1 library is now included in the JUnit; Time: 11:11 AM 07/02/2007; Change list: 7134 - - The hamcrest-core-1.1 library is now included in the JUnit; Time: 11:10 AM 07/02/2007; Change list: 7133 Change(s) Details: http://parabuild.viewtier.com:8080/parabuild/build/changes.htm?buildrunid=4580 BUILD logs ------------------------------------------------------------ BUILD log: http://parabuild.viewtier.com:8080/parabuild/build/log.htm?logid=6258 Error lines: http://parabuild.viewtier.com:8080/parabuild/build/log.htm?logid=6259 Log Lines Around Error ------------------------------------------------------------ [javac] import org.hamcrest.Factory; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/matchers/api/StringContains.java:6: package org.hamcrest does not exist [javac] import org.hamcrest.Matcher; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/matchers/api/SubstringMatcher.java:3: package org.hamcrest does not exist [javac] import org.hamcrest.Description; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/matchers/api/StringContains.java:27: cannot find symbol [javac] symbol : class Matcher [javac] location: class org.junit.experimental.theories.matchers.api.StringContains [javac] public static Matcher<String> containsString(String substring) { [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/matchers/api/SubstringMatcher.java:21: cannot find symbol [javac] symbol : class Description [javac] location: class org.junit.experimental.theories.matchers.api.SubstringMatcher [javac] public void describeTo(Description description) { [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/test/assertion/AssumptionViolatedExceptionTest.java:3: package org.hamcrest does not exist [javac] import static org.hamcrest.CoreMatchers.is; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/test/assertion/AssumptionViolatedExceptionTest.java:3: static import only from classes and interfaces [javac] import static org.hamcrest.CoreMatchers.is; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/test/assertion/AssumptionViolatedExceptionTest.java:4: package org.hamcrest does not exist [javac] import static org.hamcrest.Matchers.hasToString; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/test/assertion/AssumptionViolatedExceptionTest.java:4: static import only from classes and interfaces [javac] import static org.hamcrest.Matchers.hasToString; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/test/assertion/AssumptionViolatedExceptionTest.java:6: package org.hamcrest does not exist BUILD FAILED [javac] import org.hamcrest.Matcher; /opt/parabuild/etc/build/b5co/a/u/t/o/junit/build.xml:52: Compile failed; see the compiler error output for details. [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/test/assertion/AssumptionViolatedExceptionTest.java:7: package org.hamcrest does not exist Total time: 20 seconds [javac] import org.hamcrest.Matchers; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/test/assertion/AssumptionViolatedExceptionTest.java:8: package org.hamcrest does not exist [javac] import org.hamcrest.StringDescription; [javac] ^ [javac] /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/experimental/theories/test/assertion/AssumptionViolatedExceptionTest.java:19: cannot find symbol [javac] symbol : class Matcher [javac] location: class org.junit.experimental.theories.test.assertion.AssumptionViolatedExceptionTest [javac] public static Matcher<?> IS_THREE= is(3); [javac] ^ [javac] Note: /opt/parabuild/etc/build/b5co/a/u/t/o/junit/src/org/junit/tests/AssumptionTest.java uses or overrides a deprecated API. [javac] Note: Recompile with -Xlint:deprecation for details. [javac] 100 errors Timings ------------------------------------------------------------ BUILD took 22 seconds |
|
From: David S. <ds...@us...> - 2007-07-06 16:04:13
|
Update of /cvsroot/junit/junit/src/org/junit/tests In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17617/src/org/junit/tests Modified Files: AssumptionTest.java AllTests.java Log Message: Tests pass without hamcrest-library Index: AssumptionTest.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/tests/AssumptionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AssumptionTest.java 2 Jul 2007 18:11:09 -0000 1.1 +++ AssumptionTest.java 6 Jul 2007 16:04:09 -0000 1.2 @@ -1,14 +1,12 @@ package org.junit.tests; -import static org.hamcrest.CoreMatchers.*; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; import static org.junit.Assume.assumeNoException; import static org.junit.Assume.assumeNotNull; import static org.junit.Assume.assumeThat; +import static org.junit.experimental.theories.matchers.api.StringContains.containsString; - -import org.hamcrest.Matchers; import org.junit.Assume; import org.junit.Test; import org.junit.Assume.AssumptionViolatedException; @@ -86,12 +84,11 @@ Object[] objects= { 1, 2, null }; assumeNotNull(objects); } catch (AssumptionViolatedException e) { - assertThat(e.getMessage(), Matchers.containsString("1, 2, null")); + assertThat(e.getMessage(), containsString("1, 2, null")); } catch (Exception e) { fail("Should have thrown AssumptionViolatedException"); } } - @Test public void assumeNoExceptionThrows() { final Throwable exception= new NullPointerException(); Index: AllTests.java =================================================================== RCS file: /cvsroot/junit/junit/src/org/junit/tests/AllTests.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- AllTests.java 2 Jul 2007 18:11:09 -0000 1.12 +++ AllTests.java 6 Jul 2007 16:04:09 -0000 1.13 @@ -2,6 +2,8 @@ import junit.framework.JUnit4TestAdapter; import junit.framework.Test; +import org.hamcrest.CoreMatchers; +import org.hamcrest.core.AllOf; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; |
37 messages has been excluded from this view by a project administrator.
