tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1408438 - in /tomcat/trunk/test/org/apache: catalina/valves/TestAccessLogValve.java juli/TestDateFormatCache.java
Date Mon, 12 Nov 2012 20:17:58 GMT
Author: kkolinko
Date: Mon Nov 12 20:17:58 2012
New Revision: 1408438

URL: http://svn.apache.org/viewvc?rev=1408438&view=rev
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=54044
Add test for org.apache.juli.DateFormatCache.
It is port of the test of AccessLogValve.DateFormatCache.
I am using reflection to get interesting fields, so no need to change field visibilities.

Added:
    tomcat/trunk/test/org/apache/juli/TestDateFormatCache.java   (with props)
Modified:
    tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java

Modified: tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java?rev=1408438&r1=1408437&r2=1408438&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java (original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java Mon Nov 12 20:17:58
2012
@@ -26,6 +26,8 @@ import org.junit.Test;
 
 public class TestAccessLogValve {
 
+    // Note that there is a similar test:
+    // org.apache.juli.TestDateFormatCache.testBug54044()
     @Test
     public void testBug54044() throws Exception {
 
@@ -77,7 +79,7 @@ public class TestAccessLogValve {
         expected[0] = generateExpected(sdf, 0);
         Assert.assertArrayEquals(expected, dfc.cLFCache.cache);
 
-        // Jump ahead far enough that the entire cache will need tp be cleared
+        // Jump ahead far enough that the entire cache will need to be cleared
         dfc.getFormat(42 * 1000);
         for (int i = 0; i < cacheSize; i++) {
             expected[i] = null;

Added: tomcat/trunk/test/org/apache/juli/TestDateFormatCache.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/juli/TestDateFormatCache.java?rev=1408438&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/juli/TestDateFormatCache.java (added)
+++ tomcat/trunk/test/org/apache/juli/TestDateFormatCache.java Mon Nov 12 20:17:58 2012
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juli;
+
+import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestDateFormatCache {
+
+    // Note that there is a similar test:
+    // org.apache.catalina.valves.TestAccessLogValve.testBug54044()
+    @Test
+    public void testBug54044() throws Exception {
+
+        final String timeFormat = "dd-MMM-yyyy HH:mm:ss";
+        final int cacheSize = 10;
+
+        SimpleDateFormat sdf = new SimpleDateFormat(timeFormat, Locale.US);
+        sdf.setTimeZone(TimeZone.getDefault());
+
+        DateFormatCache dfc = new DateFormatCache(cacheSize, timeFormat, null);
+
+        // Get dfc.cache.cache field
+        Object dfcCache;
+        Field dfcCacheArray;
+        {
+            Field dfcCacheField = dfc.getClass().getDeclaredField("cache");
+            dfcCacheField.setAccessible(true);
+            dfcCache = dfcCacheField.get(dfc);
+            dfcCacheArray = dfcCache.getClass().getDeclaredField("cache");
+            dfcCacheArray.setAccessible(true);
+        }
+
+        // Create an array to hold the expected values
+        String[] expected = new String[cacheSize];
+
+        // Fill the cache & populate the expected values
+        for (int secs = 0; secs < (cacheSize); secs++) {
+            dfc.getFormat(secs * 1000);
+            expected[secs] = generateExpected(sdf, secs);
+        }
+        Assert.assertArrayEquals(expected,
+                (String[]) dfcCacheArray.get(dfcCache));
+
+        // Cause the cache to roll-around by one and then confirm
+        dfc.getFormat(cacheSize * 1000);
+        expected[0] = generateExpected(sdf, cacheSize);
+        Assert.assertArrayEquals(expected,
+                (String[]) dfcCacheArray.get(dfcCache));
+
+        // Jump 2 ahead and then confirm (skipped value should be null)
+        dfc.getFormat((cacheSize + 2) * 1000);
+        expected[1] = null;
+        expected[2] = generateExpected(sdf, cacheSize + 2);
+        Assert.assertArrayEquals(expected,
+                (String[]) dfcCacheArray.get(dfcCache));
+
+        // Back 1 to fill in the gap
+        dfc.getFormat((cacheSize + 1) * 1000);
+        expected[1] = generateExpected(sdf, cacheSize + 1);
+        Assert.assertArrayEquals(expected,
+                (String[]) dfcCacheArray.get(dfcCache));
+
+        // Return to 1 and confirm skipped value is null
+        dfc.getFormat(1 * 1000);
+        expected[1] = generateExpected(sdf, 1);
+        expected[2] = null;
+        Assert.assertArrayEquals(expected,
+                (String[]) dfcCacheArray.get(dfcCache));
+
+        // Go back one further
+        dfc.getFormat(0);
+        expected[0] = generateExpected(sdf, 0);
+        Assert.assertArrayEquals(expected,
+                (String[]) dfcCacheArray.get(dfcCache));
+
+        // Jump ahead far enough that the entire cache will need to be cleared
+        dfc.getFormat(42 * 1000);
+        for (int i = 0; i < cacheSize; i++) {
+            expected[i] = null;
+        }
+        expected[0] = generateExpected(sdf, 42);
+        Assert.assertArrayEquals(expected,
+                (String[]) dfcCacheArray.get(dfcCache));
+    }
+
+    private String generateExpected(SimpleDateFormat sdf, long secs) {
+        return sdf.format(new Date(secs * 1000));
+    }
+
+}

Propchange: tomcat/trunk/test/org/apache/juli/TestDateFormatCache.java
------------------------------------------------------------------------------
    svn:eol-style = native



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


Mime
View raw message