@@ -10,7 +10,6 @@ module Testable.Element exposing
16 , expectRoundedEquality
15 , expectRoundedEquality
@@ -38,14 +37,10 @@ module Testable.Element exposing
47 , textColumn
43 , textColumn
49 , transparent
44 , transparent
@@ -69,16 +64,11 @@ import Testable
69import Testable.Runner
64import Testable.Runner
72−{-| This is used when we want to run all tests in a test suite instead of one at a time.
74−toProgram : Testable.Runner.Testable -> Testable.Runner.TestableProgram
76− Testable.Runner.program [ testable ]
79−layout : List (Testable.Attr msg) -> Testable.Element Testable.Runner.Msg -> Testable.Runner.Testable
67+layout : List (Testable.Attr msg) -> Testable.Element Testable.Runner.Msg -> Testable.Runner.TestableProgram
80layout attrs elem =
68layout attrs elem =
81− Testable.Runner.testable "Test" elem
69+ Testable.Runner.program
70+ [ ( "Tests Run", elem )
84text : String -> Testable.Element msg
74text : String -> Testable.Element msg
@@ -136,31 +126,8 @@ link :
137 -> Testable.Element msg
127 -> Testable.Element msg
138link attrs details =
128link attrs details =
139− Testable.Link details.url
129+ -- TODO: this is not actually a link element!!
140− (implicitWidthHeightShrink attrs)
130+ Testable.El (implicitWidthHeightShrink attrs) details.label
145− Testable.Attr Element.clip
149−scrollbars : Testable.Attr msg
151− Testable.Attr Element.scrollbars
155−scrollbarY : Testable.Attr msg
157− Testable.Attr Element.scrollbarY
161−scrollbarX : Testable.Attr msg
163− Testable.Attr Element.scrollbarX
166{-| Old labeling mechanism that i removed to hastily
133{-| Old labeling mechanism that i removed to hastily
@@ -334,11 +301,6 @@ paddingXY x y =
338− List.filter Tuple.first ls
339− |> List.map Tuple.second
342widthHelper maybeMin maybeMax len =
304widthHelper maybeMin maybeMax len =
344 addMin l =
306 addMin l =
@@ -497,31 +459,12 @@ widthHelper maybeMin maybeMax len =
497 totalChildren + horizontalPadding
459 totalChildren + horizontalPadding
499 expectedLines =
461 expectedLines =
500− if boxChildrenHeight > 20 then
501− ceiling (boxChildrenHeight / 20)
504− ceiling (totalCalculatedWidth / context.self.bbox.width)
462+ ceiling (totalCalculatedWidth / context.self.bbox.width)
514− [ Testable.true "text wrapping, checking height"
464+ [ Testable.rounded "text wrapping, checking height"
515− -- all we're doing here is testing if wrapping is occurring
516− -- not the exact height, which is a little tricky to calculate perfectly without more information.
517− (if expectedLines > 1 then
465+ { expected = toFloat (expectedLines * 22)
518− context.self.bbox.height >= (20 * 2)
521− -- then it's less than 2 ~ line heights
522− -- there's some weird variance here which makes it hard to be exact.
523− context.self.bbox.height < (20 * 2)
466+ , found = context.self.bbox.height
@@ -555,50 +498,23 @@ widthHelper maybeMin maybeMax len =
556 horizontalPadding =
499 horizontalPadding =
557 context.self.bbox.padding.left + context.self.bbox.padding.right
500 context.self.bbox.padding.left + context.self.bbox.padding.right
560− [ ( (context.parentLayout /= Testable.InParagraph)
561− && (context.parentLayout /= Testable.InTextCol)
562− , Testable.rounded "equals children"
563− { expected = totalChildren + horizontalPadding
564− , found = context.self.bbox.width
567− , ( context.parentLayout /= Testable.AtRoot
568− , Testable.lessThanOrEqual "not larger than parent"
569− context.self.bbox.width
570− context.parent.bbox.width
574− Testable.Link _ _ _ ->
581− |> List.map childWidth
582− |> List.append (List.map .width context.self.textMetrics)
585− horizontalPadding =
502+ _ =
586− context.self.bbox.padding.left + context.self.bbox.padding.right
503+ Debug.log "widths"
588− listIf
505+ context.children
589− [ ( (context.parentLayout /= Testable.InParagraph)
506+ |> List.map childWidth
590− && (context.parentLayout /= Testable.InTextCol)
507+ , text = List.map .width context.self.textMetrics
591− , Testable.rounded "equals children"
592− { expected = totalChildren + horizontalPadding
593− , found = context.self.bbox.width
596− , ( context.parentLayout /= Testable.AtRoot
510+ [ Testable.rounded "equals children"
511+ { expected = totalChildren + horizontalPadding
512+ , found = context.self.bbox.width
597− , Testable.lessThanOrEqual "not larger than parent"
514+ , Testable.lessThanOrEqual "not larger than parent"
598− context.self.bbox.width
515+ context.self.bbox.width
599− context.parent.bbox.width
516+ context.parent.bbox.width
603 Testable.Row rowAttrs _ ->
519 Testable.Row rowAttrs _ ->
604 -- width of row is the sum of all children widths
520 -- width of row is the sum of all children widths
@@ -622,19 +538,14 @@ widthHelper maybeMin maybeMax len =
622 totalSpacing =
538 totalSpacing =
623 toFloat spacingAmount * (toFloat (List.length context.children) - 1)
539 toFloat spacingAmount * (toFloat (List.length context.children) - 1)
627− , expectRoundedEquality
541+ [ expectRoundedEquality
628− { expected = totalChildren + horizontalPadding + totalSpacing
542+ { expected = totalChildren + horizontalPadding + totalSpacing
629− , found = context.self.bbox.width
543+ , found = context.self.bbox.width
632− , ( context.parentLayout /= Testable.AtRoot
633− , Testable.lessThanOrEqual "not larger than parent"
545+ , Testable.lessThanOrEqual "not larger than parent"
634− context.self.bbox.width
546+ context.self.bbox.width
635− context.parent.bbox.width
547+ context.parent.bbox.width
639 Testable.Column _ _ ->
550 Testable.Column _ _ ->
640 -- The width of the column is the width of the widest child.
551 -- The width of the column is the width of the widest child.
@@ -658,19 +569,14 @@ widthHelper maybeMin maybeMax len =
658 |> List.map childWidth
569 |> List.map childWidth
659 |> List.append textChildren
570 |> List.append textChildren
663− , expectRoundedEquality
572+ [ expectRoundedEquality
664− { expected = Maybe.withDefault 0 (List.maximum allChildren)
573+ { expected = Maybe.withDefault 0 (List.maximum allChildren)
665− , found = context.self.bbox.width
574+ , found = context.self.bbox.width
668− , ( context.parentLayout /= Testable.AtRoot
669− , Testable.lessThanOrEqual "not larger than parent"
576+ , Testable.lessThanOrEqual "not larger than parent"
670− context.self.bbox.width
577+ context.self.bbox.width
671− context.parent.bbox.width
578+ context.parent.bbox.width
675 Testable.TextColumn _ _ ->
581 Testable.TextColumn _ _ ->
676 -- The width of the column is the width of the widest child.
582 -- The width of the column is the width of the widest child.
@@ -694,19 +600,14 @@ widthHelper maybeMin maybeMax len =
694 |> List.map childWidth
600 |> List.map childWidth
695 |> List.append textChildren
601 |> List.append textChildren
699− , expectRoundedEquality
603+ [ expectRoundedEquality
700− { expected = Maybe.withDefault 0 (List.maximum allChildren)
604+ { expected = Maybe.withDefault 0 (List.maximum allChildren)
701− , found = context.self.bbox.width
605+ , found = context.self.bbox.width
704− , ( context.parentLayout /= Testable.AtRoot
705− , Testable.lessThanOrEqual "not larger than parent"
607+ , Testable.lessThanOrEqual "not larger than parent"
706− context.self.bbox.width
608+ context.self.bbox.width
707− context.parent.bbox.width
609+ context.parent.bbox.width
711 Testable.Paragraph _ _ ->
612 Testable.Paragraph _ _ ->
712 -- This should be the size it's text,
613 -- This should be the size it's text,
@@ -724,19 +625,14 @@ widthHelper maybeMin maybeMax len =
724 horizontalPadding =
625 horizontalPadding =
725 context.self.bbox.padding.left + context.self.bbox.padding.right
626 context.self.bbox.padding.left + context.self.bbox.padding.right
729− , expectRoundedEquality
628+ [ expectRoundedEquality
730− { expected = totalChildren + horizontalPadding
629+ { expected = totalChildren + horizontalPadding
731− , found = context.self.bbox.width
630+ , found = context.self.bbox.width
734− , ( context.parentLayout /= Testable.AtRoot
735− , Testable.lessThanOrEqual "not larger than parent"
632+ , Testable.lessThanOrEqual "not larger than parent"
736− context.self.bbox.width
633+ context.self.bbox.width
737− context.parent.bbox.width
634+ context.parent.bbox.width
741 Testable.Text _ ->
637 Testable.Text _ ->
@@ -890,45 +786,20 @@ heightHelper maybeMin maybeMax len =
890 childHeight child =
786 childHeight child =
891 child.bbox.height
787 child.bbox.height
893− if List.isEmpty context.children then
789+ [ if List.isEmpty context.children then
894 -- context.self.textMetrics
790 -- context.self.textMetrics
895 -- |> List.map Testable.textHeight
791 -- |> List.map Testable.textHeight
896 -- |> List.sum
792 -- |> List.sum
897 -- TODO: apparently the font metrics we have are for the literal characters rendered
793 -- TODO: apparently the font metrics we have are for the literal characters rendered
898 -- not for the font itself.
794 -- not for the font itself.
899− [ Testable.todo "calculate height from actual text metrics"
795+ -- so for now, we are stubbing this in as 20, which is the default font size + line height.
900− ]
796+ Testable.rounded "expected multiple of 20"
903− [ expectRoundedEquality
904− { expected =
797+ { expected = context.self.bbox.height
905− context.children
798+ , found = toFloat (List.length context.self.textMetrics * 20)
906− |> List.map childHeight
908− |> (\h -> h + context.self.bbox.padding.top + context.self.bbox.padding.bottom)
909− , found = context.self.bbox.height
911− , Testable.lessThanOrEqual "not larger than parent"
912− context.self.bbox.height
913− context.parent.bbox.height
916− Testable.Link _ _ _ ->
921− if List.isEmpty context.children then
922− -- context.self.textMetrics
923− -- |> List.map Testable.textHeight
925− -- TODO: apparently the font metrics we have are for the literal characters rendered
926− -- not for the font itself.
927− [ Testable.todo "calculate height from actual text metrics"
931− [ expectRoundedEquality
802+ expectRoundedEquality
932 { expected =
803 { expected =
933 context.children
804 context.children
934 |> List.map childHeight
805 |> List.map childHeight
@@ -936,26 +807,28 @@ heightHelper maybeMin maybeMax len =
936 |> (\h -> h + context.self.bbox.padding.top + context.self.bbox.padding.bottom)
807 |> (\h -> h + context.self.bbox.padding.top + context.self.bbox.padding.bottom)
937 , found = context.self.bbox.height
808 , found = context.self.bbox.height
939− , Testable.lessThanOrEqual "not larger than parent"
810+ , Testable.lessThanOrEqual "not larger than parent"
940− context.self.bbox.height
811+ context.self.bbox.height
941− context.parent.bbox.height
812+ context.parent.bbox.height
944 Testable.Row _ _ ->
815 Testable.Row _ _ ->
946 childHeight child =
817 childHeight child =
947 child.bbox.height
818 child.bbox.height
949− if List.isEmpty context.children then
820+ [ if List.isEmpty context.children then
950 -- context.self.textMetrics
821 -- context.self.textMetrics
951 -- |> List.map Testable.textHeight
822 -- |> List.map Testable.textHeight
952 -- |> List.sum
823 -- |> List.sum
953 -- TODO: apparently the font metrics we have are for the literal characters rendered
824 -- TODO: apparently the font metrics we have are for the literal characters rendered
954 -- not for the font itself.
825 -- not for the font itself.
955− [ Testable.todo "calculate height from actual text metrics" ]
826+ -- so for now, we are stubbing this in as 20, which is the default font size.
827+ Testable.true "expected multiple of 20"
828+ ((round context.self.bbox.height |> modBy 20) == 0)
958− [ expectRoundedEquality
831+ expectRoundedEquality
959 { expected =
832 { expected =
960 context.children
833 context.children
961 |> List.map childHeight
834 |> List.map childHeight
@@ -964,10 +837,10 @@ heightHelper maybeMin maybeMax len =
964 |> (\h -> h + context.self.bbox.padding.top + context.self.bbox.padding.bottom)
837 |> (\h -> h + context.self.bbox.padding.top + context.self.bbox.padding.bottom)
965 , found = context.self.bbox.height
838 , found = context.self.bbox.height
967− , Testable.lessThanOrEqual "not larger than parent"
840+ , Testable.lessThanOrEqual "not larger than parent"
968− context.self.bbox.height
841+ context.self.bbox.height
969− context.parent.bbox.height
842+ context.parent.bbox.height
972 Testable.Column colAttrs _ ->
845 Testable.Column colAttrs _ ->
@@ -999,10 +872,16 @@ heightHelper maybeMin maybeMax len =
1001 Testable.TextColumn _ _ ->
874 Testable.TextColumn _ _ ->
875+ [ Testable.lessThanOrEqual "not larger than parent"
876+ context.self.bbox.height
877+ context.parent.bbox.height
1004 Testable.Paragraph _ _ ->
880 Testable.Paragraph _ _ ->
881+ [ Testable.lessThanOrEqual "not larger than parent"
882+ context.self.bbox.height
883+ context.parent.bbox.height
1007 Testable.Text _ ->
886 Testable.Text _ ->