diff options
| author | Steven Knight <knight@baldmt.com> | 2009-02-06 14:55:23 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-02-06 14:55:23 (GMT) |
| commit | e112f6b49c9063e6a584ff4f7abf9d7a644eef30 (patch) | |
| tree | 978573b4ff11f036428c0a08a89085313ad990fa /test/Repository/RMIC.py | |
| parent | 9405dad6e18db3934eec7b992e12a2016b1466db (diff) | |
| download | SCons-e112f6b49c9063e6a584ff4f7abf9d7a644eef30.zip SCons-e112f6b49c9063e6a584ff4f7abf9d7a644eef30.tar.gz SCons-e112f6b49c9063e6a584ff4f7abf9d7a644eef30.tar.bz2 | |
Commonize new string-search-in-output methods:
test.must_contain_all_lines()
test.must_contain_any_line()
test.must_not_contain_any_line()
Update tests to use them. Remove "import string" lines where the
change made them unnecessary.
Diffstat (limited to 'test/Repository/RMIC.py')
| -rw-r--r-- | test/Repository/RMIC.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/Repository/RMIC.py b/test/Repository/RMIC.py index bf8edff..f3c412b 100644 --- a/test/Repository/RMIC.py +++ b/test/Repository/RMIC.py @@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test building Java applications when using Repositories. """ -import string - import TestSCons python = TestSCons.python @@ -275,8 +273,12 @@ public class Foo2 extends UnicastRemoteObject implements Hello { test.run(chdir = 'work1', options = opts, arguments = ".") -test.fail_test(string.find(test.stdout(), ' src/Foo1.java src/Foo2.java') == -1) -test.fail_test(string.find(test.stdout(), ' com.sub.foo.Foo1 com.sub.foo.Foo2') == -1) +expect = [ + ' src/Foo1.java src/Foo2.java', + ' com.sub.foo.Foo1 com.sub.foo.Foo2', +] + +test.must_contain_all_lines(test.stdout(), expect) # XXX I'd rather run the resulting class files through the JVM here to # see that they were built from the proper work1 sources, but I don't |