Checkstyle corrections

This commit is contained in:
Ilkka Seppala 2015-12-29 21:34:27 +02:00
parent b369812511
commit 8b020837ea
20 changed files with 102 additions and 35 deletions

View File

@ -89,9 +89,9 @@ public class ThreadAsyncExecutorTest {
final Object result = new Object(); final Object result = new Object();
final Callable<Object> task = mock(Callable.class); final Callable<Object> task = mock(Callable.class);
when(task.call()).thenAnswer(i -> { when(task.call()).thenAnswer(i -> {
Thread.sleep(1500); Thread.sleep(1500);
return result; return result;
}); });
final AsyncResult<Object> asyncResult = executor.startProcess(task); final AsyncResult<Object> asyncResult = executor.startProcess(task);
assertNotNull(asyncResult); assertNotNull(asyncResult);
@ -128,9 +128,9 @@ public class ThreadAsyncExecutorTest {
final Object result = new Object(); final Object result = new Object();
final Callable<Object> task = mock(Callable.class); final Callable<Object> task = mock(Callable.class);
when(task.call()).thenAnswer(i -> { when(task.call()).thenAnswer(i -> {
Thread.sleep(1500); Thread.sleep(1500);
return result; return result;
}); });
final AsyncCallback<Object> callback = mock(AsyncCallback.class); final AsyncCallback<Object> callback = mock(AsyncCallback.class);
final AsyncResult<Object> asyncResult = executor.startProcess(task, callback); final AsyncResult<Object> asyncResult = executor.startProcess(task, callback);
@ -177,9 +177,9 @@ public class ThreadAsyncExecutorTest {
final Object result = new Object(); final Object result = new Object();
final Callable<Object> task = mock(Callable.class); final Callable<Object> task = mock(Callable.class);
when(task.call()).thenAnswer(i -> { when(task.call()).thenAnswer(i -> {
Thread.sleep(1500); Thread.sleep(1500);
return result; return result;
}); });
final AsyncResult<Object> asyncResult = executor.startProcess(task); final AsyncResult<Object> asyncResult = executor.startProcess(task);
assertNotNull(asyncResult); assertNotNull(asyncResult);

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
<suppress checks="AvoidStarImport" files="[\\/]src[\\/]test[\\/]java[\\/]"/>
<suppress checks="[a-zA-Z0-9]*" files="[\\/]src[\\/]test[\\/]resources[\\/]"/>
<suppress checks="[a-zA-Z0-9]*" files="[\\/]build[\\/]generated-sources[\\/]"/>
<suppress checks="[a-zA-Z0-9]*" files="[\\/]src[\\/]main[\\/]resources[\\/]"/>
</suppressions>

View File

@ -158,7 +158,7 @@
<property name="allowMissingThrowsTags" value="true"/> <property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/> <property name="allowMissingReturnTag" value="true"/>
<property name="minLineCount" value="2"/> <property name="minLineCount" value="2"/>
<property name="allowedAnnotations" value="Override, Test, Before, After, Parameters, Given, When, BeforeClass, AfterClass"/> <property name="allowedAnnotations" value="Override, Test, Before, After, Parameters, Given, When, BeforeClass, AfterClass, Parameterized"/>
<property name="allowThrowsTagsForSubclasses" value="true"/> <property name="allowThrowsTagsForSubclasses" value="true"/>
</module> </module>
<module name="MethodName"> <module name="MethodName">
@ -168,4 +168,9 @@
</module> </module>
<module name="SingleLineJavadoc"/> <module name="SingleLineJavadoc"/>
</module> </module>
<module name="SuppressionFilter">
<property name="file" value="${config_loc}/checkstyle-suppressions.xml" default="checkstyle-suppressions.xml"/>
</module>
</module> </module>

View File

@ -14,7 +14,10 @@ import java.util.concurrent.TimeUnit;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;
import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/** /**
* Date: 12/10/15 - 9:34 PM * Date: 12/10/15 - 9:34 PM
@ -74,8 +77,8 @@ public class InventoryTest {
final ExecutorService executorService = Executors.newFixedThreadPool(THREAD_COUNT); final ExecutorService executorService = Executors.newFixedThreadPool(THREAD_COUNT);
for (int i = 0; i < THREAD_COUNT; i++) { for (int i = 0; i < THREAD_COUNT; i++) {
executorService.execute(() -> { executorService.execute(() -> {
while (inventory.addItem(new Item())) {}; while (inventory.addItem(new Item())) {};
}); });
} }
// Wait until all threads have finished // Wait until all threads have finished

View File

@ -7,7 +7,10 @@ import java.io.PrintStream;
import java.util.Objects; import java.util.Objects;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/** /**
* Date: 12/10/15 - 8:37 PM * Date: 12/10/15 - 8:37 PM

View File

@ -7,7 +7,11 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/** /**
* Date: 12/12/15 - 10:58 PM * Date: 12/12/15 - 10:58 PM

View File

@ -6,7 +6,11 @@ import org.junit.Test;
import java.io.PrintStream; import java.io.PrintStream;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/** /**
* Date: 12/12/15 - 3:04 PM * Date: 12/12/15 - 3:04 PM

View File

@ -3,7 +3,11 @@ package com.iluwatar.event.aggregator;
import org.junit.Test; import org.junit.Test;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/** /**
* Date: 12/12/15 - 10:57 AM * Date: 12/12/15 - 10:57 AM

View File

@ -67,8 +67,8 @@ public class SimpleFileWriterTest {
public void testIoException() throws Exception { public void testIoException() throws Exception {
final File temporaryFile = this.testFolder.newFile(); final File temporaryFile = this.testFolder.newFile();
new SimpleFileWriter(temporaryFile.getPath(), writer -> { new SimpleFileWriter(temporaryFile.getPath(), writer -> {
throw new IOException(""); throw new IOException("");
}); });
} }
} }

View File

@ -7,7 +7,9 @@ import org.junit.Test;
import java.io.PrintStream; import java.io.PrintStream;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.internal.verification.VerificationModeFactory.times; import static org.mockito.internal.verification.VerificationModeFactory.times;
/** /**

View File

@ -1,6 +1,11 @@
package com.iluwatar.flux.dispatcher; package com.iluwatar.flux.dispatcher;
import com.iluwatar.flux.action.*; import com.iluwatar.flux.action.Action;
import com.iluwatar.flux.action.ActionType;
import com.iluwatar.flux.action.Content;
import com.iluwatar.flux.action.ContentAction;
import com.iluwatar.flux.action.MenuAction;
import com.iluwatar.flux.action.MenuItem;
import com.iluwatar.flux.store.Store; import com.iluwatar.flux.store.Store;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -11,8 +16,13 @@ import java.lang.reflect.Field;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/** /**
* Date: 12/12/15 - 8:22 PM * Date: 12/12/15 - 8:22 PM

View File

@ -9,7 +9,11 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/** /**
* Date: 12/12/15 - 10:18 PM * Date: 12/12/15 - 10:18 PM

View File

@ -9,7 +9,11 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/** /**
* Date: 12/12/15 - 10:18 PM * Date: 12/12/15 - 10:18 PM

View File

@ -4,7 +4,11 @@ import com.iluwatar.flux.action.Content;
import com.iluwatar.flux.store.ContentStore; import com.iluwatar.flux.store.ContentStore;
import org.junit.Test; import org.junit.Test;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/** /**
* Date: 12/12/15 - 10:31 PM * Date: 12/12/15 - 10:31 PM

View File

@ -8,7 +8,11 @@ import com.iluwatar.flux.store.Store;
import org.junit.Test; import org.junit.Test;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
/** /**
* Date: 12/12/15 - 10:31 PM * Date: 12/12/15 - 10:31 PM

View File

@ -4,7 +4,11 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
/** /**
* Date: 12/13/15 - 3:01 PM * Date: 12/13/15 - 3:01 PM

View File

@ -88,8 +88,8 @@ public class CakeTest {
cake.setTopping(topping); cake.setTopping(topping);
cake.addLayer(layer); cake.addLayer(layer);
final String expected = "id=1234 topping=id=2345 name=topping calories=20 " + final String expected = "id=1234 topping=id=2345 name=topping calories=20 "
"layers=[id=3456 name=layer calories=100]"; + "layers=[id=3456 name=layer calories=100]";
assertEquals(expected, cake.toString()); assertEquals(expected, cake.toString());
} }

View File

@ -12,7 +12,10 @@ import java.util.Collection;
import java.util.function.Supplier; import java.util.function.Supplier;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
/** /**
* Date: 12/19/15 - 10:13 PM * Date: 12/19/15 - 10:13 PM

View File

@ -90,8 +90,8 @@ public class AnnotationBasedRepositoryTest {
assertEquals(3, persons.size()); assertEquals(3, persons.size());
assertTrue(persons.stream().allMatch((item) -> { assertTrue(persons.stream().allMatch((item) -> {
return item.getAge() > 20 && item.getAge() < 40; return item.getAge() > 20 && item.getAge() < 40;
})); }));
} }
@Test @Test

View File

@ -88,8 +88,8 @@ public class RepositoryTest {
assertEquals(3, persons.size()); assertEquals(3, persons.size());
assertTrue(persons.stream().allMatch((item) -> { assertTrue(persons.stream().allMatch((item) -> {
return item.getAge() > 20 && item.getAge() < 40; return item.getAge() > 20 && item.getAge() < 40;
})); }));
} }
@Test @Test