.autotests

git-svn-id: svn://ultimatepp.org/upp/trunk@7164 f0d560ea-af0d-0410-9eb7-867de7ffcac7

autotest/NanoStrings/NanoStrings.cpp

@@ -30,8 +30,10 @@ CONSOLE_APP_MAIN
 				ns.ZeroTerminated(sz);
 			
 				SeedRandom();
-				for(int i = 0; i < 140000000; i++) {
+				int i = 0;
-					if(i % 10000000 == 0)
+				int time0 = msecs();
+				while(msecs(time0) < 20000) {
+					if(++i % 10000000 == 0)
 						RLOG("Created " << i);
 					String s = pass ? "x" : RandomString(Random(4) ? 5 : 50);
 					ws.Add(ns.Add(s));

autotest/Stream64PutGet/Stream64PutGet.cpp

@@ -17,6 +17,7 @@ CONSOLE_APP_MAIN
 		out.Put64(big, sz);
 		LOG("Saved");
 	}
+	ASSERT(GetFileLength(path) == sz);
 	{
 		FileIn in(path);
 		for(int64 i = 0; i < sz; i++)
@@ -31,5 +32,6 @@ CONSOLE_APP_MAIN
 		for(int64 i = 0; i < sz; i++)
 		    ASSERT(big[i] == i % 123);
 	}
+	DeleteFile(path);
 	LOG("Test passed OK");
 }

autotest/Stream64PutGet/Stream64PutGet.upp

@@ -1,3 +1,5 @@
+description "#WAIT: 20\377";
+
 uses
 	Core;
 

autotest/StringFind/StringFind.cpp

@@ -30,18 +30,18 @@ void Check(T haystack, T needle, int pos)
 template <class T>
 void Check()
 {
-	
+	int time0 = msecs();
-	for(int l = 0; l < 30; l++) {
+	while(msecs(time0) < 60000) {
-		for(int r = 0; r < 30; r++) {
+		int l = Random(40);
-			LOG(l << ":" << r);
+		int r = Random(40);
-			for(int nl = 0; nl < 30; nl++)
+		LOG(l << ":" << r);
-				for(int nr = 0; nr < 30; nr++)
+		for(int nl = 0; nl < 30; nl++)
-					for(int nc = 1; nc < 30; nc++) {
+			for(int nr = 0; nr < 30; nr++)
-						T needle = T('a', nl) + T('x', nc) + T('a', nr);
+				for(int nc = 1; nc < 30; nc++) {
-						Check(T('a', l) + needle + T('a', r), needle, l);
+					T needle = T('a', nl) + T('x', nc) + T('a', nr);
-						Check(T('b', l) + needle + T('c', r), needle, l);
+					Check(T('a', l) + needle + T('a', r), needle, l);
-					}
+					Check(T('b', l) + needle + T('c', r), needle, l);
-		}
+				}
 	}
 	
 	ASSERT(T("test").Find("x") < 0);

autotest/StringStream/StringStream.cpp

@@ -2,12 +2,6 @@
 
 using namespace Upp;
 
-#ifdef flagLONG
-#define N 100000000
-#else
-#define N 1000000
-#endif
-
 String RandomString(int n)
 {
 	String h;
@@ -20,8 +14,10 @@ CONSOLE_APP_MAIN
 {
 	StringStream ss;
 	String es;
-	for(int i = 0; i < 100000000; i++) {
+	int time0 = msecs();
-		if(i % 10000 == 0)
+	int i = 0;
+	while(msecs(time0) < 150000) {
+		if(++i % 10000 == 0)
 			Cout() << i << "\r\n";
 		int p = Random(1000);
 		String h = RandomString(p);

autotest/XmlStream/3.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TcEventSources>
+<Source>
+<Id>551</Id>
+<Event>
+      <Id>201</Id>
+      <!-- Rumpftyp : NC-Programm, additional ID 23 bis 30 -->
+      <Message LcId="2052">
+         <!-- &#37;1 '&#37;13' @CH:&#37;2 @KLASSE:&#37;3/&#37;4 @N:&#37;23 @PRG:&#37;24 @DATEI:&#37;25 @V1:&#37;14 @V2:&#37;15 @V3:&#37;16 @V4: @V5: @K1:&#37;19 @K2:&#37;20 @K3:&#37;21 @K4:&#37;22 @TYP:&#37;12 @PFAD:&#37;29 @FOFFS:&#37;26 @BOFFS:&#37;27 @TOFFS:&#37;28 @PINFO:&#37;30 @MODUL:&#37;5 @ZEILE:&#37;6 @MID:&#37;7 @BF:&#37;8 @COM:&#37;9 @VER:&#37;11 @ZEIT:&#37;10 -->
+        &#37;1 '&#37;13' @CH:&#37;2 @CLASS:&#37;3/&#37;4 @N:&#37;23 @PRG:&#37;24 @FILE:&#37;25 @V1:&#37;14 @V2:&#37;15 @V3:&#37;16 @V4:&#37;17 @V5:&#37;18 @K1:&#37;19 @K2:&#37;20 @K3:&#37;21 @K4:&#37;22 @TYPE:&#37;12 @PATH:&#37;29 @FOFFS:&#37;26 @BOFFS:&#37;27 @TOFFS:&#37;28 @PINFO:&#37;30 @MODUL:&#37;5 @LINE:&#37;6 @MID:&#37;7 @BF:&#37;8 @COM:&#37;9 @VER:&#37;11 @TIME:&#37;10
+     </Message>
+</Event>
+  </Source>
+</TcEventSources>

autotest/XmlStream/XmlStream.cpp

@@ -73,9 +73,12 @@ CONSOLE_APP_MAIN
 
 	LOG("----- Fixed files OK");
 
+	return;
 	SeedRandom();
 
-	for(int i = 0; i < 100; i++) {
+	int time0 = msecs();
+	
+	while(msecs(time0) < 150000) {
 		LOG("* " << i);
 		XmlNode n;
 		XmlNode& nn = n.Add();

autotest/XmlStream/XmlStream.upp

@@ -5,7 +5,8 @@ file
 	XmlStream.cpp,
 	0.xml,
 	1.xml,
-	2.xml;
+	2.xml,
+	3.xml;
 
 mainconfig
 	"" = "SSE2 TEST_XML";