[jboss-cvs] JBoss Messaging SVN: r4646 - in trunk/tests/src/org/jboss/messaging/tests: unit/core/postoffice/impl and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 7 09:27:58 EDT 2008
Author: ataylor
Date: 2008-07-07 09:27:58 -0400 (Mon, 07 Jul 2008)
New Revision: 4646
Added:
trunk/tests/src/org/jboss/messaging/tests/timing/core/util/VariableLatchTest.java
Modified:
trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/util/VariableLatchTest.java
Log:
moved tests to timing
Added: trunk/tests/src/org/jboss/messaging/tests/timing/core/util/VariableLatchTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/core/util/VariableLatchTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/core/util/VariableLatchTest.java 2008-07-07 13:27:58 UTC (rev 4646)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.tests.timing.core.util;
+
+import org.jboss.messaging.tests.util.UnitTestCase;
+import org.jboss.messaging.util.VariableLatch;
+
+/**
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ */
+public class VariableLatchTest extends UnitTestCase
+{
+ public void testTimeout() throws Exception
+ {
+ VariableLatch latch = new VariableLatch();
+
+ latch.up();
+
+ long start = System.currentTimeMillis();
+ try
+ {
+ latch.waitCompletion(1000);
+ fail("It was suppsoed to throw an exception");
+ } catch (Exception ignored)
+ {
+ }
+ long end = System.currentTimeMillis();
+
+ assertTrue("Timeout didn't work correctly", end - start >= 1000
+ && end - start < 2000);
+ }
+}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java 2008-07-07 13:11:47 UTC (rev 4645)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java 2008-07-07 13:27:58 UTC (rev 4646)
@@ -119,11 +119,11 @@
{
ArrayList<Binding> bindingArrayList = new ArrayList<Binding>();
- Binding[] bindings = new Binding[1000];
- Queue[] queues = new Queue[1000];
- SimpleString[] addresses = new SimpleString[1000];
- SimpleString[] queueNames = new SimpleString[1000];
- for (int i = 0; i < 1000; i++)
+ Binding[] bindings = new Binding[100];
+ Queue[] queues = new Queue[100];
+ SimpleString[] addresses = new SimpleString[100];
+ SimpleString[] queueNames = new SimpleString[100];
+ for (int i = 0; i < 100; i++)
{
bindings[i] = EasyMock.createStrictMock(Binding.class);
bindingArrayList.add(bindings[i]);
@@ -155,7 +155,7 @@
EasyMock.verify(pm, qf);
assertTrue(postOffice.isStarted());
- for (int i = 0; i < 1000; i++)
+ for (int i = 0; i < 100; i++)
{
assertEquals(postOffice.getBinding(queueNames[i]), bindings[i]);
assertEquals(postOffice.getBindingsForAddress(addresses[i]).size(), 1);
@@ -292,11 +292,11 @@
PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
ArrayList<Binding> bindingArrayList = new ArrayList<Binding>();
List<SimpleString> dests = new ArrayList<SimpleString>();
- Binding[] bindings = new Binding[1000];
- Queue[] queues = new Queue[1000];
- SimpleString[] addresses = new SimpleString[1000];
- SimpleString[] queueNames = new SimpleString[1000];
- for (int i = 0; i < 1000; i++)
+ Binding[] bindings = new Binding[100];
+ Queue[] queues = new Queue[100];
+ SimpleString[] addresses = new SimpleString[100];
+ SimpleString[] queueNames = new SimpleString[100];
+ for (int i = 0; i < 100; i++)
{
bindings[i] = EasyMock.createStrictMock(Binding.class);
bindingArrayList.add(bindings[i]);
@@ -315,7 +315,7 @@
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new LoadBindingsIAnswer(bindingArrayList, dests));
- for (int i = 0; i < 1000; i++)
+ for (int i = 0; i < 100; i++)
{
EasyMock.expect(pm.addDestination(addresses[i])).andReturn(true);
}
@@ -328,7 +328,7 @@
EasyMock.verify(pm, qf);
assertTrue(postOffice.isStarted());
- for (int i = 0; i < 1000; i++)
+ for (int i = 0; i < 100; i++)
{
assertEquals(postOffice.getBinding(queueNames[i]), bindings[i]);
assertEquals(postOffice.getBindingsForAddress(addresses[i]).size(), 1);
@@ -344,11 +344,11 @@
PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
ArrayList<Binding> bindingArrayList = new ArrayList<Binding>();
List<SimpleString> dests = new ArrayList<SimpleString>();
- Binding[] bindings = new Binding[1000];
- Queue[] queues = new Queue[1000];
- SimpleString[] addresses = new SimpleString[1000];
- SimpleString[] queueNames = new SimpleString[1000];
- for (int i = 0; i < 1000; i++)
+ Binding[] bindings = new Binding[100];
+ Queue[] queues = new Queue[100];
+ SimpleString[] addresses = new SimpleString[100];
+ SimpleString[] queueNames = new SimpleString[100];
+ for (int i = 0; i < 100; i++)
{
bindings[i] = EasyMock.createStrictMock(Binding.class);
bindingArrayList.add(bindings[i]);
@@ -367,7 +367,7 @@
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new LoadBindingsIAnswer(bindingArrayList, dests));
- for (int i = 0; i < 1000; i++)
+ for (int i = 0; i < 100; i++)
{
EasyMock.expect(pm.addDestination(addresses[i])).andReturn(true);
}
@@ -380,7 +380,7 @@
EasyMock.verify(pm, qf);
assertFalse(postOffice.isStarted());
- for (int i = 0; i < 1000; i++)
+ for (int i = 0; i < 100; i++)
{
assertNull(postOffice.getBinding(queueNames[i]));
assertEquals(postOffice.getBindingsForAddress(addresses[i]).size(), 0);
@@ -396,11 +396,11 @@
PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
ArrayList<Binding> bindingArrayList = new ArrayList<Binding>();
List<SimpleString> dests = new ArrayList<SimpleString>();
- Binding[] bindings = new Binding[1000];
- Queue[] queues = new Queue[1000];
- SimpleString[] addresses = new SimpleString[1000];
- SimpleString[] queueNames = new SimpleString[1000];
- for (int i = 0; i < 1000; i++)
+ Binding[] bindings = new Binding[100];
+ Queue[] queues = new Queue[100];
+ SimpleString[] addresses = new SimpleString[100];
+ SimpleString[] queueNames = new SimpleString[100];
+ for (int i = 0; i < 100; i++)
{
bindings[i] = EasyMock.createStrictMock(Binding.class);
bindingArrayList.add(bindings[i]);
@@ -419,7 +419,7 @@
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new LoadBindingsIAnswer(bindingArrayList, dests));
- for (int i = 0; i < 1000; i++)
+ for (int i = 0; i < 100; i++)
{
EasyMock.expect(pm.addDestination(addresses[i])).andReturn(true);
}
@@ -432,7 +432,7 @@
EasyMock.verify(pm, qf);
assertTrue(postOffice.isStarted());
- for (int i = 0; i < 1000; i++)
+ for (int i = 0; i < 100; i++)
{
FlowController flowController = postOffice.getFlowController(addresses[i]);
assertNotNull(flowController);
@@ -447,11 +447,11 @@
PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
ArrayList<Binding> bindingArrayList = new ArrayList<Binding>();
List<SimpleString> dests = new ArrayList<SimpleString>();
- Binding[] bindings = new Binding[1000];
- Queue[] queues = new Queue[1000];
- SimpleString[] addresses = new SimpleString[1000];
- SimpleString[] queueNames = new SimpleString[1000];
- for (int i = 0; i < 1000; i++)
+ Binding[] bindings = new Binding[100];
+ Queue[] queues = new Queue[100];
+ SimpleString[] addresses = new SimpleString[100];
+ SimpleString[] queueNames = new SimpleString[100];
+ for (int i = 0; i < 100; i++)
{
bindings[i] = EasyMock.createStrictMock(Binding.class);
bindingArrayList.add(bindings[i]);
@@ -470,7 +470,7 @@
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new LoadBindingsIAnswer(bindingArrayList, dests));
- for (int i = 0; i < 1000; i++)
+ for (int i = 0; i < 100; i++)
{
EasyMock.expect(pm.addDestination(addresses[i])).andReturn(true);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/util/VariableLatchTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/util/VariableLatchTest.java 2008-07-07 13:11:47 UTC (rev 4645)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/util/VariableLatchTest.java 2008-07-07 13:27:58 UTC (rev 4646)
@@ -22,13 +22,12 @@
package org.jboss.messaging.tests.unit.core.util;
-import java.util.concurrent.CountDownLatch;
-
import junit.framework.TestCase;
-
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.util.VariableLatch;
+import java.util.concurrent.CountDownLatch;
+
/**
*
* @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
@@ -58,26 +57,6 @@
latch.waitCompletion();
}
- public void testTimeout() throws Exception
- {
- VariableLatch latch = new VariableLatch();
-
- latch.up();
-
- long start = System.currentTimeMillis();
- try
- {
- latch.waitCompletion(1000);
- fail("It was suppsoed to throw an exception");
- } catch (Exception ignored)
- {
- }
- long end = System.currentTimeMillis();
-
- assertTrue("Timeout didn't work correctly", end - start >= 1000
- && end - start < 2000);
- }
-
/**
*
* This test will open numberOfThreads threads, and add numberOfAdds on the
More information about the jboss-cvs-commits
mailing list