harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r436644 [4/6] - /incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/
Date Fri, 25 Aug 2006 04:29:36 GMT
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_ResultSetMetaData.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_ResultSetMetaData.java?rev=436644&r1=436643&r2=436644&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_ResultSetMetaData.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_ResultSetMetaData.java Thu Aug 24 21:29:34 2006
@@ -1,132 +1,132 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.harmony.sql.tests.java.sql;
-
-import java.sql.ResultSetMetaData;
-
-public class Impl_ResultSetMetaData implements ResultSetMetaData {
-
-	public Impl_ResultSetMetaData() {
-		super();
-	} // end constructor
-
-	public int getColumnCount() {
-
-		return 1906478379;
-	} // end method getColumnCount
-
-	public boolean isAutoIncrement(int parm1) {
-
-		return false;
-	} // end method isAutoIncrement
-
-	public boolean isCaseSensitive(int parm1) {
-
-		return false;
-	} // end method isCaseSensitive
-
-	public boolean isSearchable(int parm1) {
-
-		return false;
-	} // end method isSearchable
-
-	public boolean isCurrency(int parm1) {
-
-		return true;
-	} // end method isCurrency
-
-	public int isNullable(int parm1) {
-
-		return -2012354011;
-	} // end method isNullable
-
-	public boolean isSigned(int parm1) {
-
-		return false;
-	} // end method isSigned
-
-	public int getColumnDisplaySize(int parm1) {
-
-		return 464916191;
-	} // end method getColumnDisplaySize
-
-	public String getColumnLabel(int parm1) {
-
-		return null;
-	} // end method getColumnLabel
-
-	public String getColumnName(int parm1) {
-
-		return null;
-	} // end method getColumnName
-
-	public String getSchemaName(int parm1) {
-
-		return null;
-	} // end method getSchemaName
-
-	public int getPrecision(int parm1) {
-
-		return 1886638205;
-	} // end method getPrecision
-
-	public int getScale(int parm1) {
-
-		return 345387258;
-	} // end method getScale
-
-	public String getTableName(int parm1) {
-
-		return null;
-	} // end method getTableName
-
-	public String getCatalogName(int parm1) {
-
-		return null;
-	} // end method getCatalogName
-
-	public int getColumnType(int parm1) {
-
-		return -1629730083;
-	} // end method getColumnType
-
-	public String getColumnTypeName(int parm1) {
-
-		return null;
-	} // end method getColumnTypeName
-
-	public boolean isReadOnly(int parm1) {
-
-		return false;
-	} // end method isReadOnly
-
-	public boolean isWritable(int parm1) {
-
-		return true;
-	} // end method isWritable
-
-	public boolean isDefinitelyWritable(int parm1) {
-
-		return false;
-	} // end method isDefinitelyWritable
-
-	public String getColumnClassName(int parm1) {
-
-		return null;
-	} // end method getColumnClassName
-
-} // end class ResultSetMetaDataTest
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.harmony.sql.tests.java.sql;
+
+import java.sql.ResultSetMetaData;
+
+public class Impl_ResultSetMetaData implements ResultSetMetaData {
+
+	public Impl_ResultSetMetaData() {
+		super();
+	} // end constructor
+
+	public int getColumnCount() {
+
+		return 1906478379;
+	} // end method getColumnCount
+
+	public boolean isAutoIncrement(int parm1) {
+
+		return false;
+	} // end method isAutoIncrement
+
+	public boolean isCaseSensitive(int parm1) {
+
+		return false;
+	} // end method isCaseSensitive
+
+	public boolean isSearchable(int parm1) {
+
+		return false;
+	} // end method isSearchable
+
+	public boolean isCurrency(int parm1) {
+
+		return true;
+	} // end method isCurrency
+
+	public int isNullable(int parm1) {
+
+		return -2012354011;
+	} // end method isNullable
+
+	public boolean isSigned(int parm1) {
+
+		return false;
+	} // end method isSigned
+
+	public int getColumnDisplaySize(int parm1) {
+
+		return 464916191;
+	} // end method getColumnDisplaySize
+
+	public String getColumnLabel(int parm1) {
+
+		return null;
+	} // end method getColumnLabel
+
+	public String getColumnName(int parm1) {
+
+		return null;
+	} // end method getColumnName
+
+	public String getSchemaName(int parm1) {
+
+		return null;
+	} // end method getSchemaName
+
+	public int getPrecision(int parm1) {
+
+		return 1886638205;
+	} // end method getPrecision
+
+	public int getScale(int parm1) {
+
+		return 345387258;
+	} // end method getScale
+
+	public String getTableName(int parm1) {
+
+		return null;
+	} // end method getTableName
+
+	public String getCatalogName(int parm1) {
+
+		return null;
+	} // end method getCatalogName
+
+	public int getColumnType(int parm1) {
+
+		return -1629730083;
+	} // end method getColumnType
+
+	public String getColumnTypeName(int parm1) {
+
+		return null;
+	} // end method getColumnTypeName
+
+	public boolean isReadOnly(int parm1) {
+
+		return false;
+	} // end method isReadOnly
+
+	public boolean isWritable(int parm1) {
+
+		return true;
+	} // end method isWritable
+
+	public boolean isDefinitelyWritable(int parm1) {
+
+		return false;
+	} // end method isDefinitelyWritable
+
+	public String getColumnClassName(int parm1) {
+
+		return null;
+	} // end method getColumnClassName
+
+} // end class ResultSetMetaDataTest
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_ResultSetMetaData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Statement.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Statement.java?rev=436644&r1=436643&r2=436644&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Statement.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Statement.java Thu Aug 24 21:29:34 2006
@@ -1,203 +1,203 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.harmony.sql.tests.java.sql;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLWarning;
-import java.sql.Statement;
-
-public class Impl_Statement implements Statement {
-
-	public Impl_Statement() {
-		super();
-	} // end constructor
-
-	public ResultSet executeQuery(String parm1) {
-
-		return null;
-	} // end method executeQuery
-
-	public int executeUpdate(String parm1) {
-
-		return -471239308;
-	} // end method executeUpdate
-
-	public void close() {
-
-	} // end method close
-
-	public int getMaxFieldSize() {
-
-		return 320138583;
-	} // end method getMaxFieldSize
-
-	public void setMaxFieldSize(int parm1) {
-
-	} // end method setMaxFieldSize
-
-	public int getMaxRows() {
-
-		return 1573292921;
-	} // end method getMaxRows
-
-	public void setMaxRows(int parm1) {
-
-	} // end method setMaxRows
-
-	public void setEscapeProcessing(boolean parm1) {
-
-	} // end method setEscapeProcessing
-
-	public int getQueryTimeout() {
-
-		return 488489018;
-	} // end method getQueryTimeout
-
-	public void setQueryTimeout(int parm1) {
-
-	} // end method setQueryTimeout
-
-	public void cancel() {
-
-	} // end method cancel
-
-	public SQLWarning getWarnings() {
-
-		return null;
-	} // end method getWarnings
-
-	public void clearWarnings() {
-
-	} // end method clearWarnings
-
-	public void setCursorName(String parm1) {
-
-	} // end method setCursorName
-
-	public boolean execute(String parm1) {
-
-		return false;
-	} // end method execute
-
-	public ResultSet getResultSet() {
-
-		return null;
-	} // end method getResultSet
-
-	public int getUpdateCount() {
-
-		return -1538600051;
-	} // end method getUpdateCount
-
-	public boolean getMoreResults() {
-
-		return true;
-	} // end method getMoreResults
-
-	public void setFetchDirection(int parm1) {
-
-	} // end method setFetchDirection
-
-	public int getFetchDirection() {
-
-		return -658236915;
-	} // end method getFetchDirection
-
-	public void setFetchSize(int parm1) {
-
-	} // end method setFetchSize
-
-	public int getFetchSize() {
-
-		return -1977059789;
-	} // end method getFetchSize
-
-	public int getResultSetConcurrency() {
-
-		return -593487597;
-	} // end method getResultSetConcurrency
-
-	public int getResultSetType() {
-
-		return 1701256610;
-	} // end method getResultSetType
-
-	public void addBatch(String parm1) {
-
-	} // end method addBatch
-
-	public void clearBatch() {
-
-	} // end method clearBatch
-
-	public int[] executeBatch() {
-
-		return null;
-	} // end method executeBatch
-
-	public Connection getConnection() {
-
-		return null;
-	} // end method getConnection
-
-	public boolean getMoreResults(int parm1) {
-
-		return true;
-	} // end method getMoreResults
-
-	public ResultSet getGeneratedKeys() {
-
-		return null;
-	} // end method getGeneratedKeys
-
-	public int executeUpdate(String parm1, int parm2) {
-
-		return 25207131;
-	} // end method executeUpdate
-
-	public int executeUpdate(String parm1, int[] parm2) {
-
-		return -299033331;
-	} // end method executeUpdate
-
-	public int executeUpdate(String parm1, String[] parm2) {
-
-		return -843663358;
-	} // end method executeUpdate
-
-	public boolean execute(String parm1, int parm2) {
-
-		return false;
-	} // end method execute
-
-	public boolean execute(String parm1, int[] parm2) {
-
-		return true;
-	} // end method execute
-
-	public boolean execute(String parm1, String[] parm2) {
-
-		return false;
-	} // end method execute
-
-	public int getResultSetHoldability() {
-
-		return -1288251923;
-	} // end method getResultSetHoldability
-
-} // end class StatementTest
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.harmony.sql.tests.java.sql;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLWarning;
+import java.sql.Statement;
+
+public class Impl_Statement implements Statement {
+
+	public Impl_Statement() {
+		super();
+	} // end constructor
+
+	public ResultSet executeQuery(String parm1) {
+
+		return null;
+	} // end method executeQuery
+
+	public int executeUpdate(String parm1) {
+
+		return -471239308;
+	} // end method executeUpdate
+
+	public void close() {
+
+	} // end method close
+
+	public int getMaxFieldSize() {
+
+		return 320138583;
+	} // end method getMaxFieldSize
+
+	public void setMaxFieldSize(int parm1) {
+
+	} // end method setMaxFieldSize
+
+	public int getMaxRows() {
+
+		return 1573292921;
+	} // end method getMaxRows
+
+	public void setMaxRows(int parm1) {
+
+	} // end method setMaxRows
+
+	public void setEscapeProcessing(boolean parm1) {
+
+	} // end method setEscapeProcessing
+
+	public int getQueryTimeout() {
+
+		return 488489018;
+	} // end method getQueryTimeout
+
+	public void setQueryTimeout(int parm1) {
+
+	} // end method setQueryTimeout
+
+	public void cancel() {
+
+	} // end method cancel
+
+	public SQLWarning getWarnings() {
+
+		return null;
+	} // end method getWarnings
+
+	public void clearWarnings() {
+
+	} // end method clearWarnings
+
+	public void setCursorName(String parm1) {
+
+	} // end method setCursorName
+
+	public boolean execute(String parm1) {
+
+		return false;
+	} // end method execute
+
+	public ResultSet getResultSet() {
+
+		return null;
+	} // end method getResultSet
+
+	public int getUpdateCount() {
+
+		return -1538600051;
+	} // end method getUpdateCount
+
+	public boolean getMoreResults() {
+
+		return true;
+	} // end method getMoreResults
+
+	public void setFetchDirection(int parm1) {
+
+	} // end method setFetchDirection
+
+	public int getFetchDirection() {
+
+		return -658236915;
+	} // end method getFetchDirection
+
+	public void setFetchSize(int parm1) {
+
+	} // end method setFetchSize
+
+	public int getFetchSize() {
+
+		return -1977059789;
+	} // end method getFetchSize
+
+	public int getResultSetConcurrency() {
+
+		return -593487597;
+	} // end method getResultSetConcurrency
+
+	public int getResultSetType() {
+
+		return 1701256610;
+	} // end method getResultSetType
+
+	public void addBatch(String parm1) {
+
+	} // end method addBatch
+
+	public void clearBatch() {
+
+	} // end method clearBatch
+
+	public int[] executeBatch() {
+
+		return null;
+	} // end method executeBatch
+
+	public Connection getConnection() {
+
+		return null;
+	} // end method getConnection
+
+	public boolean getMoreResults(int parm1) {
+
+		return true;
+	} // end method getMoreResults
+
+	public ResultSet getGeneratedKeys() {
+
+		return null;
+	} // end method getGeneratedKeys
+
+	public int executeUpdate(String parm1, int parm2) {
+
+		return 25207131;
+	} // end method executeUpdate
+
+	public int executeUpdate(String parm1, int[] parm2) {
+
+		return -299033331;
+	} // end method executeUpdate
+
+	public int executeUpdate(String parm1, String[] parm2) {
+
+		return -843663358;
+	} // end method executeUpdate
+
+	public boolean execute(String parm1, int parm2) {
+
+		return false;
+	} // end method execute
+
+	public boolean execute(String parm1, int[] parm2) {
+
+		return true;
+	} // end method execute
+
+	public boolean execute(String parm1, String[] parm2) {
+
+		return false;
+	} // end method execute
+
+	public int getResultSetHoldability() {
+
+		return -1288251923;
+	} // end method getResultSetHoldability
+
+} // end class StatementTest
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Statement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java?rev=436644&r1=436643&r2=436644&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java Thu Aug 24 21:29:34 2006
@@ -1,92 +1,92 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.harmony.sql.tests.java.sql;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-public class ParameterMetaDataTest extends TestCase {
-
-	/*
-	 * Public statics test
-	 */
-	public void testPublicStatics() {
-
-		HashMap thePublicStatics = new HashMap();
-		thePublicStatics.put("parameterModeOut", new Integer(4));
-		thePublicStatics.put("parameterModeInOut", new Integer(2));
-		thePublicStatics.put("parameterModeIn", new Integer(1));
-		thePublicStatics.put("parameterModeUnknown", new Integer(0));
-		thePublicStatics.put("parameterNullableUnknown", new Integer(2));
-		thePublicStatics.put("parameterNullable", new Integer(1));
-		thePublicStatics.put("parameterNoNulls", new Integer(0));
-
-		/*
-		 * System.out.println( "parameterModeOut: " +
-		 * ParameterMetaData.parameterModeOut ); System.out.println(
-		 * "parameterModeInOut: " + ParameterMetaData.parameterModeInOut );
-		 * System.out.println( "parameterModeIn: " +
-		 * ParameterMetaData.parameterModeIn ); System.out.println(
-		 * "parameterModeUnknown: " + ParameterMetaData.parameterModeUnknown );
-		 * System.out.println( "parameterNullableUnknown: " +
-		 * ParameterMetaData.parameterNullableUnknown ); System.out.println(
-		 * "parameterNullable: " + ParameterMetaData.parameterNullable );
-		 * System.out.println( "parameterNoNulls: " +
-		 * ParameterMetaData.parameterNoNulls );
-		 */
-
-		Class parameterMetaDataClass;
-		try {
-			parameterMetaDataClass = Class
-					.forName("java.sql.ParameterMetaData");
-		} catch (ClassNotFoundException e) {
-			fail("java.sql.ParameterMetaData class not found!");
-			return;
-		} // end try
-
-		Field[] theFields = parameterMetaDataClass.getDeclaredFields();
-		int requiredModifier = Modifier.PUBLIC + Modifier.STATIC
-				+ Modifier.FINAL;
-
-		int countPublicStatics = 0;
-		for (int i = 0; i < theFields.length; i++) {
-			String fieldName = theFields[i].getName();
-			int theMods = theFields[i].getModifiers();
-			if (Modifier.isPublic(theMods) && Modifier.isStatic(theMods)) {
-				try {
-					Object fieldValue = theFields[i].get(null);
-					Object expectedValue = thePublicStatics.get(fieldName);
-					if (expectedValue == null) {
-						fail("Field " + fieldName + " missing!");
-					} // end
-					assertEquals("Field " + fieldName + " value mismatch: ",
-							expectedValue, fieldValue);
-					assertEquals("Field " + fieldName + " modifier mismatch: ",
-							requiredModifier, theMods);
-					countPublicStatics++;
-				} catch (IllegalAccessException e) {
-					fail("Illegal access to Field " + fieldName);
-				} // end try
-			} // end if
-		} // end for
-
-	} // end method testPublicStatics
-
-} // end class ParameterMetaDataTest
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.harmony.sql.tests.java.sql;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+
+import junit.framework.TestCase;
+
+public class ParameterMetaDataTest extends TestCase {
+
+	/*
+	 * Public statics test
+	 */
+	public void testPublicStatics() {
+
+		HashMap thePublicStatics = new HashMap();
+		thePublicStatics.put("parameterModeOut", new Integer(4));
+		thePublicStatics.put("parameterModeInOut", new Integer(2));
+		thePublicStatics.put("parameterModeIn", new Integer(1));
+		thePublicStatics.put("parameterModeUnknown", new Integer(0));
+		thePublicStatics.put("parameterNullableUnknown", new Integer(2));
+		thePublicStatics.put("parameterNullable", new Integer(1));
+		thePublicStatics.put("parameterNoNulls", new Integer(0));
+
+		/*
+		 * System.out.println( "parameterModeOut: " +
+		 * ParameterMetaData.parameterModeOut ); System.out.println(
+		 * "parameterModeInOut: " + ParameterMetaData.parameterModeInOut );
+		 * System.out.println( "parameterModeIn: " +
+		 * ParameterMetaData.parameterModeIn ); System.out.println(
+		 * "parameterModeUnknown: " + ParameterMetaData.parameterModeUnknown );
+		 * System.out.println( "parameterNullableUnknown: " +
+		 * ParameterMetaData.parameterNullableUnknown ); System.out.println(
+		 * "parameterNullable: " + ParameterMetaData.parameterNullable );
+		 * System.out.println( "parameterNoNulls: " +
+		 * ParameterMetaData.parameterNoNulls );
+		 */
+
+		Class parameterMetaDataClass;
+		try {
+			parameterMetaDataClass = Class
+					.forName("java.sql.ParameterMetaData");
+		} catch (ClassNotFoundException e) {
+			fail("java.sql.ParameterMetaData class not found!");
+			return;
+		} // end try
+
+		Field[] theFields = parameterMetaDataClass.getDeclaredFields();
+		int requiredModifier = Modifier.PUBLIC + Modifier.STATIC
+				+ Modifier.FINAL;
+
+		int countPublicStatics = 0;
+		for (int i = 0; i < theFields.length; i++) {
+			String fieldName = theFields[i].getName();
+			int theMods = theFields[i].getModifiers();
+			if (Modifier.isPublic(theMods) && Modifier.isStatic(theMods)) {
+				try {
+					Object fieldValue = theFields[i].get(null);
+					Object expectedValue = thePublicStatics.get(fieldName);
+					if (expectedValue == null) {
+						fail("Field " + fieldName + " missing!");
+					} // end
+					assertEquals("Field " + fieldName + " value mismatch: ",
+							expectedValue, fieldValue);
+					assertEquals("Field " + fieldName + " modifier mismatch: ",
+							requiredModifier, theMods);
+					countPublicStatics++;
+				} catch (IllegalAccessException e) {
+					fail("Illegal access to Field " + fieldName);
+				} // end try
+			} // end if
+		} // end for
+
+	} // end method testPublicStatics
+
+} // end class ParameterMetaDataTest
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java?rev=436644&r1=436643&r2=436644&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java Thu Aug 24 21:29:34 2006
@@ -1,82 +1,82 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.harmony.sql.tests.java.sql;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-public class ResultSetMetaDataTest extends TestCase {
-
-	/*
-	 * Public statics test
-	 */
-	public void testPublicStatics() {
-
-		HashMap thePublicStatics = new HashMap();
-		thePublicStatics.put("columnNullableUnknown", new Integer(2));
-		thePublicStatics.put("columnNullable", new Integer(1));
-		thePublicStatics.put("columnNoNulls", new Integer(0));
-
-		/*
-		 * System.out.println( "columnNullableUnknown: " +
-		 * ResultSetMetaData.columnNullableUnknown ); System.out.println(
-		 * "columnNullable: " + ResultSetMetaData.columnNullable );
-		 * System.out.println( "columnNoNulls: " +
-		 * ResultSetMetaData.columnNoNulls );
-		 */
-
-		Class resultSetMetaDataClass;
-		try {
-			resultSetMetaDataClass = Class
-					.forName("java.sql.ResultSetMetaData");
-		} catch (ClassNotFoundException e) {
-			fail("java.sql.ResultSetMetaData class not found!");
-			return;
-		} // end try
-
-		Field[] theFields = resultSetMetaDataClass.getDeclaredFields();
-		int requiredModifier = Modifier.PUBLIC + Modifier.STATIC
-				+ Modifier.FINAL;
-
-		int countPublicStatics = 0;
-		for (int i = 0; i < theFields.length; i++) {
-			String fieldName = theFields[i].getName();
-			int theMods = theFields[i].getModifiers();
-			if (Modifier.isPublic(theMods) && Modifier.isStatic(theMods)) {
-				try {
-					Object fieldValue = theFields[i].get(null);
-					Object expectedValue = thePublicStatics.get(fieldName);
-					if (expectedValue == null) {
-						fail("Field " + fieldName + " missing!");
-					} // end
-					assertEquals("Field " + fieldName + " value mismatch: ",
-							expectedValue, fieldValue);
-					assertEquals("Field " + fieldName + " modifier mismatch: ",
-							requiredModifier, theMods);
-					countPublicStatics++;
-				} catch (IllegalAccessException e) {
-					fail("Illegal access to Field " + fieldName);
-				} // end try
-			} // end if
-		} // end for
-
-	} // end method testPublicStatics
-
-} // end class ResultSetMetaDataTest
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.harmony.sql.tests.java.sql;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+
+import junit.framework.TestCase;
+
+public class ResultSetMetaDataTest extends TestCase {
+
+	/*
+	 * Public statics test
+	 */
+	public void testPublicStatics() {
+
+		HashMap thePublicStatics = new HashMap();
+		thePublicStatics.put("columnNullableUnknown", new Integer(2));
+		thePublicStatics.put("columnNullable", new Integer(1));
+		thePublicStatics.put("columnNoNulls", new Integer(0));
+
+		/*
+		 * System.out.println( "columnNullableUnknown: " +
+		 * ResultSetMetaData.columnNullableUnknown ); System.out.println(
+		 * "columnNullable: " + ResultSetMetaData.columnNullable );
+		 * System.out.println( "columnNoNulls: " +
+		 * ResultSetMetaData.columnNoNulls );
+		 */
+
+		Class resultSetMetaDataClass;
+		try {
+			resultSetMetaDataClass = Class
+					.forName("java.sql.ResultSetMetaData");
+		} catch (ClassNotFoundException e) {
+			fail("java.sql.ResultSetMetaData class not found!");
+			return;
+		} // end try
+
+		Field[] theFields = resultSetMetaDataClass.getDeclaredFields();
+		int requiredModifier = Modifier.PUBLIC + Modifier.STATIC
+				+ Modifier.FINAL;
+
+		int countPublicStatics = 0;
+		for (int i = 0; i < theFields.length; i++) {
+			String fieldName = theFields[i].getName();
+			int theMods = theFields[i].getModifiers();
+			if (Modifier.isPublic(theMods) && Modifier.isStatic(theMods)) {
+				try {
+					Object fieldValue = theFields[i].get(null);
+					Object expectedValue = thePublicStatics.get(fieldName);
+					if (expectedValue == null) {
+						fail("Field " + fieldName + " missing!");
+					} // end
+					assertEquals("Field " + fieldName + " value mismatch: ",
+							expectedValue, fieldValue);
+					assertEquals("Field " + fieldName + " modifier mismatch: ",
+							requiredModifier, theMods);
+					countPublicStatics++;
+				} catch (IllegalAccessException e) {
+					fail("Illegal access to Field " + fieldName);
+				} // end try
+			} // end if
+		} // end for
+
+	} // end method testPublicStatics
+
+} // end class ResultSetMetaDataTest
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java?rev=436644&r1=436643&r2=436644&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java Thu Aug 24 21:29:34 2006
@@ -1,99 +1,99 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.harmony.sql.tests.java.sql;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-public class ResultSetTest extends TestCase {
-
-	/*
-	 * Public statics test
-	 */
-	public void testPublicStatics() {
-
-		HashMap thePublicStatics = new HashMap();
-		thePublicStatics.put("CLOSE_CURSORS_AT_COMMIT",
-				new java.lang.Integer(2));
-		thePublicStatics.put("HOLD_CURSORS_OVER_COMMIT", new java.lang.Integer(
-				1));
-		thePublicStatics.put("CONCUR_UPDATABLE", new java.lang.Integer(1008));
-		thePublicStatics.put("CONCUR_READ_ONLY", new java.lang.Integer(1007));
-		thePublicStatics.put("TYPE_SCROLL_SENSITIVE", new java.lang.Integer(
-				1005));
-		thePublicStatics.put("TYPE_SCROLL_INSENSITIVE", new java.lang.Integer(
-				1004));
-		thePublicStatics.put("TYPE_FORWARD_ONLY", new java.lang.Integer(1003));
-		thePublicStatics.put("FETCH_UNKNOWN", new java.lang.Integer(1002));
-		thePublicStatics.put("FETCH_REVERSE", new java.lang.Integer(1001));
-		thePublicStatics.put("FETCH_FORWARD", new java.lang.Integer(1000));
-
-		/*
-		 * System.out.println( "CLOSE_CURSORS_AT_COMMIT: " +
-		 * ResultSet.CLOSE_CURSORS_AT_COMMIT ); System.out.println(
-		 * "HOLD_CURSORS_OVER_COMMIT: " + ResultSet.HOLD_CURSORS_OVER_COMMIT );
-		 * System.out.println( "CONCUR_UPDATABLE: " + ResultSet.CONCUR_UPDATABLE );
-		 * System.out.println( "CONCUR_READ_ONLY: " + ResultSet.CONCUR_READ_ONLY );
-		 * System.out.println( "TYPE_SCROLL_SENSITIVE: " +
-		 * ResultSet.TYPE_SCROLL_SENSITIVE ); System.out.println(
-		 * "TYPE_SCROLL_INSENSITIVE: " + ResultSet.TYPE_SCROLL_INSENSITIVE );
-		 * System.out.println( "TYPE_FORWARD_ONLY: " +
-		 * ResultSet.TYPE_FORWARD_ONLY ); System.out.println( "FETCH_UNKNOWN: " +
-		 * ResultSet.FETCH_UNKNOWN ); System.out.println( "FETCH_REVERSE: " +
-		 * ResultSet.FETCH_REVERSE ); System.out.println( "FETCH_FORWARD: " +
-		 * ResultSet.FETCH_FORWARD );
-		 */
-
-		Class resultSetClass;
-		try {
-			resultSetClass = Class.forName("java.sql.ResultSet");
-		} catch (ClassNotFoundException e) {
-			fail("java.sql.ResultSet class not found!");
-			return;
-		} // end try
-
-		Field[] theFields = resultSetClass.getDeclaredFields();
-		int requiredModifier = Modifier.PUBLIC + Modifier.STATIC
-				+ Modifier.FINAL;
-
-		int countPublicStatics = 0;
-		for (int i = 0; i < theFields.length; i++) {
-			String fieldName = theFields[i].getName();
-			int theMods = theFields[i].getModifiers();
-			if (Modifier.isPublic(theMods) && Modifier.isStatic(theMods)) {
-				try {
-					Object fieldValue = theFields[i].get(null);
-					Object expectedValue = thePublicStatics.get(fieldName);
-					if (expectedValue == null) {
-						fail("Field " + fieldName + " missing!");
-					} // end
-					assertEquals("Field " + fieldName + " value mismatch: ",
-							expectedValue, fieldValue);
-					assertEquals("Field " + fieldName + " modifier mismatch: ",
-							requiredModifier, theMods);
-					countPublicStatics++;
-				} catch (IllegalAccessException e) {
-					fail("Illegal access to Field " + fieldName);
-				} // end try
-			} // end if
-		} // end for
-
-	} // end method testPublicStatics
-
-} // end class ResultSetTest
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.harmony.sql.tests.java.sql;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+
+import junit.framework.TestCase;
+
+public class ResultSetTest extends TestCase {
+
+	/*
+	 * Public statics test
+	 */
+	public void testPublicStatics() {
+
+		HashMap thePublicStatics = new HashMap();
+		thePublicStatics.put("CLOSE_CURSORS_AT_COMMIT",
+				new java.lang.Integer(2));
+		thePublicStatics.put("HOLD_CURSORS_OVER_COMMIT", new java.lang.Integer(
+				1));
+		thePublicStatics.put("CONCUR_UPDATABLE", new java.lang.Integer(1008));
+		thePublicStatics.put("CONCUR_READ_ONLY", new java.lang.Integer(1007));
+		thePublicStatics.put("TYPE_SCROLL_SENSITIVE", new java.lang.Integer(
+				1005));
+		thePublicStatics.put("TYPE_SCROLL_INSENSITIVE", new java.lang.Integer(
+				1004));
+		thePublicStatics.put("TYPE_FORWARD_ONLY", new java.lang.Integer(1003));
+		thePublicStatics.put("FETCH_UNKNOWN", new java.lang.Integer(1002));
+		thePublicStatics.put("FETCH_REVERSE", new java.lang.Integer(1001));
+		thePublicStatics.put("FETCH_FORWARD", new java.lang.Integer(1000));
+
+		/*
+		 * System.out.println( "CLOSE_CURSORS_AT_COMMIT: " +
+		 * ResultSet.CLOSE_CURSORS_AT_COMMIT ); System.out.println(
+		 * "HOLD_CURSORS_OVER_COMMIT: " + ResultSet.HOLD_CURSORS_OVER_COMMIT );
+		 * System.out.println( "CONCUR_UPDATABLE: " + ResultSet.CONCUR_UPDATABLE );
+		 * System.out.println( "CONCUR_READ_ONLY: " + ResultSet.CONCUR_READ_ONLY );
+		 * System.out.println( "TYPE_SCROLL_SENSITIVE: " +
+		 * ResultSet.TYPE_SCROLL_SENSITIVE ); System.out.println(
+		 * "TYPE_SCROLL_INSENSITIVE: " + ResultSet.TYPE_SCROLL_INSENSITIVE );
+		 * System.out.println( "TYPE_FORWARD_ONLY: " +
+		 * ResultSet.TYPE_FORWARD_ONLY ); System.out.println( "FETCH_UNKNOWN: " +
+		 * ResultSet.FETCH_UNKNOWN ); System.out.println( "FETCH_REVERSE: " +
+		 * ResultSet.FETCH_REVERSE ); System.out.println( "FETCH_FORWARD: " +
+		 * ResultSet.FETCH_FORWARD );
+		 */
+
+		Class resultSetClass;
+		try {
+			resultSetClass = Class.forName("java.sql.ResultSet");
+		} catch (ClassNotFoundException e) {
+			fail("java.sql.ResultSet class not found!");
+			return;
+		} // end try
+
+		Field[] theFields = resultSetClass.getDeclaredFields();
+		int requiredModifier = Modifier.PUBLIC + Modifier.STATIC
+				+ Modifier.FINAL;
+
+		int countPublicStatics = 0;
+		for (int i = 0; i < theFields.length; i++) {
+			String fieldName = theFields[i].getName();
+			int theMods = theFields[i].getModifiers();
+			if (Modifier.isPublic(theMods) && Modifier.isStatic(theMods)) {
+				try {
+					Object fieldValue = theFields[i].get(null);
+					Object expectedValue = thePublicStatics.get(fieldName);
+					if (expectedValue == null) {
+						fail("Field " + fieldName + " missing!");
+					} // end
+					assertEquals("Field " + fieldName + " value mismatch: ",
+							expectedValue, fieldValue);
+					assertEquals("Field " + fieldName + " modifier mismatch: ",
+							requiredModifier, theMods);
+					countPublicStatics++;
+				} catch (IllegalAccessException e) {
+					fail("Illegal access to Field " + fieldName);
+				} // end try
+			} // end if
+		} // end for
+
+	} // end method testPublicStatics
+
+} // end class ResultSetTest

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java?rev=436644&r1=436643&r2=436644&view=diff
==============================================================================
Binary files /tmp/tmpiwOPQv and /tmp/tmp25hjap differ

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java?rev=436644&r1=436643&r2=436644&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java Thu Aug 24 21:29:34 2006
@@ -1,71 +1,71 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.harmony.sql.tests.java.sql;
-
-import java.sql.SQLPermission;
-
-import junit.framework.TestCase;
-
-/**
- * JUnit Testcase for the java.sql.SQLPermission class
- * 
- * Note that the SQLPermission class only defines 2 constructors and all other
- * methods are inherited. This testcase explicity tets the constructors but also
- * implicitly tests some of the inherited query methods.
- * 
- */
-
-public class SQLPermissionTest extends TestCase {
-
-	/*
-	 * Constructor test
-	 */
-	public void testSQLPermissionStringString() {
-		String validName = "setLog";
-		String validActions = "theActions";
-
-		SQLPermission thePermission = new SQLPermission(validName, validActions);
-
-		assertNotNull(thePermission);
-		assertTrue(thePermission.getName().equals(validName));
-		// System.out.println("The actions: " + thePermission.getActions() + "."
-		// );
-		assertTrue(thePermission.getActions().equals(""));
-	} // end method testSQLPermissionStringString
-
-	/*
-	 * Constructor test
-	 */
-	public void testSQLPermissionString() {
-		String validName = "setLog";
-
-		SQLPermission thePermission = new SQLPermission(validName);
-
-		assertNotNull(thePermission);
-		assertTrue(thePermission.getName().equals(validName));
-
-		// Set an invalid name ... 
-		String invalidName = "foo";
-
-		thePermission = new SQLPermission(invalidName);
-
-		assertNotNull(thePermission);
-		assertTrue(thePermission.getName().equals(invalidName));
-		assertTrue(thePermission.getActions().equals(""));
-	} // end method testSQLPermissionString
-
-} // end class SQLPermissionTest
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.harmony.sql.tests.java.sql;
+
+import java.sql.SQLPermission;
+
+import junit.framework.TestCase;
+
+/**
+ * JUnit Testcase for the java.sql.SQLPermission class
+ * 
+ * Note that the SQLPermission class only defines 2 constructors and all other
+ * methods are inherited. This testcase explicity tets the constructors but also
+ * implicitly tests some of the inherited query methods.
+ * 
+ */
+
+public class SQLPermissionTest extends TestCase {
+
+	/*
+	 * Constructor test
+	 */
+	public void testSQLPermissionStringString() {
+		String validName = "setLog";
+		String validActions = "theActions";
+
+		SQLPermission thePermission = new SQLPermission(validName, validActions);
+
+		assertNotNull(thePermission);
+		assertTrue(thePermission.getName().equals(validName));
+		// System.out.println("The actions: " + thePermission.getActions() + "."
+		// );
+		assertTrue(thePermission.getActions().equals(""));
+	} // end method testSQLPermissionStringString
+
+	/*
+	 * Constructor test
+	 */
+	public void testSQLPermissionString() {
+		String validName = "setLog";
+
+		SQLPermission thePermission = new SQLPermission(validName);
+
+		assertNotNull(thePermission);
+		assertTrue(thePermission.getName().equals(validName));
+
+		// Set an invalid name ... 
+		String invalidName = "foo";
+
+		thePermission = new SQLPermission(invalidName);
+
+		assertNotNull(thePermission);
+		assertTrue(thePermission.getName().equals(invalidName));
+		assertTrue(thePermission.getActions().equals(""));
+	} // end method testSQLPermissionString
+
+} // end class SQLPermissionTest
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java?rev=436644&r1=436643&r2=436644&view=diff
==============================================================================
Binary files /tmp/tmpZ-WZH- and /tmp/tmpsfPcyI differ

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java?rev=436644&r1=436643&r2=436644&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java Thu Aug 24 21:29:34 2006
@@ -1,90 +1,90 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.harmony.sql.tests.java.sql;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-public class StatementTest extends TestCase {
-
-	/*
-	 * Public statics test
-	 */
-	public void testPublicStatics() {
-
-		HashMap thePublicStatics = new HashMap();
-		thePublicStatics.put("NO_GENERATED_KEYS", new Integer(2));
-		thePublicStatics.put("RETURN_GENERATED_KEYS", new Integer(1));
-		thePublicStatics.put("EXECUTE_FAILED", new Integer(-3));
-		thePublicStatics.put("SUCCESS_NO_INFO", new Integer(-2));
-		thePublicStatics.put("CLOSE_ALL_RESULTS", new Integer(3));
-		thePublicStatics.put("KEEP_CURRENT_RESULT", new Integer(2));
-		thePublicStatics.put("CLOSE_CURRENT_RESULT", new Integer(1));
-
-		/*
-		 * System.out.println( "NO_GENERATED_KEYS: " +
-		 * Statement.NO_GENERATED_KEYS ); System.out.println(
-		 * "RETURN_GENERATED_KEYS: " + Statement.RETURN_GENERATED_KEYS );
-		 * System.out.println( "EXECUTE_FAILED: " + Statement.EXECUTE_FAILED );
-		 * System.out.println( "SUCCESS_NO_INFO: " + Statement.SUCCESS_NO_INFO );
-		 * System.out.println( "CLOSE_ALL_RESULTS: " +
-		 * Statement.CLOSE_ALL_RESULTS ); System.out.println(
-		 * "KEEP_CURRENT_RESULT: " + Statement.KEEP_CURRENT_RESULT );
-		 * System.out.println( "CLOSE_CURRENT_RESULT: " +
-		 * Statement.CLOSE_CURRENT_RESULT );
-		 */
-
-		Class statementClass;
-		try {
-			statementClass = Class.forName("java.sql.Statement");
-		} catch (ClassNotFoundException e) {
-			fail("java.sql.Statement class not found!");
-			return;
-		} // end try
-
-		Field[] theFields = statementClass.getDeclaredFields();
-		int requiredModifier = Modifier.PUBLIC + Modifier.STATIC
-				+ Modifier.FINAL;
-
-		int countPublicStatics = 0;
-		for (int i = 0; i < theFields.length; i++) {
-			String fieldName = theFields[i].getName();
-			int theMods = theFields[i].getModifiers();
-			if (Modifier.isPublic(theMods) && Modifier.isStatic(theMods)) {
-				try {
-					Object fieldValue = theFields[i].get(null);
-					Object expectedValue = thePublicStatics.get(fieldName);
-					if (expectedValue == null) {
-						fail("Field " + fieldName + " missing!");
-					} // end
-					assertEquals("Field " + fieldName + " value mismatch: ",
-							expectedValue, fieldValue);
-					assertEquals("Field " + fieldName + " modifier mismatch: ",
-							requiredModifier, theMods);
-					countPublicStatics++;
-				} catch (IllegalAccessException e) {
-					fail("Illegal access to Field " + fieldName);
-				} // end try
-			} // end if
-		} // end for
-
-	} // end method testPublicStatics
-
-} // end class StatementTest
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.harmony.sql.tests.java.sql;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+
+import junit.framework.TestCase;
+
+public class StatementTest extends TestCase {
+
+	/*
+	 * Public statics test
+	 */
+	public void testPublicStatics() {
+
+		HashMap thePublicStatics = new HashMap();
+		thePublicStatics.put("NO_GENERATED_KEYS", new Integer(2));
+		thePublicStatics.put("RETURN_GENERATED_KEYS", new Integer(1));
+		thePublicStatics.put("EXECUTE_FAILED", new Integer(-3));
+		thePublicStatics.put("SUCCESS_NO_INFO", new Integer(-2));
+		thePublicStatics.put("CLOSE_ALL_RESULTS", new Integer(3));
+		thePublicStatics.put("KEEP_CURRENT_RESULT", new Integer(2));
+		thePublicStatics.put("CLOSE_CURRENT_RESULT", new Integer(1));
+
+		/*
+		 * System.out.println( "NO_GENERATED_KEYS: " +
+		 * Statement.NO_GENERATED_KEYS ); System.out.println(
+		 * "RETURN_GENERATED_KEYS: " + Statement.RETURN_GENERATED_KEYS );
+		 * System.out.println( "EXECUTE_FAILED: " + Statement.EXECUTE_FAILED );
+		 * System.out.println( "SUCCESS_NO_INFO: " + Statement.SUCCESS_NO_INFO );
+		 * System.out.println( "CLOSE_ALL_RESULTS: " +
+		 * Statement.CLOSE_ALL_RESULTS ); System.out.println(
+		 * "KEEP_CURRENT_RESULT: " + Statement.KEEP_CURRENT_RESULT );
+		 * System.out.println( "CLOSE_CURRENT_RESULT: " +
+		 * Statement.CLOSE_CURRENT_RESULT );
+		 */
+
+		Class statementClass;
+		try {
+			statementClass = Class.forName("java.sql.Statement");
+		} catch (ClassNotFoundException e) {
+			fail("java.sql.Statement class not found!");
+			return;
+		} // end try
+
+		Field[] theFields = statementClass.getDeclaredFields();
+		int requiredModifier = Modifier.PUBLIC + Modifier.STATIC
+				+ Modifier.FINAL;
+
+		int countPublicStatics = 0;
+		for (int i = 0; i < theFields.length; i++) {
+			String fieldName = theFields[i].getName();
+			int theMods = theFields[i].getModifiers();
+			if (Modifier.isPublic(theMods) && Modifier.isStatic(theMods)) {
+				try {
+					Object fieldValue = theFields[i].get(null);
+					Object expectedValue = thePublicStatics.get(fieldName);
+					if (expectedValue == null) {
+						fail("Field " + fieldName + " missing!");
+					} // end
+					assertEquals("Field " + fieldName + " value mismatch: ",
+							expectedValue, fieldValue);
+					assertEquals("Field " + fieldName + " modifier mismatch: ",
+							requiredModifier, theMods);
+					countPublicStatics++;
+				} catch (IllegalAccessException e) {
+					fail("Illegal access to Field " + fieldName);
+				} // end try
+			} // end if
+		} // end for
+
+	} // end method testPublicStatics
+
+} // end class StatementTest
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java?rev=436644&r1=436643&r2=436644&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java Thu Aug 24 21:29:34 2006
@@ -1,217 +1,217 @@
-/* Copyright 2005 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.harmony.sql.tests.java.sql;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-/**
- * TODO Type description
- * 
- */
-public class TestHelper_ClassLoader extends ClassLoader {
-
-	public TestHelper_ClassLoader() {
-		super(null);
-		// System.out.println("Test class loader - loaded.");
-		/*
-		 * System.out.println("Test class loader = " + this );
-		 * System.out.println("Test class loader parent = " + this.getParent() );
-		 */
-	} // end method TestClassLoader
-
-	/**
-	 * Loads a class specified by its name
-	 * <p>
-	 * This classloader makes the assumption that any class it is asked to load
-	 * is in the current directory....
-	 */
-	public Class findClass(String className) throws ClassNotFoundException {
-		Class theClass = null;
-
-		if (!className.equals("org.apache.harmony.sql.tests.java.sql.TestHelper_DriverManager"))
-			return null;
-
-		String classNameAsFile = className.replace('.', '/') + ".class";
-		// System.out.println("findClass - class filename = " + classNameAsFile
-		// );
-
-		String classPath = System.getProperty("java.class.path");
-		// System.out.println("Test class loader - classpath = " + classPath );
-
-		String theSeparator = String.valueOf(File.pathSeparatorChar);
-		String[] theClassPaths = classPath.split(theSeparator);
-		for (int i = 0; (i < theClassPaths.length) && (theClass == null); i++) {
-			// Ignore jar files...
-			if (theClassPaths[i].endsWith(".jar")) {
-				theClass = loadClassFromJar(theClassPaths[i], className,
-						classNameAsFile);
-			} else {
-				theClass = loadClassFromFile(theClassPaths[i], className,
-						classNameAsFile);
-			} // end if
-		} // end for
-
-		return theClass;
-	} // end method findClass( String )
-
-	public Class loadClass(String className) throws ClassNotFoundException {
-		// Allowed classes:
-		String[] disallowedClasses = { "org.apache.harmony.sql.tests.java.sql.TestHelper_Driver1",
-				"org.apache.harmony.sql.tests.java.sql.TestHelper_Driver2",
-				"org.apache.harmony.sql.tests.java.sql.TestHelper_Driver4",
-				"org.apache.harmony.sql.tests.java.sql.TestHelper_Driver5" };
-
-		Class theClass;
-
-		theClass = findLoadedClass(className);
-		if (theClass != null)
-			return theClass;
-
-		theClass = this.findClass(className);
-
-		if (theClass == null) {
-			for (int i = 0; i < disallowedClasses.length; i++) {
-				if (disallowedClasses[i].equals(className)) {
-					return null;
-				} // end if
-			} // end for
-			theClass = Class.forName(className);
-		} // end if
-
-		return theClass;
-	} // end method loadClass( String )
-
-	private Class loadClassFromFile(String pathName, String className,
-			String classNameAsFile) {
-		Class theClass = null;
-		FileInputStream theInput = null;
-		File theFile = null;
-		try {
-			theFile = new File(pathName, classNameAsFile);
-			if (theFile.exists()) {
-				int length = (int) theFile.length();
-				theInput = new FileInputStream(theFile);
-				byte[] theBytes = new byte[length + 100];
-				int dataRead = 0;
-				while (dataRead < length) {
-					int count = theInput.read(theBytes, dataRead,
-							theBytes.length - dataRead);
-					if (count == -1)
-						break;
-					dataRead += count;
-				}
-
-				if (dataRead > 0) {
-					// Create the class from the bytes read in...
-					theClass = this.defineClass(className, theBytes, 0, dataRead);
-					ClassLoader testClassLoader = theClass.getClassLoader();
-					if (testClassLoader != this) {
-						System.out.println("findClass - wrong classloader!!");
-					}
-				}
-			}
-		} catch (Exception e) {
-			System.out.println("findClass - exception reading class file.");
-			e.printStackTrace();
-		} finally {
-			try {
-				if (theInput != null)
-					theInput.close();
-			} catch (Exception e) {
-			}
-		}
-		return theClass;
-	}
-
-	/*
-	 * Loads a named class from a specified JAR file
-	 */
-	private Class loadClassFromJar(String jarfileName, String className,
-			String classNameAsFile) {
-		Class theClass = null;
-
-		// First, try to open the Jar file
-		JarFile theJar = null;
-		try {
-			theJar = new JarFile(jarfileName);
-			JarEntry theEntry = theJar.getJarEntry(classNameAsFile);
-
-			if (theEntry == null) {
-				// System.out.println("TestHelper_Classloader - did not find
-				// class file in Jar " + jarfileName );
-				return theClass;
-			} // end if
-
-			int theMethod = theEntry.getMethod();
-			InputStream theStream = theJar.getInputStream(theEntry);
-
-			long size = theEntry.getSize();
-			if (size < 0)
-				size = 100000;
-			byte[] theBytes = new byte[(int) size + 100];
-
-			int dataRead = 0;
-			while (dataRead < size) {
-				int count = theStream.read(theBytes, dataRead, theBytes.length
-						- dataRead);
-				if (count == -1)
-					break;
-				dataRead += count;
-			} // end while
-
-			// System.out.println("loadClassFromJar: read " + dataRead + " bytes
-			// from class file");
-			if (dataRead > 0) {
-				// Create the class from the bytes read in...
-				theClass = this.defineClass(className, theBytes, 0, dataRead);
-				/* System.out.println("findClass: created Class object."); */
-				ClassLoader testClassLoader = theClass.getClassLoader();
-				if (testClassLoader != this) {
-					System.out.println("findClass - wrong classloader!!");
-				} else {
-					System.out
-							.println("Testclassloader loaded class from jar: "
-									+ className);
-				} // end if
-			} // end if
-		} catch (IOException ie) {
-			System.out
-					.println("TestHelper_ClassLoader: IOException opening Jar "
-							+ jarfileName);
-		} catch (Exception e) {
-			System.out
-					.println("TestHelper_ClassLoader: Exception loading class from Jar ");
-		} catch (ClassFormatError ce) {
-			System.out
-					.println("TestHelper_ClassLoader: ClassFormatException loading class from Jar ");
-		} finally {
-			try {
-				if (theJar != null)
-					theJar.close();
-			} catch (Exception e) {
-			} // end try
-		} // end try
-
-		return theClass;
-	} // end method loadClassFromJar(
-
-} // end class TestHelper_ClassLoader
-
+/* Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.harmony.sql.tests.java.sql;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+/**
+ * TODO Type description
+ * 
+ */
+public class TestHelper_ClassLoader extends ClassLoader {
+
+	public TestHelper_ClassLoader() {
+		super(null);
+		// System.out.println("Test class loader - loaded.");
+		/*
+		 * System.out.println("Test class loader = " + this );
+		 * System.out.println("Test class loader parent = " + this.getParent() );
+		 */
+	} // end method TestClassLoader
+
+	/**
+	 * Loads a class specified by its name
+	 * <p>
+	 * This classloader makes the assumption that any class it is asked to load
+	 * is in the current directory....
+	 */
+	public Class findClass(String className) throws ClassNotFoundException {
+		Class theClass = null;
+
+		if (!className.equals("org.apache.harmony.sql.tests.java.sql.TestHelper_DriverManager"))
+			return null;
+
+		String classNameAsFile = className.replace('.', '/') + ".class";
+		// System.out.println("findClass - class filename = " + classNameAsFile
+		// );
+
+		String classPath = System.getProperty("java.class.path");
+		// System.out.println("Test class loader - classpath = " + classPath );
+
+		String theSeparator = String.valueOf(File.pathSeparatorChar);
+		String[] theClassPaths = classPath.split(theSeparator);
+		for (int i = 0; (i < theClassPaths.length) && (theClass == null); i++) {
+			// Ignore jar files...
+			if (theClassPaths[i].endsWith(".jar")) {
+				theClass = loadClassFromJar(theClassPaths[i], className,
+						classNameAsFile);
+			} else {
+				theClass = loadClassFromFile(theClassPaths[i], className,
+						classNameAsFile);
+			} // end if
+		} // end for
+
+		return theClass;
+	} // end method findClass( String )
+
+	public Class loadClass(String className) throws ClassNotFoundException {
+		// Allowed classes:
+		String[] disallowedClasses = { "org.apache.harmony.sql.tests.java.sql.TestHelper_Driver1",
+				"org.apache.harmony.sql.tests.java.sql.TestHelper_Driver2",
+				"org.apache.harmony.sql.tests.java.sql.TestHelper_Driver4",
+				"org.apache.harmony.sql.tests.java.sql.TestHelper_Driver5" };
+
+		Class theClass;
+
+		theClass = findLoadedClass(className);
+		if (theClass != null)
+			return theClass;
+
+		theClass = this.findClass(className);
+
+		if (theClass == null) {
+			for (int i = 0; i < disallowedClasses.length; i++) {
+				if (disallowedClasses[i].equals(className)) {
+					return null;
+				} // end if
+			} // end for
+			theClass = Class.forName(className);
+		} // end if
+
+		return theClass;
+	} // end method loadClass( String )
+
+	private Class loadClassFromFile(String pathName, String className,
+			String classNameAsFile) {
+		Class theClass = null;
+		FileInputStream theInput = null;
+		File theFile = null;
+		try {
+			theFile = new File(pathName, classNameAsFile);
+			if (theFile.exists()) {
+				int length = (int) theFile.length();
+				theInput = new FileInputStream(theFile);
+				byte[] theBytes = new byte[length + 100];
+				int dataRead = 0;
+				while (dataRead < length) {
+					int count = theInput.read(theBytes, dataRead,
+							theBytes.length - dataRead);
+					if (count == -1)
+						break;
+					dataRead += count;
+				}
+
+				if (dataRead > 0) {
+					// Create the class from the bytes read in...
+					theClass = this.defineClass(className, theBytes, 0, dataRead);
+					ClassLoader testClassLoader = theClass.getClassLoader();
+					if (testClassLoader != this) {
+						System.out.println("findClass - wrong classloader!!");
+					}
+				}
+			}
+		} catch (Exception e) {
+			System.out.println("findClass - exception reading class file.");
+			e.printStackTrace();
+		} finally {
+			try {
+				if (theInput != null)
+					theInput.close();
+			} catch (Exception e) {
+			}
+		}
+		return theClass;
+	}
+
+	/*
+	 * Loads a named class from a specified JAR file
+	 */
+	private Class loadClassFromJar(String jarfileName, String className,
+			String classNameAsFile) {
+		Class theClass = null;
+
+		// First, try to open the Jar file
+		JarFile theJar = null;
+		try {
+			theJar = new JarFile(jarfileName);
+			JarEntry theEntry = theJar.getJarEntry(classNameAsFile);
+
+			if (theEntry == null) {
+				// System.out.println("TestHelper_Classloader - did not find
+				// class file in Jar " + jarfileName );
+				return theClass;
+			} // end if
+
+			int theMethod = theEntry.getMethod();
+			InputStream theStream = theJar.getInputStream(theEntry);
+
+			long size = theEntry.getSize();
+			if (size < 0)
+				size = 100000;
+			byte[] theBytes = new byte[(int) size + 100];
+
+			int dataRead = 0;
+			while (dataRead < size) {
+				int count = theStream.read(theBytes, dataRead, theBytes.length
+						- dataRead);
+				if (count == -1)
+					break;
+				dataRead += count;
+			} // end while
+
+			// System.out.println("loadClassFromJar: read " + dataRead + " bytes
+			// from class file");
+			if (dataRead > 0) {
+				// Create the class from the bytes read in...
+				theClass = this.defineClass(className, theBytes, 0, dataRead);
+				/* System.out.println("findClass: created Class object."); */
+				ClassLoader testClassLoader = theClass.getClassLoader();
+				if (testClassLoader != this) {
+					System.out.println("findClass - wrong classloader!!");
+				} else {
+					System.out
+							.println("Testclassloader loaded class from jar: "
+									+ className);
+				} // end if
+			} // end if
+		} catch (IOException ie) {
+			System.out
+					.println("TestHelper_ClassLoader: IOException opening Jar "
+							+ jarfileName);
+		} catch (Exception e) {
+			System.out
+					.println("TestHelper_ClassLoader: Exception loading class from Jar ");
+		} catch (ClassFormatError ce) {
+			System.out
+					.println("TestHelper_ClassLoader: ClassFormatException loading class from Jar ");
+		} finally {
+			try {
+				if (theJar != null)
+					theJar.close();
+			} catch (Exception e) {
+			} // end try
+		} // end try
+
+		return theClass;
+	} // end method loadClassFromJar(
+
+} // end class TestHelper_ClassLoader
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java?rev=436644&r1=436643&r2=436644&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java Thu Aug 24 21:29:34 2006
@@ -1,410 +1,410 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.harmony.sql.tests.java.sql;
-
-import java.sql.CallableStatement;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.Savepoint;
-import java.sql.Statement;
-import java.util.Map;
-
-/**
- * Helper class for the java.sql tests - a skeletong class which implements the
- * java.sql.Connection interface
- * 
- */
-public class TestHelper_Connection1 implements Connection {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#clearWarnings()
-	 */
-	public void clearWarnings() throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#close()
-	 */
-	public void close() throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#commit()
-	 */
-	public void commit() throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#createStatement()
-	 */
-	public Statement createStatement() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#createStatement(int, int)
-	 */
-	public Statement createStatement(int resultSetType, int resultSetConcurrency)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#createStatement(int, int, int)
-	 */
-	public Statement createStatement(int resultSetType,
-			int resultSetConcurrency, int resultSetHoldability)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getAutoCommit()
-	 */
-	public boolean getAutoCommit() throws SQLException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getCatalog()
-	 */
-	public String getCatalog() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getHoldability()
-	 */
-	public int getHoldability() throws SQLException {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getMetaData()
-	 */
-	public DatabaseMetaData getMetaData() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getTransactionIsolation()
-	 */
-	public int getTransactionIsolation() throws SQLException {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getTypeMap()
-	 */
-	public Map getTypeMap() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getWarnings()
-	 */
-	public SQLWarning getWarnings() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#isClosed()
-	 */
-	public boolean isClosed() throws SQLException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#isReadOnly()
-	 */
-	public boolean isReadOnly() throws SQLException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#nativeSQL(java.lang.String)
-	 */
-	public String nativeSQL(String sql) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareCall(java.lang.String)
-	 */
-	public CallableStatement prepareCall(String sql) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareCall(java.lang.String, int, int)
-	 */
-	public CallableStatement prepareCall(String sql, int resultSetType,
-			int resultSetConcurrency) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareCall(java.lang.String, int, int, int)
-	 */
-	public CallableStatement prepareCall(String sql, int resultSetType,
-			int resultSetConcurrency, int resultSetHoldability)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String)
-	 */
-	public PreparedStatement prepareStatement(String sql) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String, int)
-	 */
-	public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String, int[])
-	 */
-	public PreparedStatement prepareStatement(String sql, int[] columnIndexes)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String, int, int)
-	 */
-	public PreparedStatement prepareStatement(String sql, int resultSetType,
-			int resultSetConcurrency) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String, int, int,
-	 *      int)
-	 */
-	public PreparedStatement prepareStatement(String sql, int resultSetType,
-			int resultSetConcurrency, int resultSetHoldability)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String,
-	 *      java.lang.String[])
-	 */
-	public PreparedStatement prepareStatement(String sql, String[] columnNames)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#releaseSavepoint(java.sql.Savepoint)
-	 */
-	public void releaseSavepoint(Savepoint savepoint) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#rollback()
-	 */
-	public void rollback() throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#rollback(java.sql.Savepoint)
-	 */
-	public void rollback(Savepoint savepoint) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setAutoCommit(boolean)
-	 */
-	public void setAutoCommit(boolean autoCommit) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setCatalog(java.lang.String)
-	 */
-	public void setCatalog(String catalog) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setHoldability(int)
-	 */
-	public void setHoldability(int holdability) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setReadOnly(boolean)
-	 */
-	public void setReadOnly(boolean readOnly) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setSavepoint()
-	 */
-	public Savepoint setSavepoint() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setSavepoint(java.lang.String)
-	 */
-	public Savepoint setSavepoint(String name) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setTransactionIsolation(int)
-	 */
-	public void setTransactionIsolation(int level) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setTypeMap(java.util.Map)
-	 */
-	public void setTypeMap(Map map) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-}
-
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.harmony.sql.tests.java.sql;
+
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.util.Map;
+
+/**
+ * Helper class for the java.sql tests - a skeletong class which implements the
+ * java.sql.Connection interface
+ * 
+ */
+public class TestHelper_Connection1 implements Connection {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#clearWarnings()
+	 */
+	public void clearWarnings() throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#close()
+	 */
+	public void close() throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#commit()
+	 */
+	public void commit() throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#createStatement()
+	 */
+	public Statement createStatement() throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#createStatement(int, int)
+	 */
+	public Statement createStatement(int resultSetType, int resultSetConcurrency)
+			throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#createStatement(int, int, int)
+	 */
+	public Statement createStatement(int resultSetType,
+			int resultSetConcurrency, int resultSetHoldability)
+			throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#getAutoCommit()
+	 */
+	public boolean getAutoCommit() throws SQLException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#getCatalog()
+	 */
+	public String getCatalog() throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#getHoldability()
+	 */
+	public int getHoldability() throws SQLException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#getMetaData()
+	 */
+	public DatabaseMetaData getMetaData() throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#getTransactionIsolation()
+	 */
+	public int getTransactionIsolation() throws SQLException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#getTypeMap()
+	 */
+	public Map getTypeMap() throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#getWarnings()
+	 */
+	public SQLWarning getWarnings() throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#isClosed()
+	 */
+	public boolean isClosed() throws SQLException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#isReadOnly()
+	 */
+	public boolean isReadOnly() throws SQLException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#nativeSQL(java.lang.String)
+	 */
+	public String nativeSQL(String sql) throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#prepareCall(java.lang.String)
+	 */
+	public CallableStatement prepareCall(String sql) throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#prepareCall(java.lang.String, int, int)
+	 */
+	public CallableStatement prepareCall(String sql, int resultSetType,
+			int resultSetConcurrency) throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#prepareCall(java.lang.String, int, int, int)
+	 */
+	public CallableStatement prepareCall(String sql, int resultSetType,
+			int resultSetConcurrency, int resultSetHoldability)
+			throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#prepareStatement(java.lang.String)
+	 */
+	public PreparedStatement prepareStatement(String sql) throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#prepareStatement(java.lang.String, int)
+	 */
+	public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
+			throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#prepareStatement(java.lang.String, int[])
+	 */
+	public PreparedStatement prepareStatement(String sql, int[] columnIndexes)
+			throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#prepareStatement(java.lang.String, int, int)
+	 */
+	public PreparedStatement prepareStatement(String sql, int resultSetType,
+			int resultSetConcurrency) throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#prepareStatement(java.lang.String, int, int,
+	 *      int)
+	 */
+	public PreparedStatement prepareStatement(String sql, int resultSetType,
+			int resultSetConcurrency, int resultSetHoldability)
+			throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#prepareStatement(java.lang.String,
+	 *      java.lang.String[])
+	 */
+	public PreparedStatement prepareStatement(String sql, String[] columnNames)
+			throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#releaseSavepoint(java.sql.Savepoint)
+	 */
+	public void releaseSavepoint(Savepoint savepoint) throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#rollback()
+	 */
+	public void rollback() throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#rollback(java.sql.Savepoint)
+	 */
+	public void rollback(Savepoint savepoint) throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#setAutoCommit(boolean)
+	 */
+	public void setAutoCommit(boolean autoCommit) throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#setCatalog(java.lang.String)
+	 */
+	public void setCatalog(String catalog) throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#setHoldability(int)
+	 */
+	public void setHoldability(int holdability) throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#setReadOnly(boolean)
+	 */
+	public void setReadOnly(boolean readOnly) throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#setSavepoint()
+	 */
+	public Savepoint setSavepoint() throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#setSavepoint(java.lang.String)
+	 */
+	public Savepoint setSavepoint(String name) throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#setTransactionIsolation(int)
+	 */
+	public void setTransactionIsolation(int level) throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.sql.Connection#setTypeMap(java.util.Map)
+	 */
+	public void setTypeMap(Map map) throws SQLException {
+		// TODO Auto-generated method stub
+
+	}
+
+}
+

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message