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 my...@apache.org on 2011/04/28 16:23:56 UTC
svn commit: r1097477 - in /db/derby/code/branches/10.8: ./
java/testing/org/apache/derbyTesting/functionTests/tests/tools/
Author: myrnavl
Date: Thu Apr 28 14:23:56 2011
New Revision: 1097477
URL: http://svn.apache.org/viewvc?rev=1097477&view=rev
Log:
DERBY-5084; convert ijConnName.sql to a ScriptTest junit test
backported adding last test case from trunk, merge commands;
svn merge -c 1097460 https://svn.apache.org/repos/asf/db/derby/code/trunk
patch contributed by Houx Zhang (houxzhang at gmail dot com)
svn merge -c 1097469 https://svn.apache.org/repos/asf/db/derby/code/trunk
svn merge -c 1097471 https://svn.apache.org/repos/asf/db/derby/code/trunk
Added:
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java
- copied, changed from r1097460, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 28 14:23:56 2011
@@ -1,2 +1,2 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097460,1097469,1097471
Copied: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java (from r1097460, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java)
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java?p2=db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java&p1=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java&r1=1097460&r2=1097477&rev=1097477&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java Thu Apr 28 14:23:56 2011
@@ -1,3 +1,24 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.tests.tools.ConnectWrongSubprotocolTest
+
+ 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.tools;
import java.io.ByteArrayInputStream;
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java?rev=1097477&r1=1097476&r2=1097477&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java Thu Apr 28 14:23:56 2011
@@ -1,3 +1,24 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.tests.tools.IjConnNameTest
+
+ 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.tools;
import java.io.File;
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java?rev=1097477&r1=1097476&r2=1097477&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java Thu Apr 28 14:23:56 2011
@@ -56,6 +56,7 @@ public class _Suite extends BaseTestCase
suite.addTest(SysinfoLocaleTest.suite());
suite.addTest(IjSecurityManagerTest.suite());
suite.addTest(IjConnNameTest.suite());
+ suite.addTest(ConnectWrongSubprotocolTest.suite());
// SysinfoAPITest currently fails when run against jars, so is
// disabled. Only the first jar file on the classpath properly