Some cleanup in tests

Author: yurii-litvinov

tests/readerWriterTest/data.h

@@ -20,7 +20,6 @@ SUBDIRS = \
 	thirdparty \
 	trikKernelTests \
 	trikScriptRunnerTests \
-	readerWriterTest \
 
 thirdparty.file = thirdparty/gmock-1.6.0/gmock.pro
 

tests/readerWriterTest/main.cpp

@@ -12,7 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
-#include "bufferedVarTest.h"
+#include "synchronizedVarTest.h"
+
 #include <trikKernel/synchronizedVar.h>
 
 #include <QtCore/QList>
@@ -26,7 +27,7 @@ struct Point
 	int y;
 };
 
-TEST_F(BufferedVarTest, structTest)
+TEST_F(SynchronizedVarTest, structTest)
 {
 	SynchronizedVar<Point> var;
 	var->x = 10;
@@ -42,9 +43,9 @@ TEST_F(BufferedVarTest, structTest)
 	EXPECT_EQ(20, var.get().x);
 }
 
-TEST_F(BufferedVarTest, listTest)
+TEST_F(SynchronizedVarTest, listTest)
 {
-	BufferedVar<QList<Point>> list;
+	SynchronizedVar<QList<Point>> list;
 	EXPECT_TRUE(list.get().isEmpty());
 
 	const Point point{10, 10};
@@ -58,7 +59,7 @@ TEST_F(BufferedVarTest, listTest)
 	EXPECT_EQ(10, list.get().at(0).x);
 }
 
-TEST_F(BufferedVarTest, resetTest)
+TEST_F(SynchronizedVarTest, resetTest)
 {
 	SynchronizedVar<QList<Point>> list;
 	list->append({10, 10});

tests/readerWriterTest/reader.h

@@ -18,8 +18,8 @@
 
 namespace tests {
 
-/// Test fixture for BufferedVar class.
-class BufferedVarTest : public testing::Test
+/// Test fixture for SynchronizedVar class.
+class SynchronizedVarTest : public testing::Test
 {
 };
 

tests/readerWriterTest/readerWriterTest.pro

@@ -17,10 +17,10 @@ include(../../global.pri)
 include(../common.pri)
 
 HEADERS += \
-	$$PWD/bufferedVarTest.h \
+	$$PWD/synchronizedVarTest.h \
 
 SOURCES += \
-	$$PWD/bufferedVarTest.cpp \
+	$$PWD/synchronizedVarTest.cpp \
 
 implementationIncludes(trikKernel)
 links(trikKernel)

tests/readerWriterTest/writer.h

@@ -17,11 +17,11 @@ proc CheckOwnership { fileName } {
   set lineCount 1
   set previousComment ""
   foreach line [getAllLines $fileName] {
-    if { [regexp {.*\* [\w]*;} $line] } {
+    if { [regexp {^\t+[a-zA-Z<>& ]*\* [\w]*;} $line] } {
       report $fileName $lineCount "'*' shall be attached to identifier, not type"
     }
 
-    if { [regexp {.* \*[\w]*;} $line] } {
+    if { [regexp {^\t+[a-zA-Z<>& ]* \*[\w]*;} $line] } {
       if { ![regexp {ownership} [string tolower $line] ] &&  ![regexp {ownership} [string tolower $previousComment] ] } {
         report $fileName $lineCount "Raw pointers must have a comment with ownership information - does object have ownership over pointed object or not (so will it delete pointed object itself or not)"
       }