Allow testing to suppress the deprecation banner. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/09803cf4 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/09803cf4 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/09803cf4
Branch: refs/heads/master Commit: 09803cf42f8c183b8893cd5229e02da30db104dc Parents: 0a6e05a Author: Andy Seaborne <[email protected]> Authored: Fri Jun 12 19:44:46 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Fri Jun 12 19:44:46 2015 +0100 ---------------------------------------------------------------------- jena-core/src/main/java/jena/rdfcat.java | 14 ++++++++++---- jena-core/src/test/java/jena/test/Test_rdfcat.java | 11 +++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/09803cf4/jena-core/src/main/java/jena/rdfcat.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/jena/rdfcat.java b/jena-core/src/main/java/jena/rdfcat.java index e80742a..f05517a 100644 --- a/jena-core/src/main/java/jena/rdfcat.java +++ b/jena-core/src/main/java/jena/rdfcat.java @@ -144,6 +144,8 @@ public class rdfcat /** Action queue */ protected List<RCAction> m_actionQ = new ArrayList<>(); + // Allow testing to run silent. + public static boolean suppressDeprecationBanner = false ; // Constants ////////////////////////////////// @@ -209,10 +211,14 @@ public class rdfcat /* main loop */ protected void go( String[] args ) { - - System.err.println( "------------------------------------" ); - System.err.println( "DEPRECATED: Please use riot instead." ); - System.err.println( "------------------------------------\n" ); + + if ( ! suppressDeprecationBanner ) { + System.err.println("------------------------------------------------------------------"); + System.err.println(" DEPRECATED: Please use 'riot' instead."); + System.err.println(" http://jena.apache.org/documentation/io/#command-line-tools";); + System.err.println("------------------------------------------------------------------"); + System.err.println() ; + } // ensure we use the new RIOT parser subsystem enableRIOTParser(); http://git-wip-us.apache.org/repos/asf/jena/blob/09803cf4/jena-core/src/test/java/jena/test/Test_rdfcat.java ---------------------------------------------------------------------- diff --git a/jena-core/src/test/java/jena/test/Test_rdfcat.java b/jena-core/src/test/java/jena/test/Test_rdfcat.java index d2c42aa..1e2a589 100644 --- a/jena-core/src/test/java/jena/test/Test_rdfcat.java +++ b/jena-core/src/test/java/jena/test/Test_rdfcat.java @@ -29,6 +29,17 @@ import org.apache.jena.rdf.model.ModelFactory ; @SuppressWarnings("deprecation") public class Test_rdfcat extends TestCase { + // Switch off the banner during testing. + @Override + public void setUp() { + jena.rdfcat.suppressDeprecationBanner = true ; + } + + @Override + public void tearDown() { + jena.rdfcat.suppressDeprecationBanner = false ; + } + public void testAbbreviationTable() { assertEquals( "RDF/XML", jena.rdfcat.unabbreviate.get( "x" ) );
