Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Henri Kerola
committed
Oct 14, 2012
1 parent
3c610d5
commit 0bc3e7d
Showing
7 changed files
with
90 additions
and
2 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
addon/src/main/scala/vaadin/scala/HierarchicalContainer.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,25 @@ | |||
package vaadin.scala | |||
|
|||
import vaadin.scala.mixins.HierarchicalContainerMixin | |||
|
|||
package mixins { | |||
trait HierarchicalContainerMixin extends IndexedContainerMixin with ContainerHierarchicalMixin | |||
} | |||
|
|||
/** | |||
* @see com.vaadin.data.util.HierarchicalContainer | |||
* @author Henri Kerola / Vaadin | |||
*/ | |||
class HierarchicalContainer(override val p: com.vaadin.data.util.HierarchicalContainer with HierarchicalContainerMixin = new com.vaadin.data.util.HierarchicalContainer with HierarchicalContainerMixin) | |||
extends IndexedContainer(p) with Container.Hierarchical { | |||
|
|||
def moveAfterSibling(itemId: Any, siblingId: Any): Unit = p.moveAfterSibling(itemId, siblingId) | |||
|
|||
def removeItemRecursively(itemId: Any): Unit = p.removeItemRecursively(itemId) | |||
|
|||
def includeParentsWhenFiltering: Boolean = p.isIncludeParentsWhenFiltering | |||
def includeParentsWhenFiltering_=(includeParentsWhenFiltering: Boolean): Unit = p.setIncludeParentsWhenFiltering(includeParentsWhenFiltering) | |||
|
|||
// TODO: static removeItemRecursively(Container.Hierarchical container, Object itemId) | |||
// TODO: protected doSort(), doFilterContainer, passesFilters | |||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
addon/src/test/scala/vaadin/scala/tests/HierarchicalContainerTests.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,45 @@ | |||
package vaadin.scala.tests | |||
|
|||
import vaadin.scala.HierarchicalContainer | |||
import vaadin.scala.mixins.HierarchicalContainerMixin | |||
import org.mockito.Mockito | |||
|
|||
class HierarchicalContainerTests extends ScaladinTestSuite { | |||
|
|||
class VaadinHierarchicalContainer extends com.vaadin.data.util.HierarchicalContainer with HierarchicalContainerMixin | |||
|
|||
var vaadinContainer: VaadinHierarchicalContainer = _ | |||
var spy: VaadinHierarchicalContainer = _ | |||
var container: HierarchicalContainer = _ | |||
|
|||
var mockedVaadinContainer: VaadinHierarchicalContainer = _ | |||
var containerWithMock: HierarchicalContainer = _ | |||
|
|||
before { | |||
vaadinContainer = new VaadinHierarchicalContainer | |||
spy = Mockito.spy(vaadinContainer) | |||
container = new HierarchicalContainer(spy) | |||
|
|||
mockedVaadinContainer = mock[VaadinHierarchicalContainer] | |||
containerWithMock = new HierarchicalContainer(mockedVaadinContainer) | |||
} | |||
|
|||
test("moveAfterSibling") { | |||
containerWithMock.moveAfterSibling('itemId, 'siblingId) | |||
Mockito.verify(mockedVaadinContainer).moveAfterSibling('itemId, 'siblingId) | |||
} | |||
|
|||
test("removeItemRecursively") { | |||
containerWithMock.removeItemRecursively('itemId) | |||
Mockito.verify(mockedVaadinContainer).removeItemRecursively('itemId) | |||
} | |||
|
|||
test("includeParentsWhenFiltering") { | |||
assert(container.includeParentsWhenFiltering) | |||
container.includeParentsWhenFiltering = false | |||
assert(!container.includeParentsWhenFiltering) | |||
Mockito.verify(spy).setIncludeParentsWhenFiltering(false) | |||
Mockito.verify(spy, Mockito.times(2)).isIncludeParentsWhenFiltering() | |||
} | |||
|
|||
} |
10 changes: 10 additions & 0 deletions
10
addon/src/test/scala/vaadin/scala/tests/ScaladinTestSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,10 @@ | |||
package vaadin.scala.tests | |||
|
|||
import org.junit.runner.RunWith | |||
import org.scalatest.junit.JUnitRunner | |||
import org.scalatest.FunSuite | |||
import org.scalatest.BeforeAndAfter | |||
import org.scalatest.mock.MockitoSugar | |||
|
|||
@RunWith(classOf[JUnitRunner]) | |||
class ScaladinTestSuite extends FunSuite with BeforeAndAfter with MockitoSugar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters