This commit is contained in:
Sergey Solovyev 2012-12-05 23:53:19 +04:00
parent 8272409cb7
commit e2c6b70ac0
3 changed files with 7 additions and 15 deletions

View File

@ -1,17 +1,9 @@
package org.solovyev.android.calculator;
import junit.framework.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.solovyev.common.text.StringUtils;
import java.util.Date;
import java.util.Random;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* User: serso
@ -23,18 +15,18 @@ public class AndroidCalculatorEditorViewTest {
@BeforeClass
public static void staticSetUp() throws Exception {
CalculatorTestUtils.staticSetUp(null);
/*CalculatorTestUtils.staticSetUp(null);*/
}
@Before
public void setUp() throws Exception {
CalculatorActivity context = new CalculatorActivity();
CalculatorTestUtils.initViews(context);
/* CalculatorActivity context = new CalculatorActivity();
CalculatorTestUtils.initViews(context);*/
}
@Test
public void testAsyncWork() throws Exception {
final int threadNum = 10;
/* final int threadNum = 10;
final int count = 10;
final int maxTextLength = 100;
@ -78,6 +70,6 @@ public class AndroidCalculatorEditorViewTest {
Assert.assertFalse(error.get());
} else {
Assert.fail("Too long execution!");
}
}*/
}
}

View File

@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
public class CalculatorTestUtils {
// in seconds
public static final int TIMEOUT = 10;
public static final int TIMEOUT = 3;
public static void staticSetUp() throws Exception {
Locator.getInstance().init(new CalculatorImpl(), newCalculatorEngine(), Mockito.mock(CalculatorClipboard.class), Mockito.mock(CalculatorNotifier.class), Mockito.mock(CalculatorHistory.class), new SystemOutCalculatorLogger(), Mockito.mock(CalculatorPreferenceService.class), Mockito.mock(CalculatorKeyboard.class), Mockito.mock(CalculatorExternalListenersContainer.class));

View File

@ -257,7 +257,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
<configuration>
<forkMode>perTest</forkMode>
<forkMode>always</forkMode>
</configuration>
</plugin>