From e662f3f10918bd18206c86e13e757f1f5a0b2150 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sun, 26 Aug 2012 13:01:19 +0800 Subject: [PATCH 1/2] remove warnnings --- src/main/java/com/alibaba/druid/util/StringUtils.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/alibaba/druid/util/StringUtils.java b/src/main/java/com/alibaba/druid/util/StringUtils.java index 6b5ef08567..7b8e7dabd2 100644 --- a/src/main/java/com/alibaba/druid/util/StringUtils.java +++ b/src/main/java/com/alibaba/druid/util/StringUtils.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.util; -import java.util.ArrayList; -import java.util.Collection; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; -import java.util.StringTokenizer; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; From 58742c2a0e615fd22b4e3c8e1acde1452912be0a Mon Sep 17 00:00:00 2001 From: wenshao Date: Sun, 26 Aug 2012 13:13:39 +0800 Subject: [PATCH 2/2] add testcase --- .../druid/bvt/utils/DruidWebUtilsTest.java | 32 +++++++++++++ .../druid/bvt/utils/HistogramTest.java | 45 +++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java create mode 100644 src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java diff --git a/src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java new file mode 100644 index 0000000000..000649c28c --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java @@ -0,0 +1,32 @@ +package com.alibaba.druid.bvt.utils; + +import junit.framework.TestCase; + +import org.junit.Assert; +import org.springframework.mock.web.MockServletContext; + +import com.alibaba.druid.util.DruidWebUtils; + +public class DruidWebUtilsTest extends TestCase { + + public void test_getContextPath_2_5() throws Exception { + new DruidWebUtils(); // + + MockServletContext context = new MockServletContext() { + + public int getMajorVersion() { + return 2; + } + + public int getMinorVersion() { + return 4; + } + + public String getContextPath() { + throw new NoSuchMethodError(); + } + }; + + Assert.assertNull(DruidWebUtils.getContextPath(context)); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java b/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java new file mode 100644 index 0000000000..032842f761 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java @@ -0,0 +1,45 @@ +package com.alibaba.druid.bvt.utils; + +import junit.framework.Assert; +import junit.framework.TestCase; + +import com.alibaba.druid.util.Histogram; + +public class HistogramTest extends TestCase { + + public void test_histo() throws Exception { + Histogram histo = Histogram.makeHistogram(4); + + Assert.assertEquals(4, histo.getRanges().length); + + histo.record(0); + + histo.record(1); + histo.record(2); + + histo.record(11); + histo.record(12); + histo.record(13); + + histo.record(101); + histo.record(102); + histo.record(103); + histo.record(104); + + histo.record(1001); + histo.record(1002); + histo.record(1003); + histo.record(1004); + histo.record(1005); + + histo.record(10001); + + Assert.assertEquals(1, histo.get(0)); + Assert.assertEquals(2, histo.get(1)); + Assert.assertEquals(3, histo.get(2)); + Assert.assertEquals(4, histo.get(3)); + Assert.assertEquals(6, histo.get(4)); + + histo.toString(); + } +}