Author: tv
Date: Sun Apr 21 10:19:05 2024
New Revision: 1917231
URL: http://svn.apache.org/viewvc?rev=1917231&view=rev
Log:
Update deprecated code
Modified:
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
Modified:
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java?rev=1917231&r1=1917230&r2=1917231&view=diff
==============================================================================
---
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
(original)
+++
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
Sun Apr 21 10:19:05 2024
@@ -43,9 +43,9 @@ import org.xmlunit.diff.DefaultNodeMatch
import org.xmlunit.diff.Diff;
import org.xmlunit.diff.ElementSelectors;
-public class TorqueGeneratorTaskTest
+public class TorqueGeneratorTaskTest
{
-
+
@Test
public void testExecute() throws Exception
{
@@ -64,14 +64,14 @@ public class TorqueGeneratorTaskTest
assertTrue(generatedJavaFile.exists());
File expectedJavaFile = new File(
"src/test/resources/org/apache/torque/ant/PropertyKeys.java");
-
+
assertTrue(FileUtils.contentEquals(generatedJavaFile,
expectedJavaFile), "The files differ!");
}
-
+
/**
* compare org.apache.torque.templates.jdbc2schema.Jdbc2SchemaTest.java in
torque-templates
- *
+ *
* @throws Exception
*/
@Test
@@ -79,7 +79,7 @@ public class TorqueGeneratorTaskTest
{
//
try {
-
Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
+
Class.forName("org.apache.derby.jdbc.EmbeddedDriver").getDeclaredConstructor().newInstance();
BasicConfigurator.configure();
Connection connection =
DriverManager.getConnection("jdbc:derby:memory:myDb;create=true");
InputStream inputStream = getClass().getResourceAsStream(
@@ -122,18 +122,18 @@ public class TorqueGeneratorTaskTest
} catch (SQLException | IOException e) {
fail();
}
-
+
File target = new File("target/generated-schema");
FileUtils.deleteDirectory(target);
Torque4JDBCTransformTask task = new Torque4JDBCTransformTask();
task.setDbUrl("jdbc:derby:memory:myDb;create=true");
task.setDbDriver("org.apache.derby.jdbc.EmbeddedDriver");
-
+
task.setPackaging("directory");
- //task.setProjectRootDir(new
File("src/test/torqueJDBC2SchemaTaskTest/src/main/jdbc2schema"));
+ //task.setProjectRootDir(new
File("src/test/torqueJDBC2SchemaTaskTest/src/main/jdbc2schema"));
//task.setPackaging("classpath");
//task.setConfigPackage("org.apache.torque.templates.jdbc2schema");
-
+
task.setProjectRootDir(new File("src/test/torqueJDBC2SchemaTaskTest"));
task.setDefaultOutputDir(target);
try {
@@ -152,7 +152,7 @@ public class TorqueGeneratorTaskTest
// "src/test/schema/schema.xml"
"src/test/schema/expected-schema.xml"
);
-
+
Diff myDiffSimilar =
DiffBuilder.compare(expectedSchemaFile).ignoreComments().withTest(generatedSchemaFile)
.withNodeMatcher(new
DefaultNodeMatcher(ElementSelectors.byName))
.checkForSimilar()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
