You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/09/08 22:10:36 UTC
svn commit: r1520913 - in /jena/trunk/jena-jdbc:
jena-jdbc-core/src/test/java/org/apache/jena/jdbc/
jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/
jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/
jena-jdbc-driver-mem/src/test/...
Author: andy
Date: Sun Sep 8 20:10:36 2013
New Revision: 1520913
URL: http://svn.apache.org/r1520913
Log:
Put logging control in src/test/resources\nSupress expected log messages (and exception dumps) from the build.
Modified:
jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java
jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/TestCompatibility.java
jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java
jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java
jena/trunk/jena-jdbc/jena-jdbc-driver-mem/src/test/java/org/apache/jena/jdbc/mem/connections/TestDatasetConnection.java
jena/trunk/jena-jdbc/jena-jdbc-driver-tdb/src/test/java/org/apache/jena/jdbc/tdb/metadata/TestTdbConnectionMetadata.java
Modified: jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java?rev=1520913&r1=1520912&r2=1520913&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java Sun Sep 8 20:10:36 2013
@@ -18,26 +18,25 @@
package org.apache.jena.jdbc;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.Properties;
-
-import org.apache.jena.jdbc.connections.JenaConnection;
-import org.apache.jena.jdbc.postprocessing.ResultsEcho;
-import org.apache.jena.jdbc.postprocessing.ResultsPostProcessor;
-import org.apache.jena.jdbc.preprocessing.CommandPreProcessor;
-import org.apache.jena.jdbc.preprocessing.Echo;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.query.ARQ;
+import java.io.File ;
+import java.io.FileWriter ;
+import java.io.IOException ;
+import java.sql.Connection ;
+import java.sql.SQLException ;
+import java.util.Iterator ;
+import java.util.Properties ;
+
+import org.apache.jena.jdbc.connections.JenaConnection ;
+import org.apache.jena.jdbc.postprocessing.ResultsEcho ;
+import org.apache.jena.jdbc.postprocessing.ResultsPostProcessor ;
+import org.apache.jena.jdbc.preprocessing.CommandPreProcessor ;
+import org.apache.jena.jdbc.preprocessing.Echo ;
+import org.junit.Assert ;
+import org.junit.Assume ;
+import org.junit.Test ;
+
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.query.ARQ ;
/**
* Abstract tests for {@link JenaDriver} implementations
@@ -46,12 +45,6 @@ import com.hp.hpl.jena.query.ARQ;
public abstract class AbstractJenaDriverTests {
static {
- // Init Log4j
- BasicConfigurator.resetConfiguration();
- BasicConfigurator.configure();
- Logger.getRootLogger().removeAllAppenders();
-
- // Init ARQ
ARQ.init();
}
Modified: jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/TestCompatibility.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/TestCompatibility.java?rev=1520913&r1=1520912&r2=1520913&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/TestCompatibility.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/TestCompatibility.java Sun Sep 8 20:10:36 2013
@@ -18,41 +18,26 @@
package org.apache.jena.jdbc;
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Time;
-import java.sql.Types;
-import java.util.Calendar;
+import java.math.BigDecimal ;
+import java.sql.* ;
+import java.util.Calendar ;
-import org.apache.jena.jdbc.results.metadata.columns.ColumnInfo;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.jena.jdbc.results.metadata.columns.ColumnInfo ;
+import org.junit.Assert ;
+import org.junit.Test ;
-import com.hp.hpl.jena.datatypes.TypeMapper;
-import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.NodeFactory;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.sparql.util.NodeFactoryExtra;
+import com.hp.hpl.jena.datatypes.TypeMapper ;
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
/**
* Tests for the various helper methods of {@link JdbcCompatibility}
- * @author rvesse
- *
*/
public class TestCompatibility {
-
- static {
- // Init Log4j
- BasicConfigurator.resetConfiguration();
- BasicConfigurator.configure();
- Logger.getRootLogger().removeAllAppenders();
- }
/**
* Tests constants are not normalized to different values
Modified: jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java?rev=1520913&r1=1520912&r2=1520913&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java Sun Sep 8 20:10:36 2013
@@ -17,47 +17,32 @@
*/
package org.apache.jena.jdbc.connections;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.ParameterMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.sql.SQLWarning;
-import java.sql.Statement;
-import java.sql.Types;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.apache.jena.jdbc.JdbcCompatibility;
-import org.apache.jena.jdbc.connections.JenaConnection;
-import org.apache.jena.jdbc.postprocessing.ResultsEcho;
-import org.apache.jena.jdbc.preprocessing.Echo;
-import org.apache.jena.jdbc.results.AskResults;
-import org.apache.jena.jdbc.results.SelectResults;
-import org.apache.jena.jdbc.results.TripleIteratorResults;
-import org.apache.jena.jdbc.results.metadata.AskResultsMetadata;
-import org.apache.jena.jdbc.results.metadata.TripleResultsMetadata;
-import org.apache.jena.jdbc.utils.TestUtils;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
-
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.NodeFactory;
-import com.hp.hpl.jena.query.ARQ;
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.sparql.core.Quad;
-import com.hp.hpl.jena.update.UpdateFactory;
-import com.hp.hpl.jena.update.UpdateRequest;
+import java.net.MalformedURLException ;
+import java.net.URL ;
+import java.sql.* ;
+import java.sql.ResultSet ;
+import java.util.HashMap ;
+import java.util.Properties ;
+
+import org.apache.jena.jdbc.JdbcCompatibility ;
+import org.apache.jena.jdbc.postprocessing.ResultsEcho ;
+import org.apache.jena.jdbc.preprocessing.Echo ;
+import org.apache.jena.jdbc.results.AskResults ;
+import org.apache.jena.jdbc.results.SelectResults ;
+import org.apache.jena.jdbc.results.TripleIteratorResults ;
+import org.apache.jena.jdbc.results.metadata.AskResultsMetadata ;
+import org.apache.jena.jdbc.results.metadata.TripleResultsMetadata ;
+import org.apache.jena.jdbc.utils.TestUtils ;
+import org.junit.Assert ;
+import org.junit.Assume ;
+import org.junit.Test ;
+
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.query.* ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.update.UpdateFactory ;
+import com.hp.hpl.jena.update.UpdateRequest ;
/**
* Abstract tests for {@link JenaConnection} implementations
@@ -66,12 +51,6 @@ import com.hp.hpl.jena.update.UpdateRequ
public abstract class AbstractJenaConnectionTests {
static {
- // Init Log4j
- BasicConfigurator.resetConfiguration();
- BasicConfigurator.configure();
- Logger.getRootLogger().removeAllAppenders();
-
- // Init ARQ
ARQ.init();
}
Modified: jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java?rev=1520913&r1=1520912&r2=1520913&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java Sun Sep 8 20:10:36 2013
@@ -18,50 +18,27 @@
package org.apache.jena.jdbc.results;
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.sql.SQLWarning;
-import java.sql.SQLXML;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.HashMap;
-
-import org.apache.jena.jdbc.JdbcCompatibility;
-import org.apache.jena.jdbc.results.metadata.AskResultsMetadata;
-import org.apache.jena.jdbc.results.metadata.TripleResultsMetadata;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.hp.hpl.jena.datatypes.TypeMapper;
-import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
-import com.hp.hpl.jena.query.ARQ;
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.sparql.util.NodeFactoryExtra;
-import com.hp.hpl.jena.vocabulary.XSD;
+import java.io.InputStream ;
+import java.io.Reader ;
+import java.math.BigDecimal ;
+import java.sql.* ;
+import java.util.Calendar ;
+import java.util.HashMap ;
+
+import org.apache.jena.jdbc.JdbcCompatibility ;
+import org.apache.jena.jdbc.results.metadata.AskResultsMetadata ;
+import org.apache.jena.jdbc.results.metadata.TripleResultsMetadata ;
+import org.junit.* ;
+
+import com.hp.hpl.jena.datatypes.TypeMapper ;
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
+import com.hp.hpl.jena.query.ARQ ;
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.query.DatasetFactory ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.rdf.model.Statement ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
+import com.hp.hpl.jena.vocabulary.XSD ;
/**
* Abstract tests for Jena JDBC {@link ResultSet} implementations, these tests
@@ -72,12 +49,6 @@ import com.hp.hpl.jena.vocabulary.XSD;
public abstract class AbstractResultSetTests {
static {
- // Init Log4j
- BasicConfigurator.resetConfiguration();
- BasicConfigurator.configure();
- Logger.getRootLogger().removeAllAppenders();
-
- // Init ARQ
ARQ.init();
}
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-mem/src/test/java/org/apache/jena/jdbc/mem/connections/TestDatasetConnection.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-mem/src/test/java/org/apache/jena/jdbc/mem/connections/TestDatasetConnection.java?rev=1520913&r1=1520912&r2=1520913&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-mem/src/test/java/org/apache/jena/jdbc/mem/connections/TestDatasetConnection.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-mem/src/test/java/org/apache/jena/jdbc/mem/connections/TestDatasetConnection.java Sun Sep 8 20:10:36 2013
@@ -31,9 +31,6 @@ import com.hp.hpl.jena.query.DatasetFact
/**
* Tests for the {@link DatasetConnection}
- *
- * @author rvesse
- *
*/
public class TestDatasetConnection extends AbstractJenaConnectionTests {
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-tdb/src/test/java/org/apache/jena/jdbc/tdb/metadata/TestTdbConnectionMetadata.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-tdb/src/test/java/org/apache/jena/jdbc/tdb/metadata/TestTdbConnectionMetadata.java?rev=1520913&r1=1520912&r2=1520913&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-tdb/src/test/java/org/apache/jena/jdbc/tdb/metadata/TestTdbConnectionMetadata.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-tdb/src/test/java/org/apache/jena/jdbc/tdb/metadata/TestTdbConnectionMetadata.java Sun Sep 8 20:10:36 2013
@@ -36,8 +36,6 @@ import com.hp.hpl.jena.tdb.base.file.Loc
/**
* Tests database metadata for TDB connections
- * @author rvesse
- *
*/
public class TestTdbConnectionMetadata extends AbstractDatabaseMetadataTests {