Skip to content

Commit f960653

Browse files
ddobrevddobrev
committed
Fixed several incorrectly written tests.
Signed-off-by: Dimitar Dobrev <[email protected]>
1 parent 38a530e commit f960653

File tree

3 files changed

+47
-56
lines changed

3 files changed

+47
-56
lines changed

‎QtSharp.Tests/Manual/QtCore/IO/QFileInfoTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ public void TestGroup()
247247
[Test]
248248
public void TestGroupId()
249249
{
250-
var q = (uint)_fileInfo.GroupId;
250+
var q = this._fileInfo.GroupId;
251251

252-
Assert.AreEqual(-2, q);
252+
Assert.AreEqual(unchecked((uint) -2), q);
253253
}
254254

255255
[Test]
@@ -342,7 +342,7 @@ public void TestIsRoot()
342342
[Test]
343343
public void TestIsSymLink()
344344
{
345-
var file = new QFileInfo("./TestData/DoubleExtensionVerknüpfung.Ink");
345+
var file = new QFileInfo("./TestData/DoubleExtensionVerknüpfung.lnk");
346346

347347
Assert.IsTrue(file.IsSymLink);
348348
}
@@ -470,7 +470,7 @@ public void TestSwap()
470470
[Test]
471471
public void TestSymLinkTarget()
472472
{
473-
var file = new QFileInfo("./TestData/DoubleExtensionVerknüpfung.Ink");
473+
var file = new QFileInfo("./TestData/DoubleExtensionVerknüpfung.lnk");
474474
var target = file.SymLinkTarget;
475475

476476
Assert.AreNotEqual("", target);

‎QtSharp.Tests/Manual/QtCore/Tools/QStringRefTests.cs

+17-49
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ public void TestAppendToStringToQString()
8282

8383
var appended = old.AppendTo(app);
8484

85-
var q = appended.ToString();
85+
var q = appended.String;
8686

87-
var exp = this._testString + app;
87+
var exp = app + this._testString;
8888

8989
Assert.AreEqual(exp, q);
9090
}
@@ -94,12 +94,12 @@ public void TestAppendToStringToQString()
9494
[Test]
9595
public void TestAtToGetQChar()
9696
{
97-
for (var j = 0; j < _testString.Count(); j++)
97+
for (var j = 0; j < this._testString.Length; j++)
9898
{
9999
char net = _testString.ElementAt(0);
100100
QChar q = _qString.At(0);
101101

102-
Assert.AreEqual(net.ToString(), q.ToString());
102+
Assert.AreEqual(net, q.ToLatin1());
103103
}
104104
}
105105
#endregion
@@ -442,9 +442,9 @@ public void TestCountWithQCharArgsCaseInsensitive()
442442
{
443443
var r = new Random();
444444
var rx = r.Next(0, _testString.Count());
445-
var charac = _testString.ElementAt(rx);
445+
var charac = char.ToLowerInvariant(_testString.ElementAt(rx));
446446

447-
var net = Regex.Matches(_testString, @charac.ToString(), RegexOptions.IgnoreCase).Count;
447+
var net = _testString.Count(c => char.ToLowerInvariant(c) == charac);
448448

449449
var qchar = new QChar(charac);
450450
var q = _qString.Count(qchar, CaseSensitivity.CaseInsensitive);
@@ -499,10 +499,10 @@ public void TestCountWithStringArgsCaseSensitive()
499499
public void TestCountWithQStringRefArgsCaseInsensitive()
500500
{
501501
var r = new Random();
502-
var rx = r.Next(0, _testString.Count());
503-
var charac = _testString.ElementAt(rx);
502+
var rx = r.Next(0, this._testString.Length);
503+
var charac = char.ToLowerInvariant(_testString.ElementAt(rx));
504504

505-
var net = Regex.Matches(_testString, @charac.ToString(), RegexOptions.IgnoreCase).Count;
505+
var net = _testString.Count(c => char.ToLowerInvariant(c) == charac);
506506

507507
var qs = new QStringRef(charac.ToString());
508508

@@ -877,7 +877,7 @@ public void TestRight()
877877
var qString1 = new QStringRef(netString1);
878878

879879
var subNet = netString1.Substring(netString1.Length - 5);
880-
var subQ = qString1.Right(netString1.Length - 5);
880+
var subQ = qString1.Right(5);
881881

882882
Assert.AreEqual(subNet, subQ.ToString());
883883
}
@@ -1108,7 +1108,7 @@ public void TestEqual_QStringRef_StringOperator()
11081108
{
11091109
var s = _qString;
11101110

1111-
Assert.AreEqual(s, _testString);
1111+
Assert.IsTrue(s == _testString);
11121112
}
11131113

11141114
[Test]
@@ -1117,14 +1117,14 @@ public void TestNotEqual_QString_QLatin1StringOperator()
11171117
var s = _qString;
11181118
var s2 = new QLatin1String(_testString);
11191119

1120-
Assert.AreNotEqual(s, s2);
1120+
Assert.IsTrue(s != s2);
11211121
}
11221122

