[tomcat] branch 9.0.x updated: Cleanup derby.log

[re...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 1cb9875  Cleanup derby.log
1cb9875 is described below

commit 1cb987588fd87cae166bb9abeba5c92aa1aea808
Author: remm <re...@apache.org>
AuthorDate: Wed Sep 1 17:02:11 2021 +0200

    Cleanup derby.log
---
 test/org/apache/catalina/users/DataSourceUserDatabaseTests.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java b/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
index 5529917..55194e1 100644
--- a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
+++ b/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
@@ -16,11 +16,13 @@
  */
 package org.apache.catalina.users;
 
+import java.io.File;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.Statement;
 import java.util.Iterator;
 
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -109,6 +111,11 @@ public class DataSourceUserDatabaseTests extends LoggingBaseTest {
 
     private DerbyUserDatabase db;
 
+    @AfterClass
+    public static void derbyCleanup() {
+        System.out.println("Deleted derby.log: " + (new File("derby.log")).delete());
+    }
+
     @Test
     public void testBasicUserRoleDatabase()
         throws Exception {
@@ -156,6 +163,7 @@ public class DataSourceUserDatabaseTests extends LoggingBaseTest {
         Assert.assertFalse("Unexpected role for user", tomcatUser.isInRole(managerRole));
 
         db.close();
+
     }
 
     @Test
@@ -224,5 +232,6 @@ public class DataSourceUserDatabaseTests extends LoggingBaseTest {
         Assert.assertTrue("No group for user", randomUser.isInGroup(userGroup));
 
         db.close();
+
     }
 }

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org