From b9edbcbf6d14479e2e585386d50e7603c1cb0b1a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 9 Mar 2012 19:42:00 +0100 Subject: [PATCH] added base class for data source connection tests --- .../DataSourceConnectionProviderTest.java | 22 +------ .../jdbc/DataSourceConnectionTestBase.java | 64 +++++++++++++++++++ 2 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 scm-backend-jdbc/src/test/java/sonia/scm/jdbc/DataSourceConnectionTestBase.java diff --git a/scm-backend-jdbc/src/test/java/sonia/scm/jdbc/DataSourceConnectionProviderTest.java b/scm-backend-jdbc/src/test/java/sonia/scm/jdbc/DataSourceConnectionProviderTest.java index f743542fdf..339feb873b 100644 --- a/scm-backend-jdbc/src/test/java/sonia/scm/jdbc/DataSourceConnectionProviderTest.java +++ b/scm-backend-jdbc/src/test/java/sonia/scm/jdbc/DataSourceConnectionProviderTest.java @@ -33,7 +33,6 @@ package sonia.scm.jdbc; //~--- non-JDK imports -------------------------------------------------------- -import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.*; @@ -43,33 +42,14 @@ import static org.junit.Assert.*; import java.sql.Connection; import java.sql.SQLException; -import javax.naming.Context; - /** * * @author Sebastian Sdorra */ public class DataSourceConnectionProviderTest + extends DataSourceConnectionTestBase { - /** - * Method description - * - * - * @throws Exception - */ - @BeforeClass - public static void setUpClass() throws Exception - { - System.setProperty("derby.stream.error.field", "java.lang.System.err"); - - // Create initial context - System.setProperty(Context.INITIAL_CONTEXT_FACTORY, - TestIntialContextFactory.class.getName()); - } - - //~--- methods -------------------------------------------------------------- - /** * Method description * diff --git a/scm-backend-jdbc/src/test/java/sonia/scm/jdbc/DataSourceConnectionTestBase.java b/scm-backend-jdbc/src/test/java/sonia/scm/jdbc/DataSourceConnectionTestBase.java new file mode 100644 index 0000000000..486ee91971 --- /dev/null +++ b/scm-backend-jdbc/src/test/java/sonia/scm/jdbc/DataSourceConnectionTestBase.java @@ -0,0 +1,64 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.jdbc; + +//~--- non-JDK imports -------------------------------------------------------- + +import org.junit.BeforeClass; + +//~--- JDK imports ------------------------------------------------------------ + +import javax.naming.Context; + +/** + * + * @author Sebastian Sdorra + */ +public class DataSourceConnectionTestBase +{ + + /** + * Method description + * + * + * @throws Exception + */ + @BeforeClass + public static void setUpClass() throws Exception + { + System.setProperty("derby.stream.error.field", "java.lang.System.err"); + + // Create initial context + System.setProperty(Context.INITIAL_CONTEXT_FACTORY, + TestIntialContextFactory.class.getName()); + } +}