Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Merge test for LOGGING-119 into the standard test class for WeakHashtable.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/logging/trunk@1389022 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dennis Lundberg
2012-09-23 11:33:16 +00:00
parent 730fd93461
commit 663137e8f0
2 changed files with 50 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/test/org/apache/commons/logging/WeakHashTableTestCase.java
View File

@@ -1,75 +0,0 @@
/*
* 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.commons.logging;
import junit.framework.TestCase;
import org.apache.commons.logging.impl.WeakHashtable;
public class WeakHashTableTestCase extends TestCase {
private static final int WAIT_FOR_THREAD_COMPLETION = 5000; // 5 seconds
private static final int RUN_LOOPS = 3000;
private static final int OUTER_LOOP = 400;
private static final int THREAD_COUNT = 10;
private static WeakHashtable hashtable;
public static class StupidThread extends Thread {
public StupidThread(String name){
super(name);
}
public void run() {
for (int i = 0; i < RUN_LOOPS; i++) {
hashtable.put("key"+":"+(i%10), Boolean.TRUE);
if(i%50==0) {
yield();
}
}
}
}
public void testLOGGING_119() throws Exception {
Thread [] t = new Thread[THREAD_COUNT];
for (int j=1; j <= OUTER_LOOP; j++) {
hashtable = new WeakHashtable();
for (int i = 0; i < t.length; i++) {
t[i] = new StupidThread("Thread:"+i);
t[i].setDaemon(true); // Otherwise we cannot exit
t[i].start();
}
for (int i = 0; i < t.length; i++) {
t[i].join(WAIT_FOR_THREAD_COMPLETION);
if (t[i].isAlive()) {
break; // at least one thread is stuck
}
}
int active=0;
for (int i = 0; i < t.length; i++) {
if (t[i].isAlive()) {
active++;
}
}
if (active > 0) {
fail("Attempt: "+j+" Stuck threads: "+active);
}
}
}
}

49
src/test/org/apache/commons/logging/impl/WeakHashtableTest.java
View File

@@ -32,6 +32,12 @@ import junit.framework.TestCase;
public class WeakHashtableTest extends TestCase { public class WeakHashtableTest extends TestCase {
private static final int WAIT_FOR_THREAD_COMPLETION = 5000; // 5 seconds
private static final int RUN_LOOPS = 3000;
private static final int OUTER_LOOP = 400;
private static final int THREAD_COUNT = 10;
private static WeakHashtable hashtable;
/** Maximum number of iterations before our test fails */ /** Maximum number of iterations before our test fails */
private static final int MAX_GC_ITERATIONS = 50; private static final int MAX_GC_ITERATIONS = 50;
@@ -255,4 +261,47 @@ public class WeakHashtableTest extends TestCase {
// Test that the released objects are not taking space in the table // Test that the released objects are not taking space in the table
assertEquals("underlying table not emptied", 0, weakHashtable.size()); assertEquals("underlying table not emptied", 0, weakHashtable.size());
} }
public static class StupidThread extends Thread {
public StupidThread(String name) {
super(name);
}
public void run() {
for (int i = 0; i < RUN_LOOPS; i++) {
hashtable.put("key" + ":" + (i%10), Boolean.TRUE);
if(i%50 == 0) {
yield();
}
}
}
}
public void testLOGGING_119() throws Exception {
Thread [] t = new Thread[THREAD_COUNT];
for (int j=1; j <= OUTER_LOOP; j++) {
hashtable = new WeakHashtable();
for (int i = 0; i < t.length; i++) {
t[i] = new StupidThread("Thread:" + i);
t[i].setDaemon(true); // Otherwise we cannot exit
t[i].start();
}
for (int i = 0; i < t.length; i++) {
t[i].join(WAIT_FOR_THREAD_COMPLETION);
if (t[i].isAlive()) {
break; // at least one thread is stuck
}
}
int active=0;
for (int i = 0; i < t.length; i++) {
if (t[i].isAlive()) {
active++;
}
}
if (active > 0) {
fail("Attempt: " + j + " Stuck threads: " + active);
}
}
}
} }