From cb331ffcb9aa9df8109e02498080292e9950ce16 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 1 Apr 2014 19:26:49 +0000
Subject: [PATCH] .upptst fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@7122 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 upptst/String/String.upp               | 2 +-
 upptst/StringFind/StringFind.cpp       | 2 +-
 upptst/StringMethods/StringMethods.cpp | 2 --
 upptst/SvoValue/Raw.cpp                | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/upptst/String/String.upp b/upptst/String/String.upp
index 66f553859..8b2c3dd0e 100644
--- a/upptst/String/String.upp
+++ b/upptst/String/String.upp
@@ -5,5 +5,5 @@ file
 	String.cpp;
 
 mainconfig
-	"" = "EXPERIMENTAL";
+	"" = "";
 
diff --git a/upptst/StringFind/StringFind.cpp b/upptst/StringFind/StringFind.cpp
index eef68a3eb..c1e90d03b 100644
--- a/upptst/StringFind/StringFind.cpp
+++ b/upptst/StringFind/StringFind.cpp
@@ -60,7 +60,7 @@ void CheckReplace()
 	x.Replace("test", "run");
 	DUMP(x);
 	T y("Just another run");
-	ASSERT(x == T('_', 20) + y + T('_', 20) + y + T('_', 20));
+	ASSERT(x == T('_', 5) + y + T('_', 5) + y + T('_', 5));
 }
 
 
diff --git a/upptst/StringMethods/StringMethods.cpp b/upptst/StringMethods/StringMethods.cpp
index 0e2b566c5..b2cf173fa 100644
--- a/upptst/StringMethods/StringMethods.cpp
+++ b/upptst/StringMethods/StringMethods.cpp
@@ -96,8 +96,6 @@ void ATest()
 	ASSERT("xx" + x == Str("xxab"));
 	ASSERT(x + 'z' == Str("abz"));
 	ASSERT('z' + x == Str("zab"));
-	ASSERT(x + (int)'z' == Str("abz"));
-	ASSERT((int)'z' + x == Str("zab"));
 	Str xx = x;
 	Str bb = b;
 	Swap(b, x);
diff --git a/upptst/SvoValue/Raw.cpp b/upptst/SvoValue/Raw.cpp
index a25f83b84..4ce9f8853 100644
--- a/upptst/SvoValue/Raw.cpp
+++ b/upptst/SvoValue/Raw.cpp
@@ -13,7 +13,7 @@ void CheckRawPickValue()
 {
 	Vector<int> x;
 	x.Add(123);
-	Value v = RawPickToValue(x);
+	Value v = RawPickToValue(pick(x));
 	ASSERT(v.Is< Vector<int> >());
 	const Vector<int>& xx = v.To< Vector<int> >();
 	ASSERT(xx.GetCount() == 1);