11231123
[Test]
11241124
public void TestNotEqual_QStringRef_QStringRefOperator()
11251125
{
11261126
var s = _qString;
1127-
var s2 = new QStringRef(_testString);
1127+
var s2 = new QStringRef(_testString + "a");
11281128

11291129
Assert.AreNotEqual(s, s2);
11301130
}
@@ -1143,15 +1143,7 @@ public void TestGreaterOperator()
11431143
var s = new QStringRef(_testString);
11441144
var s2 = new QStringRef(_testString.ToUpper());
11451145

1146-
var netComp = _testString.CompareTo(_testString.ToUpper());
1147-
1148-
var net = false || netComp > 0;
1149-
1150-
var q = s > s2;
1151-
1152-
//Assert.Greater(s, s2);
1153-
1154-
Assert.AreEqual(net, q);
1146+
Assert.IsTrue(s > s2);
11551147
}
11561148

11571149
[Test]
@@ -1160,15 +1152,7 @@ public void TestGreaterEqualOperator()
11601152
var s = new QStringRef(_testString);
11611153
var s2 = new QStringRef(_testString.ToUpper());
11621154

1163-
var netComp = _testString.CompareTo(_testString.ToUpper());
1164-
1165-
bool net = netComp >= 0;
1166-
1167-
var q = s >= s2;
1168-
1169-
//Assert.GreaterOrEqual(s, s2);
1170-
1171-
Assert.AreEqual(net, q);
1155+
Assert.IsTrue(s >= s2);
11721156
}
11731157

11741158
[Test]
@@ -1177,15 +1161,7 @@ public void TestLessOperator()
11771161
var s = new QStringRef(_testString);
11781162
var s2 = new QStringRef(_testString.ToUpper());
11791163

1180-
var netComp = _testString.CompareTo(_testString.ToUpper());
1181-
1182-
var net = false || netComp < 0;
1183-
1184-
var q = s < s2;
1185-
1186-
//Assert.Less(s, s2);
1187-
1188-
Assert.AreEqual(net, q);
1164+
Assert.IsTrue(s2 < s);
11891165
}
11901166

11911167
[Test]
@@ -1194,15 +1170,7 @@ public void TestLessEqualOperator()
11941170
var s = new QStringRef(_testString);
11951171
var s2 = new QStringRef(_testString.ToUpper());
11961172

1197-
var netComp = _testString.CompareTo(_testString.ToUpper());
1198-
1199-
bool net = netComp <= 0;
1200-
1201-
var q = s <= s2;
1202-
1203-
//Assert.LessOrEqual(s, s2);
1204-
1205-
Assert.AreEqual(net, q);
1173+
Assert.IsTrue(s2 <= s);
12061174
}
12071175

12081176
#endregion

‎QtSharp.Tests/QtSharp.Tests.csproj

+26-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{5E8F503D-1B37-4298-855D-06F81B5B4630}</ProjectGuid>
8-
<OutputType>Exe</OutputType>
8+
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>QtSharp.Tests</RootNamespace>
1111
<AssemblyName>QtSharp.Tests</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15-
<NoWin32Manifest>False</NoWin32Manifest>
1615
</PropertyGroup>
1716
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1817
<DebugSymbols>true</DebugSymbols>
@@ -37,7 +36,30 @@
3736
<PropertyGroup>
3837
<StartupObject />
3938
</PropertyGroup>
39+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
40+
<DebugSymbols>true</DebugSymbols>
41+
<OutputPath>bin\x86\Debug\</OutputPath>
42+
<DefineConstants>DEBUG;TRACE</DefineConstants>
43+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
44+
<DebugType>full</DebugType>
45+
<PlatformTarget>x86</PlatformTarget>
46+
<ErrorReport>prompt</ErrorReport>
47+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
50+
<OutputPath>bin\x86\Release\</OutputPath>
51+
<DefineConstants>TRACE</DefineConstants>
52+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
53+
<Optimize>true</Optimize>
54+
<DebugType>pdbonly</DebugType>
55+
<PlatformTarget>x86</PlatformTarget>
56+
<ErrorReport>prompt</ErrorReport>
57+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
58+
</PropertyGroup>
4059
<ItemGroup>
60+
<Reference Include="CppSharp.Runtime">
61+
<HintPath>..\References\CppSharp.Runtime.dll</HintPath>
62+
</Reference>
4163
<Reference Include="nunit.core">
4264
<HintPath>..\packages\NUnitTestAdapter.WithFramework.1.2\lib\nunit.core.dll</HintPath>
4365
<Private>False</Private>
@@ -58,7 +80,8 @@
5880
<HintPath>..\packages\NUnitTestAdapter.WithFramework.1.2\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
5981
<Private>False</Private>
6082
</Reference>
61-
<Reference Include="QtCoreSharp">
83+
<Reference Include="QtCoreSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
84+
<SpecificVersion>False</SpecificVersion>
6285
<HintPath>..\QtSharp.CLI\bin\Debug\QtCoreSharp.dll</HintPath>
6386
</Reference>
6487
<Reference Include="System" />

0 commit comments

Comments
 (0)