From bcd73bb584dff0301b7d8892b3666c1b4a4848e7 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 2 Apr 2014 19:17:01 +0000
Subject: [PATCH] autotests

git-svn-id: svn://ultimatepp.org/upp/trunk@7145 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 autotest/FileOutLocking/FileOutLocking.cpp | 18 -----------
 autotest/FileOutLocking/FileOutLocking.upp | 11 -------
 autotest/FileOutLocking/init               |  4 ---
 autotest/FilterStream/FilterStream.cpp     |  4 +++
 autotest/FormatUnsafe/FormatUnsafe.cpp     | 11 ++++++-
 autotest/StringStream/StringStream.cpp     |  8 +++++
 autotest/Witz/etalon                       | 35 +++++++++++-----------
 autotest/Witz/main.cpp                     |  7 ++---
 8 files changed, 43 insertions(+), 55 deletions(-)
 delete mode 100644 autotest/FileOutLocking/FileOutLocking.cpp
 delete mode 100644 autotest/FileOutLocking/FileOutLocking.upp
 delete mode 100644 autotest/FileOutLocking/init

diff --git a/autotest/FileOutLocking/FileOutLocking.cpp b/autotest/FileOutLocking/FileOutLocking.cpp
deleted file mode 100644
index 992d04785..000000000
--- a/autotest/FileOutLocking/FileOutLocking.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <Core/Core.h>
-
-using namespace Upp;
-
-CONSOLE_APP_MAIN
-{
-	for(;;) {
-		Cout() << "Press ENTER to open FileOut\n";
-		ReadStdIn();
-		FileOut out(ConfigFile("testfile"));
-		if(out) {
-			Cout() << "file opened\nPress ENTER to close\n";
-			ReadStdIn();
-		}
-		else
-			Cout() << "NOT opened\n";
-	}
-}
diff --git a/autotest/FileOutLocking/FileOutLocking.upp b/autotest/FileOutLocking/FileOutLocking.upp
deleted file mode 100644
index c38fc0d84..000000000
--- a/autotest/FileOutLocking/FileOutLocking.upp
+++ /dev/null
@@ -1,11 +0,0 @@
-description "Testing the locking of FileOut\377";
-
-uses
-	Core;
-
-file
-	FileOutLocking.cpp;
-
-mainconfig
-	"" = "SSE2";
-
diff --git a/autotest/FileOutLocking/init b/autotest/FileOutLocking/init
deleted file mode 100644
index f5c1c22da..000000000
--- a/autotest/FileOutLocking/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FileOutLocking_icpp_init_stub
-#define _FileOutLocking_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/FilterStream/FilterStream.cpp b/autotest/FilterStream/FilterStream.cpp
index 58c0111c5..da98edaa4 100644
--- a/autotest/FilterStream/FilterStream.cpp
+++ b/autotest/FilterStream/FilterStream.cpp
@@ -4,6 +4,8 @@ using namespace Upp;
 
 CONSOLE_APP_MAIN
 {
+	StdLogSetup(LOG_COUT|LOG_FILE);
+
 	{
 		HttpRequest http("www.ultimatepp.org");
 		InFilterStream in;
@@ -55,4 +57,6 @@ CONSOLE_APP_MAIN
 		ASSERT(in.Get() < 0);
 		ASSERT(in.IsEof());	
 	}
+	
+	LOG("=========== OK");
 }
diff --git a/autotest/FormatUnsafe/FormatUnsafe.cpp b/autotest/FormatUnsafe/FormatUnsafe.cpp
index 2ca74f39f..9633b36f0 100644
--- a/autotest/FormatUnsafe/FormatUnsafe.cpp
+++ b/autotest/FormatUnsafe/FormatUnsafe.cpp
@@ -2,6 +2,12 @@
 
 using namespace Upp;
 
+#ifdef flagAUTOTEST
+#define N 1000
+#else
+#define N 100000000
+#endif
+
 CONSOLE_APP_MAIN
 {
 	StdLogSetup(LOG_COUT|LOG_FILE);
@@ -13,7 +19,8 @@ CONSOLE_APP_MAIN
 	for(int i = 32; i < 128; i++)
 		if(IsAlpha(i) || IsDigit(i))
 			rndset.Cat(i);
-	for(;;) {
+	SeedRandom();
+	for(int i = 0; i < N; i++) {
 		String fmtstr;
 		while(Random(20))
 			fmtstr << (char)rndset[Random(rndset.GetCount())];
@@ -38,4 +45,6 @@ CONSOLE_APP_MAIN
 		DUMPC(v);
 		DUMP(NFormat(fmtstr, v));
 	}
+	
+	LOG("============ OK");
 }
diff --git a/autotest/StringStream/StringStream.cpp b/autotest/StringStream/StringStream.cpp
index 77c8b4e7e..8470da448 100644
--- a/autotest/StringStream/StringStream.cpp
+++ b/autotest/StringStream/StringStream.cpp
@@ -2,6 +2,12 @@
 
 using namespace Upp;
 
+#ifdef flagAUTOTEST
+#define N 1000000
+#else
+#define N 100000000
+#endif
+
 String RandomString(int n)
 {
 	String h;
@@ -32,4 +38,6 @@ CONSOLE_APP_MAIN
 		}
 //		LOGHEXDUMP(es, es.GetCount());
 	}
+	
+	LOG("========= OK");
 }
diff --git a/autotest/Witz/etalon b/autotest/Witz/etalon
index 654561d54..1ccf11a7f 100644
--- a/autotest/Witz/etalon
+++ b/autotest/Witz/etalon
@@ -1,17 +1,18 @@
-first value
-second value
-1
-Hello
-
-
-<title>Skylark test</title>
-#
-Skylark test
-#TITLE
-#TITLE2
-##
-##
-<h1>Skylark test</h1>
-some text
-[ Skylark test Skylark test #NESTED ]
-#aafe45
\ No newline at end of file
+first value
+
+1
+Hello
+
+
+<title>Skylark test</title>
+#
+Skylark test
+#TITLE
+#TITLE2
+##
+##
+<h1>Skylark test</h1>
+some text
+[ Skylark test Skylark test #NESTED ]
+#aafe45
+
diff --git a/autotest/Witz/main.cpp b/autotest/Witz/main.cpp
index 094c12d6f..4f56c5921 100644
--- a/autotest/Witz/main.cpp
+++ b/autotest/Witz/main.cpp
@@ -31,11 +31,8 @@ struct MyApp : SkylarkApp {
 
 CONSOLE_APP_MAIN
 {
-#ifdef _DEBUG
 	StdLogSetup(LOG_FILE|LOG_COUT);
 	Ini::skylark_log = true;
-#endif
-
 
 	MyApp app;
 
@@ -58,5 +55,7 @@ CONSOLE_APP_MAIN
 	LOG("------------");
 	LOG(result);
 	LOG("------------");
-//	app.Run();	
+//	SaveFile(GetDataFile("etalon"), result);
+	ASSERT(result == LoadFile(GetDataFile("etalon")));
+	LOG("========== OK");
 }