Use an interface for ContractionState so that there can be different

implementations of that interface.

1 files changed, 80 insertions, 80 deletions

diff --git a/test/unit/testContractionState.cxx b/test/unit/testContractionState.cxx
index a0eee4634..b0346dfc9 100644
--- a/test/unit/testContractionState.cxx
+++ b/test/unit/testContractionState.cxx
@@ -25,134 +25,134 @@ using namespace Scintilla;
 
 TEST_CASE("ContractionState") {
 
-	ContractionState cs;
+	std::unique_ptr<IContractionState> pcs = ContractionStateCreate();
 
 	SECTION("IsEmptyInitially") {
-		REQUIRE(1 == cs.LinesInDoc());
-		REQUIRE(1 == cs.LinesDisplayed());
-		REQUIRE(0 == cs.DisplayFromDoc(0));
-		REQUIRE(0 == cs.DocFromDisplay(0));
+		REQUIRE(1 == pcs->LinesInDoc());
+		REQUIRE(1 == pcs->LinesDisplayed());
+		REQUIRE(0 == pcs->DisplayFromDoc(0));
+		REQUIRE(0 == pcs->DocFromDisplay(0));
 	}
 
 	SECTION("OneLine") {
-		cs.InsertLine(0);
-		REQUIRE(2 == cs.LinesInDoc());
-		REQUIRE(2 == cs.LinesDisplayed());
-		REQUIRE(0 == cs.DisplayFromDoc(0));
-		REQUIRE(0 == cs.DocFromDisplay(0));
-		REQUIRE(1 == cs.DisplayFromDoc(1));
-		REQUIRE(1 == cs.DocFromDisplay(1));
+		pcs->InsertLines(0, 1);
+		REQUIRE(2 == pcs->LinesInDoc());
+		REQUIRE(2 == pcs->LinesDisplayed());
+		REQUIRE(0 == pcs->DisplayFromDoc(0));
+		REQUIRE(0 == pcs->DocFromDisplay(0));
+		REQUIRE(1 == pcs->DisplayFromDoc(1));
+		REQUIRE(1 == pcs->DocFromDisplay(1));
 	}
 
 	SECTION("InsertionThenDeletions") {
-		cs.InsertLines(0,4);
-		cs.DeleteLine(1);
+		pcs->InsertLines(0,4);
+		pcs->DeleteLines(1, 1);
 
-		REQUIRE(4 == cs.LinesInDoc());
-		REQUIRE(4 == cs.LinesDisplayed());
+		REQUIRE(4 == pcs->LinesInDoc());
+		REQUIRE(4 == pcs->LinesDisplayed());
 		for (int l=0;l<4;l++) {
-			REQUIRE(l == cs.DisplayFromDoc(l));
-			REQUIRE(l == cs.DocFromDisplay(l));
+			REQUIRE(l == pcs->DisplayFromDoc(l));
+			REQUIRE(l == pcs->DocFromDisplay(l));
 		}
 
-		cs.DeleteLines(0,2);
-		REQUIRE(2 == cs.LinesInDoc());
-		REQUIRE(2 == cs.LinesDisplayed());
+		pcs->DeleteLines(0,2);
+		REQUIRE(2 == pcs->LinesInDoc());
+		REQUIRE(2 == pcs->LinesDisplayed());
 		for (int l=0;l<2;l++) {
-			REQUIRE(l == cs.DisplayFromDoc(l));
-			REQUIRE(l == cs.DocFromDisplay(l));
+			REQUIRE(l == pcs->DisplayFromDoc(l));
+			REQUIRE(l == pcs->DocFromDisplay(l));
 		}
 	}
 
 	SECTION("ShowHide") {
-		cs.InsertLines(0,4);
-		REQUIRE(true == cs.GetVisible(0));
-		REQUIRE(true == cs.GetVisible(1));
-		REQUIRE(true == cs.GetVisible(2));
-		REQUIRE(5 == cs.LinesDisplayed());
-
-		cs.SetVisible(1, 1, false);
-		REQUIRE(true == cs.GetVisible(0));
-		REQUIRE(false == cs.GetVisible(1));
-		REQUIRE(true == cs.GetVisible(2));
-		REQUIRE(4 == cs.LinesDisplayed());
-		REQUIRE(true == cs.HiddenLines());
-
-		cs.SetVisible(1, 2, true);
+		pcs->InsertLines(0,4);
+		REQUIRE(true == pcs->GetVisible(0));
+		REQUIRE(true == pcs->GetVisible(1));
+		REQUIRE(true == pcs->GetVisible(2));
+		REQUIRE(5 == pcs->LinesDisplayed());
+
+		pcs->SetVisible(1, 1, false);
+		REQUIRE(true == pcs->GetVisible(0));
+		REQUIRE(false == pcs->GetVisible(1));
+		REQUIRE(true == pcs->GetVisible(2));
+		REQUIRE(4 == pcs->LinesDisplayed());
+		REQUIRE(true == pcs->HiddenLines());
+
+		pcs->SetVisible(1, 2, true);
 		for (int l=0;l<4;l++) {
-			REQUIRE(true == cs.GetVisible(0));
+			REQUIRE(true == pcs->GetVisible(0));
 		}
 
-		cs.SetVisible(1, 1, false);
-		REQUIRE(false == cs.GetVisible(1));
-		cs.ShowAll();
+		pcs->SetVisible(1, 1, false);
+		REQUIRE(false == pcs->GetVisible(1));
+		pcs->ShowAll();
 		for (int l=0;l<4;l++) {
-			REQUIRE(true == cs.GetVisible(0));
+			REQUIRE(true == pcs->GetVisible(0));
 		}
-		REQUIRE(false == cs.HiddenLines());
+		REQUIRE(false == pcs->HiddenLines());
 	}
 
 	SECTION("Hidden") {
-		cs.InsertLines(0,1);
+		pcs->InsertLines(0,1);
 		for (int l=0;l<2;l++) {
-			REQUIRE(true == cs.GetVisible(0));
+			REQUIRE(true == pcs->GetVisible(0));
 		}
-		REQUIRE(false == cs.HiddenLines());
+		REQUIRE(false == pcs->HiddenLines());
 
-		cs.SetVisible(1, 1, false);
-		REQUIRE(true == cs.GetVisible(0));
-		REQUIRE(false == cs.GetVisible(1));
-		REQUIRE(true == cs.HiddenLines());
+		pcs->SetVisible(1, 1, false);
+		REQUIRE(true == pcs->GetVisible(0));
+		REQUIRE(false == pcs->GetVisible(1));
+		REQUIRE(true == pcs->HiddenLines());
 
-		cs.SetVisible(1, 1, true);
+		pcs->SetVisible(1, 1, true);
 		for (int l=0;l<2;l++) {
-			REQUIRE(true == cs.GetVisible(0));
+			REQUIRE(true == pcs->GetVisible(0));
 		}
-		REQUIRE(false == cs.HiddenLines());
+		REQUIRE(false == pcs->HiddenLines());
 	}
 
 	SECTION("Contracting") {
-		cs.InsertLines(0,4);
+		pcs->InsertLines(0,4);
 		for (int l=0;l<4;l++) {
-			REQUIRE(true == cs.GetExpanded(l));
+			REQUIRE(true == pcs->GetExpanded(l));
 		}
 
-		cs.SetExpanded(2, false);
-		REQUIRE(true == cs.GetExpanded(1));
-		REQUIRE(false == cs.GetExpanded(2));
-		REQUIRE(true == cs.GetExpanded(3));
+		pcs->SetExpanded(2, false);
+		REQUIRE(true == pcs->GetExpanded(1));
+		REQUIRE(false == pcs->GetExpanded(2));
+		REQUIRE(true == pcs->GetExpanded(3));
 
-		REQUIRE(2 == cs.ContractedNext(0));
-		REQUIRE(2 == cs.ContractedNext(1));
-		REQUIRE(2 == cs.ContractedNext(2));
-		REQUIRE(-1 == cs.ContractedNext(3));
+		REQUIRE(2 == pcs->ContractedNext(0));
+		REQUIRE(2 == pcs->ContractedNext(1));
+		REQUIRE(2 == pcs->ContractedNext(2));
+		REQUIRE(-1 == pcs->ContractedNext(3));
 
-		cs.SetExpanded(2, true);
-		REQUIRE(true == cs.GetExpanded(1));
-		REQUIRE(true == cs.GetExpanded(2));
-		REQUIRE(true == cs.GetExpanded(3));
+		pcs->SetExpanded(2, true);
+		REQUIRE(true == pcs->GetExpanded(1));
+		REQUIRE(true == pcs->GetExpanded(2));
+		REQUIRE(true == pcs->GetExpanded(3));
 	}
 
 	SECTION("ChangeHeight") {
-		cs.InsertLines(0,4);
+		pcs->InsertLines(0,4);
 		for (int l=0;l<4;l++) {
-			REQUIRE(1 == cs.GetHeight(l));
+			REQUIRE(1 == pcs->GetHeight(l));
 		}
 
-		cs.SetHeight(1, 2);
-		REQUIRE(1 == cs.GetHeight(0));
-		REQUIRE(2 == cs.GetHeight(1));
-		REQUIRE(1 == cs.GetHeight(2));
+		pcs->SetHeight(1, 2);
+		REQUIRE(1 == pcs->GetHeight(0));
+		REQUIRE(2 == pcs->GetHeight(1));
+		REQUIRE(1 == pcs->GetHeight(2));
 	}
 
 	SECTION("SetFoldDisplayText") {
-		cs.InsertLines(0, 4);
-		cs.SetFoldDisplayText(1, "abc");
-		REQUIRE(strcmp(cs.GetFoldDisplayText(1), "abc") == 0);
-		cs.SetFoldDisplayText(1, "def");
-		REQUIRE(strcmp(cs.GetFoldDisplayText(1), "def") == 0);
-		cs.SetFoldDisplayText(1, nullptr);
-		REQUIRE(static_cast<const char *>(nullptr) == cs.GetFoldDisplayText(1));
+		pcs->InsertLines(0, 4);
+		pcs->SetFoldDisplayText(1, "abc");
+		REQUIRE(strcmp(pcs->GetFoldDisplayText(1), "abc") == 0);
+		pcs->SetFoldDisplayText(1, "def");
+		REQUIRE(strcmp(pcs->GetFoldDisplayText(1), "def") == 0);
+		pcs->SetFoldDisplayText(1, nullptr);
+		REQUIRE(static_cast<const char *>(nullptr) == pcs->GetFoldDisplayText(1));
 	}
 
 }