From 9b1edea8a0b2be4244d03c8a7846475054af970b Mon Sep 17 00:00:00 2001 From: Thomas Risberg Date: Thu, 12 Mar 2009 21:32:40 +0000 Subject: [PATCH] added tests for custom SQLException translation, polished (SPR-4899) --- .../jdbc/support/SQLErrorCodes.java | 1 - .../support/CustomSqlExceptionTranslator.java | 36 +++++++++++ .../SQLExceptionCustomTranslatorTests.java | 64 +++++++++++++++++++ 3 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java create mode 100644 org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java index 5c35899ad3..c7d49126ab 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java @@ -17,7 +17,6 @@ package org.springframework.jdbc.support; import org.springframework.util.StringUtils; -import org.springframework.util.Assert; import org.springframework.dao.InvalidDataAccessResourceUsageException; /** diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java new file mode 100644 index 0000000000..467f03f2e8 --- /dev/null +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java @@ -0,0 +1,36 @@ +/* + * Copyright 2002-2009 the original author or authors. + * + * 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.springframework.jdbc.support; + +import org.springframework.dao.DataAccessException; +import org.springframework.dao.TransientDataAccessResourceException; + +import java.sql.SQLException; + +/** + * Custom SQLException translation for testing. + * + * @author Thomas Risberg + */ +public class CustomSqlExceptionTranslator implements SQLExceptionTranslator { + public DataAccessException translate(String task, String sql, SQLException ex) { + if (ex.getErrorCode() == 2) { + return new TransientDataAccessResourceException("Custom", ex); + } + return null; + } +} diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java new file mode 100644 index 0000000000..9bd769ef62 --- /dev/null +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java @@ -0,0 +1,64 @@ +/* + * Copyright 2002-2008 the original author or authors. + * + * 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.springframework.jdbc.support; + +import org.springframework.dao.DataAccessException; +import org.springframework.dao.TransientDataAccessResourceException; +import org.springframework.jdbc.BadSqlGrammarException; + +import java.sql.SQLException; + +import junit.framework.TestCase; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.junit.Test; + +/** + * Class to test custom SQLException translation. + * + * @author Thomas Risberg + */ +@RunWith(JUnit4.class) +public class SQLExceptionCustomTranslatorTests extends TestCase { + + private static SQLErrorCodes ERROR_CODES = new SQLErrorCodes(); + + static { + ERROR_CODES.setBadSqlGrammarCodes(new String[] { "1" }); + ERROR_CODES.setDataAccessResourceFailureCodes(new String[] { "2" }); + ERROR_CODES.setCustomSqlExceptionTranslatorClass(CustomSqlExceptionTranslator.class); + } + + + @Test + public void testCustomErrorCodeTranslation() { + + SQLExceptionTranslator sext = new SQLErrorCodeSQLExceptionTranslator(ERROR_CODES); + + SQLException dataIntegrityViolationEx = SQLExceptionSubclassFactory.newSQLDataException("", "", 1); + DataAccessException daeex = sext.translate("task", "SQL", dataIntegrityViolationEx); + assertEquals(dataIntegrityViolationEx, daeex.getCause()); + assertTrue(daeex instanceof BadSqlGrammarException); + + SQLException dataAccessResourceEx = SQLExceptionSubclassFactory.newSQLDataException("", "", 2); + DataAccessException darex = sext.translate("task", "SQL", dataAccessResourceEx); + assertEquals(dataIntegrityViolationEx, daeex.getCause()); + assertTrue(darex instanceof TransientDataAccessResourceException); + + } + +} \ No newline at end of file