From 8eafe7aee31b3e2f80c87b39c4e42e260a86a5eb Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 15 Dec 2014 08:41:45 +0200 Subject: Do not create default instances while reading designs (#7749) Change-Id: I26cb6d8d43200d10ebf8c0ac22c538b4272f5ecd --- .../vaadin/tests/design/designroot/DesignRootTest.java | 3 --- .../component/abstractsplitpanel/TestReadDesign.java | 15 --------------- 2 files changed, 18 deletions(-) (limited to 'server/tests') diff --git a/server/tests/src/com/vaadin/tests/design/designroot/DesignRootTest.java b/server/tests/src/com/vaadin/tests/design/designroot/DesignRootTest.java index 0d390ba184..300d293e66 100644 --- a/server/tests/src/com/vaadin/tests/design/designroot/DesignRootTest.java +++ b/server/tests/src/com/vaadin/tests/design/designroot/DesignRootTest.java @@ -16,11 +16,8 @@ package com.vaadin.tests.design.designroot; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; -// This test will not pass until default instance creation is changed. Will leave it ignored for now. -@Ignore public class DesignRootTest { @Test public void designAnnotationWithoutFilename() { diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestReadDesign.java index c57f18cbf9..db30f05c5f 100644 --- a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestReadDesign.java +++ b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestReadDesign.java @@ -60,21 +60,6 @@ public class TestReadDesign extends TestCase { assertEquals(Unit.PIXELS, sp.getMaxSplitPositionUnit()); assertEquals(true, sp.isLocked()); checkReversed(sp, true); - // check that the properties get the default values if the design - // does not have attributes corresponding to those properties - design = createDesign(true, true, true, true); - sp.readDesign(design, ctx); - HorizontalSplitPanel def = new HorizontalSplitPanel(); - assertEquals(def.getSplitPosition(), sp.getSplitPosition()); - assertEquals(def.getSplitPositionUnit(), sp.getSplitPositionUnit()); - assertEquals(def.getMinSplitPosition(), sp.getMinSplitPosition()); - assertEquals(def.getMinSplitPositionUnit(), - sp.getMinSplitPositionUnit()); - assertEquals(def.getMaxSplitPosition(), sp.getMaxSplitPosition()); - assertEquals(def.getMaxSplitPositionUnit(), - sp.getMaxSplitPositionUnit()); - assertEquals(def.isLocked(), sp.isLocked()); - checkReversed(sp, false); } public void testWithNoChildren() { -- cgit v1.2.3