fix crash in test and extend test

texstudio-org · Nov 21, 2023 · ce452bb · ce452bb
1 parent ad08262
commit ce452bb
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 1 deletion.
diff --git a/src/tests/testdata/included_level1a.tex b/src/tests/testdata/included_level1a.tex
@@ -0,0 +1,4 @@
+\label{test_level1}
+
+\include{included_level2a}
+
diff --git a/src/tests/testdata/included_level2a.tex b/src/tests/testdata/included_level2a.tex
@@ -0,0 +1,4 @@
+\usepackage{siunitx}
+\usepackage{wasysym}
+
+\label{test_level2}
diff --git a/src/tests/testdata/top_buried_package.tex b/src/tests/testdata/top_buried_package.tex
@@ -0,0 +1,14 @@
+\include{included_level1a}
+
+\GHz
+\clock
+\degreeCelsius
+\ref{test_level1}
+
+\ref{test_level2}
+\section{dsdfgdfgse}
+
+\subsection{dffdfssssfdf}
+
+
+
diff --git a/src/tests/texstudio_t.cpp b/src/tests/texstudio_t.cpp
@@ -35,6 +35,8 @@ void TexStudioTest::checkIncludes_data(){
         <<QStringList{QString(TESTDATADIR)+"/top.tex",QString(TESTDATADIR)+"/a1.tex",QString(TESTDATADIR)+"/a2.tex"}<<false;
     QTest::newRow("2 level include, out of order")
         <<QStringList{QString(TESTDATADIR)+"/top.tex",QString(TESTDATADIR)+"/a2.tex",QString(TESTDATADIR)+"/a1.tex"}<<false;
+    QTest::newRow("2 level include, buried package")
+        <<QStringList{QString(TESTDATADIR)+"/included_level1a.tex",QString(TESTDATADIR)+"/included_level2a.tex",QString(TESTDATADIR)+"/top_buried_package.tex"}<<true;
     QTest::newRow("usercommands")
         <<QStringList{QString(TESTDATADIR)+"/usercommands.tex"}<<false;
 }
@@ -122,6 +124,8 @@ void TexStudioTest::checkIncludesCached_data(){
         <<QStringList{QString(TESTDATADIR)+"/top.tex",QString(TESTDATADIR)+"/a1.tex",QString(TESTDATADIR)+"/a2.tex"}<<false;
     QTest::newRow("2 level include, out of order")
         <<QStringList{QString(TESTDATADIR)+"/top.tex",QString(TESTDATADIR)+"/a2.tex",QString(TESTDATADIR)+"/a1.tex"}<<false;
+    QTest::newRow("2 level include, buried package")
+        <<QStringList{QString(TESTDATADIR)+"/included_level1a.tex",QString(TESTDATADIR)+"/included_level2a.tex",QString(TESTDATADIR)+"/top_buried_package.tex"}<<true;
 }
 
 void TexStudioTest::checkIncludesCached(){

diff --git a/src/texstudio.cpp b/src/texstudio.cpp
@@ -7056,7 +7056,13 @@ bool Texstudio::executeTests(const QStringList &args)
                 return false;
             }
         }else{
-            m_languages->setLanguageFromName(currentEditorView()->editor, "TXS Test Results");
+            QEditor *ed=currentEditor();
+            if(!ed){
+                qDebug()<<"Editor was closed.";
+                fileNew();
+                ed=currentEditor();
+            }
+            m_languages->setLanguageFromName(ed, "TXS Test Results");
             currentEditorView()->editor->setText(result, false);
             if (result.startsWith("*** THERE SEEM TO BE FAILED TESTS! ***")) {
                 QSearchReplacePanel *searchpanel = qobject_cast<QSearchReplacePanel *>(currentEditorView()->codeeditor->panels("Search")[0]);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		\label{test_level1}

		\include{included_level2a}