Use java 11 (#1050)

This commit is contained in:
Leon Mak
2019-10-28 23:02:17 +08:00
committed by Ilkka Seppälä
parent 6bb3438965
commit dd971d8c19
12 changed files with 102 additions and 141 deletions

View File

@ -66,11 +66,10 @@ public class CakeTest {
assertNotNull(cake.getLayers());
assertTrue(cake.getLayers().isEmpty());
final Set<CakeLayer> expectedLayers = new HashSet<>();
expectedLayers.add(new CakeLayer("layer1", 1000));
expectedLayers.add(new CakeLayer("layer2", 2000));
expectedLayers.add(new CakeLayer("layer3", 3000));
final Set<CakeLayer> expectedLayers = Set.of(
new CakeLayer("layer1", 1000),
new CakeLayer("layer2", 2000),
new CakeLayer("layer3", 3000));
cake.setLayers(expectedLayers);
assertEquals(expectedLayers, cake.getLayers());
}
@ -111,7 +110,7 @@ public class CakeTest {
cake.setTopping(topping);
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]";
assertEquals(expected, cake.toString());

View File

@ -31,7 +31,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@ -64,14 +63,13 @@ public class CakeViewImplTest {
@Test
public void testRender() {
final List<CakeLayerInfo> layers = new ArrayList<>();
layers.add(new CakeLayerInfo("layer1", 1000));
layers.add(new CakeLayerInfo("layer2", 2000));
layers.add(new CakeLayerInfo("layer3", 3000));
final List<CakeLayerInfo> layers = List.of(
new CakeLayerInfo("layer1", 1000),
new CakeLayerInfo("layer2", 2000),
new CakeLayerInfo("layer3", 3000));
final List<CakeInfo> cakes = new ArrayList<>();
final CakeInfo cake = new CakeInfo(new CakeToppingInfo("topping", 1000), layers);
cakes.add(cake);
final List<CakeInfo> cakes = List.of(cake);
final CakeBakingService bakingService = mock(CakeBakingService.class);
when(bakingService.getAllCakes()).thenReturn(cakes);