You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2011/07/19 18:19:45 UTC
svn commit: r1148429 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
suites/All.java tests/largedata/LobLimitsClientTest.java
tests/largedata/_Suite.java tests/largedata/build.xml
Author: kmarsden
Date: Tue Jul 19 16:19:44 2011
New Revision: 1148429
URL: http://svn.apache.org/viewvc?rev=1148429&view=rev
Log:
DERBY-1903 Convert largedata/LobLimits.java to junit
DERBY-5308 Investigate if largeData/LobLimits.java can be run for client
- adds a separate test for the big client run LobLimitsClientTest.
- Adds largedata._Suite which will run first the lite tests and then the full embedded and client.
- Adds LobLimitsLiteTest to sutes.All
- Changes build.xml so that the the property files for the old test will still be copied. The previous change of build.xml accidentally removed this.
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsClientTest.java (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java (with props)
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/All.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/All.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/All.java?rev=1148429&r1=1148428&r2=1148429&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/All.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/All.java Tue Jul 19 16:19:44 2011
@@ -49,6 +49,9 @@ public class All extends BaseTestCase {
// All package tests
suite.addTest(AllPackages.suite());
+ // For the largedata test, just run the lite version of the test as
+ // the full test is too big.
+ suite.addTest(org.apache.derbyTesting.functionTests.tests.largedata._Suite.suiteLite());
return suite;
}
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsClientTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsClientTest.java?rev=1148429&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsClientTest.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsClientTest.java Tue Jul 19 16:19:44 2011
@@ -0,0 +1,42 @@
+/*
+
+Derby - Class org.apache.derbyTesting.functionTests.tests.largedata.LobLimitsClientTest
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+*/
+package org.apache.derbyTesting.functionTests.tests.largedata;
+
+import org.apache.derbyTesting.junit.TestConfiguration;
+
+import junit.framework.Test;
+
+/**
+ * LobLimitsClientTest runs the large lob limits test for the
+ * client. It is separated from LobLimitsTest because the
+ * test takes so long that it is convenient to run it separately
+ *
+ */
+public class LobLimitsClientTest extends LobLimitsTest {
+
+ public LobLimitsClientTest(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ return TestConfiguration.clientServerDecorator(LobLimitsTest.suite());
+ }
+}
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsClientTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java?rev=1148429&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java Tue Jul 19 16:19:44 2011
@@ -0,0 +1,57 @@
+/*
+
+Derby - Class org.apache.derbyTesting.functionTests.tests.largedata._Suite
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+*/
+package org.apache.derbyTesting.functionTests.tests.largedata;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+
+public class _Suite extends BaseJDBCTestCase {
+
+ public _Suite(String name) {
+ super(name);
+ }
+
+ /**
+ * Suite runs first the lite suite for both embedded and client with LobLimitsLiteTest
+ * Then runs the full embeddded suite with LobLimitsTest
+ * Then runs the full client suite with LobLimitsClientTest.
+ * The full suite may take a very long time.
+ */
+ public static Test suite() {
+ TestSuite suite = new TestSuite("largedata suite");
+ suite.addTest(LobLimitsLiteTest.suite());
+ suite.addTest(LobLimitsTest.suite());
+ suite.addTest(LobLimitsClientTest.suite());
+ return suite;
+
+ }
+
+
+ /**
+ * Just the lite test for running with suites.All
+ */
+ public static Test suiteLite() {
+ return LobLimitsLiteTest.suite();
+ }
+
+}
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml?rev=1148429&r1=1148428&r2=1148429&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml Tue Jul 19 16:19:44 2011
@@ -38,7 +38,7 @@
<!-- Targets -->
- <target name="largedatatests"
+ <target name="largedatatests" depends="copyfiles"
description="Build Derby largedata tests">
<javac
source="1.4"
@@ -60,6 +60,12 @@
<include name="${derby.testing.functest.dir}/tests/largedata/*.java"/>
</javac>
</target>
-
+
+ <target name="copyfiles">
+ <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/largedata">
+ <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/largedata"
+ includes="*.sql,*.properties,*.subsql,*.policy,*.jar,*.dat,*.tstlog,xmlTestFiles/*"/>
+ </copy>
+ </target>
</project>