diff --git a/test/AlignmentSpec.hs b/test/AlignmentSpec.hs index 1171d64b8..fb4cbac84 100644 --- a/test/AlignmentSpec.hs +++ b/test/AlignmentSpec.hs @@ -35,24 +35,24 @@ spec = parallel $ do length (splitDiffByLines (pure source) (Free $ Annotated (pure $ Info (totalRange source) mempty 1) (Indexed . Prelude.fst $ foldl combineIntoLeaves ([], 0) source))) `shouldBe` length (filter (== '\n') $ toString source) + 1 prop "produces the maximum line count in inequal sources" $ - \ sources -> - length (splitDiffByLines sources (Free $ Annotated ((\ s -> Info (totalRange s) mempty 0) <$> sources) (Indexed $ leafWithRangesInSources sources <$> runBothWith (zipWith both) (actualLineRanges <$> (totalRange <$> sources) <*> sources)))) `shouldBe` runBothWith max ((+ 1) . length . filter (== '\n') . toString <$> sources) + \ sources -> let ranges = actualLineRanges <$> (totalRange <$> sources) <*> sources in + length (splitDiffByLines sources (Free $ Annotated ((\ s -> Info (totalRange s) mempty 0) <$> sources) (Indexed $ leafWithRangesInSources sources <$> runBothWith (zipWith both) ranges))) `shouldBe` runBothWith max ((+ 1) . length . filter (== '\n') . toString <$> sources) describe "splitAbstractedTerm" $ do prop "preserves line count" $ \ source -> let range = totalRange source in - splitAbstractedTerm (:<) (Identity source) (Identity (Info range mempty 1)) (Leaf source) `shouldBe` (Identity . lineMap (fmap (((:< Leaf source) . (\ r -> Info r mempty 1) &&& id))) <$> linesInRangeOfSource range source) + splitAbstractedTerm (:<) (Identity source) (Identity (Info range mempty 0)) (Leaf source) `shouldBe` (Identity . lineMap (fmap (((:< Leaf source) . (\ r -> Info r mempty 0) &&& id))) <$> linesInRangeOfSource range source) let makeTerm = ((Free .) . Annotated) :: Info -> Syntax (Source Char) (SplitDiff (Source Char) Info) -> SplitDiff (Source Char) Info prop "outputs one row for single-line unchanged leaves" $ forAll (arbitraryLeaf `suchThat` isOnSingleLine) $ - \ (source, info@(Info range categories size), syntax) -> splitAbstractedTerm makeTerm (pure source) (pure $ Info range categories size) syntax `shouldBe` fromList [ - both (pure (makeTerm info $ Leaf source, Range 0 (length source))) (pure (makeTerm info $ Leaf source, Range 0 (length source))) ] + \ (source, (Info range categories _), syntax) -> splitAbstractedTerm makeTerm (pure source) (pure $ Info range categories 0) syntax `shouldBe` fromList [ + both (pure (makeTerm (Info range categories 0) $ Leaf source, Range 0 (length source))) (pure (makeTerm (Info range categories 0) $ Leaf source, Range 0 (length source))) ] prop "outputs one row for single-line empty unchanged indexed nodes" $ forAll (arbitrary `suchThat` (\ a -> filter (/= '\n') (toString a) == toString a)) $ - \ source -> splitAbstractedTerm makeTerm (pure source) (pure $ Info (totalRange source) mempty 1) (Indexed []) `shouldBe` fromList [ - both (pure (makeTerm (Info (totalRange source) mempty 1) $ Indexed [], Range 0 (length source))) (pure (makeTerm (Info (totalRange source) mempty 1) $ Indexed [], Range 0 (length source))) ] + \ source -> splitAbstractedTerm makeTerm (pure source) (pure $ Info (totalRange source) mempty 0) (Indexed []) `shouldBe` fromList [ + both (pure (makeTerm (Info (totalRange source) mempty 0) $ Indexed [], Range 0 (length source))) (pure (makeTerm (Info (totalRange source) mempty 0) $ Indexed [], Range 0 (length source))) ] where isOnSingleLine (a, _, _) = filter (/= '\n') (toString a) == toString a