Skip to content

Commit 8f47732

Browse files
bordoleybordoley
committed
remove old orm tests, reorged tests so that they can be used in a pcl for android and ios.
1 parent 7e0a44d commit 8f47732

19 files changed

Lines changed: 248 additions & 726 deletions

‎SQLitePCL.pretty.sln‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLitePCL.pretty.Async", "S
1414
EndProject
1515
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLitePCL.pretty.Orm", "SQLitePCL.pretty.Orm\SQLitePCL.pretty.Orm.csproj", "{82EF24A8-7B24-42AA-BDB9-7A9F7527DF48}"
1616
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLitePCL.pretty.tests.Mac", "SQLitePCL.pretty.tests\SQLitePCL.pretty.tests.Mac.csproj", "{5704A5E4-ED39-4D42-915E-A25F84B076C1}"
17+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLitePCL.pretty.tests.Android", "SQLitePCL.pretty.tests.Android\SQLitePCL.pretty.tests.Android.csproj", "{A3278FF6-0B65-482E-AE3E-7AEF33C4F25C}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLitePCL.pretty.tests.Android", "SQLitePCL.pretty.tests\SQLitePCL.pretty.tests.Android.csproj", "{A3278FF6-0B65-482E-AE3E-7AEF33C4F25C}"
19+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLitePCL.pretty.Tests", "SQLitePCL.pretty.Tests\SQLitePCL.pretty.Tests.csproj", "{3C8B2558-E287-4031-8597-14480A15ED0E}"
2020
EndProject
2121
Global
2222
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -28,6 +28,18 @@ Global
2828
Release|x86 = Release|x86
2929
EndGlobalSection
3030
GlobalSection(ProjectConfigurationPlatforms) = postSolution
31+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
33+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
34+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
35+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Debug|x86.ActiveCfg = Debug|Any CPU
36+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Debug|x86.Build.0 = Debug|Any CPU
37+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
38+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Release|Any CPU.Build.0 = Release|Any CPU
39+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
40+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
41+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Release|x86.ActiveCfg = Release|Any CPU
42+
{3C8B2558-E287-4031-8597-14480A15ED0E}.Release|x86.Build.0 = Release|Any CPU
3143
{467AB566-4D9E-4D9E-BB28-8167E6F2A239}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3244
{467AB566-4D9E-4D9E-BB28-8167E6F2A239}.Debug|Any CPU.Build.0 = Debug|Any CPU
3345
{467AB566-4D9E-4D9E-BB28-8167E6F2A239}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
@@ -40,18 +52,6 @@ Global
4052
{467AB566-4D9E-4D9E-BB28-8167E6F2A239}.Release|Mixed Platforms.Build.0 = Release|x86
4153
{467AB566-4D9E-4D9E-BB28-8167E6F2A239}.Release|x86.ActiveCfg = Release|x86
4254
{467AB566-4D9E-4D9E-BB28-8167E6F2A239}.Release|x86.Build.0 = Release|x86
43-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
46-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
47-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Debug|x86.ActiveCfg = Debug|Any CPU
48-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Debug|x86.Build.0 = Debug|Any CPU
49-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
50-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Release|Any CPU.Build.0 = Release|Any CPU
51-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
52-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
53-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Release|x86.ActiveCfg = Release|Any CPU
54-
{5704A5E4-ED39-4D42-915E-A25F84B076C1}.Release|x86.Build.0 = Release|Any CPU
5555
{82EF24A8-7B24-42AA-BDB9-7A9F7527DF48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5656
{82EF24A8-7B24-42AA-BDB9-7A9F7527DF48}.Debug|Any CPU.Build.0 = Debug|Any CPU
5757
{82EF24A8-7B24-42AA-BDB9-7A9F7527DF48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

SQLitePCL.pretty.tests/MainActivity.cs renamed to SQLitePCL.pretty.tests.Android/MainActivity.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,7 @@ public class MainActivity : RunnerActivity
1818

1919
protected override void OnCreate(Bundle bundle)
2020
{
21-
// tests can be inside the main assembly
22-
AddTestAssembly(Assembly.GetExecutingAssembly());
23-
24-
AddExecutionAssembly(typeof(ExtensibilityPointFactory).Assembly);
25-
// or in any reference assemblies
26-
27-
//AddTestAssembly(typeof(PortableTests).Assembly);
21+
AddTestAssembly(typeof(SQLitePCL.pretty.tests.SQLiteDatabaseConnectionTests).Assembly);
2822
// or in any assembly that you load (since JIT is available)
2923

3024
#if false

SQLitePCL.pretty.tests/Properties/AndroidManifest.xml renamed to SQLitePCL.pretty.tests.Android/Properties/AndroidManifest.xml

File renamed without changes.

‎SQLitePCL.pretty.tests.Android/Properties/AssemblyInfo.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using Android.App;
4+
5+
// Information about this assembly is defined by the following attributes.
6+
// Change them to the values specific to your project.
7+
8+
[assembly: AssemblyTitle("SQLitePCL.pretty.tests")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("")]
13+
[assembly: AssemblyCopyright("dave")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]

SQLitePCL.pretty.tests/SQLitePCL.pretty.tests.Android.csproj renamed to SQLitePCL.pretty.tests.Android/SQLitePCL.pretty.tests.Android.csproj

Lines changed: 33 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
1414
<AndroidApplication>True</AndroidApplication>
1515
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
16-
<AssemblyName>SQLitePCL.pretty.tests</AssemblyName>
16+
<AssemblyName>SQLitePCL.pretty.tests.Android</AssemblyName>
1717
<TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
1818
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1919
</PropertyGroup>
@@ -42,12 +42,36 @@
4242
<Reference Include="System.Xml" />
4343
<Reference Include="System.Core" />
4444
<Reference Include="Mono.Android" />
45+
<Reference Include="System.Reactive.Core">
46+
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Core.dll</HintPath>
47+
</Reference>
48+
<Reference Include="System.Reactive.Interfaces">
49+
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Interfaces.dll</HintPath>
50+
</Reference>
51+
<Reference Include="System.Reactive.Linq">
52+
<HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Linq.dll</HintPath>
53+
</Reference>
54+
<Reference Include="System.Reactive.PlatformServices">
55+
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.PlatformServices.dll</HintPath>
56+
</Reference>
57+
<Reference Include="SQLitePCL.raw">
58+
<HintPath>..\packages\SQLitePCL.raw.0.8.0-pre2\build\MonoAndroid\pinvoke_packaged_sqlite3\anycpu\SQLitePCL.raw.dll</HintPath>
59+
</Reference>
60+
<Reference Include="xunit.abstractions">
61+
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
62+
</Reference>
63+
<Reference Include="xunit.core">
64+
<HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
65+
</Reference>
4566
<Reference Include="xunit.execution.MonoAndroid">
4667
<HintPath>..\packages\xunit.extensibility.execution.2.0.0\lib\monoandroid\xunit.execution.MonoAndroid.dll</HintPath>
4768
</Reference>
4869
<Reference Include="xunit.runner.utility.MonoAndroid">
4970
<HintPath>..\packages\xunit.runner.utility.2.0.0\lib\monoandroid\xunit.runner.utility.MonoAndroid.dll</HintPath>
5071
</Reference>
72+
<Reference Include="xunit.assert">
73+
<HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
74+
</Reference>
5175
<Reference Include="Xamarin.Android.Support.v4">
5276
<HintPath>..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
5377
</Reference>
@@ -66,54 +90,10 @@
6690
<Reference Include="xunit.runner.devices">
6791
<HintPath>..\packages\xunit.runner.devices.1.0.0\lib\MonoAndroid\xunit.runner.devices.dll</HintPath>
6892
</Reference>
69-
<Reference Include="System.Reactive.Core">
70-
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Core.dll</HintPath>
71-
</Reference>
72-
<Reference Include="System.Reactive.Interfaces">
73-
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Interfaces.dll</HintPath>
74-
</Reference>
75-
<Reference Include="System.Reactive.Linq">
76-
<HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Linq.dll</HintPath>
77-
</Reference>
78-
<Reference Include="System.Reactive.PlatformServices">
79-
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.PlatformServices.dll</HintPath>
80-
</Reference>
81-
<Reference Include="xunit.abstractions">
82-
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
83-
</Reference>
84-
<Reference Include="xunit.core">
85-
<HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
86-
</Reference>
87-
<Reference Include="xunit.assert">
88-
<HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
89-
</Reference>
90-
<Reference Include="SQLitePCL.raw">
91-
<HintPath>..\packages\SQLitePCL.raw.0.8.0-pre2\build\MonoAndroid\pinvoke_packaged_sqlite3\anycpu\SQLitePCL.raw.dll</HintPath>
92-
</Reference>
9393
</ItemGroup>
9494
<ItemGroup>
95-
<Compile Include="Resources\Resource.designer.cs" />
9695
<Compile Include="Properties\AssemblyInfo.cs" />
9796
<Compile Include="MainActivity.cs" />
98-
<Compile Include="ColumnInfoTests.cs" />
99-
<Compile Include="DatabaseConnectionTests.cs" />
100-
<Compile Include="Example.cs" />
101-
<Compile Include="ImplementationTests.cs" />
102-
<Compile Include="prettyTests.cs" />
103-
<Compile Include="ResultSet.cs" />
104-
<Compile Include="SQLite3Tests.cs" />
105-
<Compile Include="SQLiteValueTests.cs" />
106-
<Compile Include="SQLiteVersionTests.cs" />
107-
<Compile Include="TableColumnMetadataTests.cs" />
108-
<Compile Include="AsyncTests\AsyncBlobStreamTests.cs" />
109-
<Compile Include="AsyncTests\AsyncDatabaseConnectionTests.cs" />
110-
<Compile Include="AsyncTests\AsyncStatementTests.cs" />
111-
<Compile Include="AsyncTests\ResultSet.cs" />
112-
<Compile Include="OrmTests\QueryTests.Joins.cs" />
113-
<Compile Include="OrmTests\QueryTests.cs" />
114-
<Compile Include="OrmTests\TableMappingTest.Async.cs" />
115-
<Compile Include="OrmTests\TableMappingTests.Create.cs" />
116-
<Compile Include="OrmTests\TableMappingTests.Sync.cs" />
11797
</ItemGroup>
11898
<ItemGroup>
11999
<None Include="Properties\AndroidManifest.xml" />
@@ -123,10 +103,7 @@
123103
<Import Project="..\packages\Xamarin.Forms.1.4.0.6341\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.4.0.6341\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
124104
<Import Project="..\packages\xunit.runner.devices.1.0.0\build\MonoAndroid\xunit.runner.devices.targets" Condition="Exists('..\packages\xunit.runner.devices.1.0.0\build\MonoAndroid\xunit.runner.devices.targets')" />
125105
<Import Project="..\packages\SQLitePCL.raw.0.8.0-pre2\build\MonoAndroid\SQLitePCL.raw.targets" Condition="Exists('..\packages\SQLitePCL.raw.0.8.0-pre2\build\MonoAndroid\SQLitePCL.raw.targets')" />
126-
<ItemGroup>
127-
<Folder Include="AsyncTests\" />
128-
<Folder Include="OrmTests\" />
129-
</ItemGroup>
106+
<Import Project="..\packages\xunit.core.2.0.0\build\monoandroid\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\monoandroid\xunit.core.props')" />
130107
<ItemGroup>
131108
<ProjectReference Include="..\SQLitePCL.pretty\SQLitePCL.pretty.csproj">
132109
<Project>{C6743D26-E16E-41CA-A757-72BE2D7EAF28}</Project>
@@ -140,5 +117,12 @@
140117
<Project>{82EF24A8-7B24-42AA-BDB9-7A9F7527DF48}</Project>
141118
<Name>SQLitePCL.pretty.Orm</Name>
142119
</ProjectReference>
120+
<ProjectReference Include="..\SQLitePCL.pretty.Tests\SQLitePCL.pretty.Tests.csproj">
121+
<Project>{3C8B2558-E287-4031-8597-14480A15ED0E}</Project>
122+
<Name>SQLitePCL.pretty.Tests</Name>
123+
</ProjectReference>
124+
</ItemGroup>
125+
<ItemGroup>
126+
<Folder Include="Resources\" />
143127
</ItemGroup>
144128
</Project>

‎SQLitePCL.pretty.tests.Android/packages.config‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="SQLitePCL.raw" version="0.8.0-pre2" targetFramework="net45" />
4+
<package id="Xamarin.Android.Support.v4" version="21.0.3.0" targetFramework="MonoAndroid44" />
5+
<package id="Xamarin.Forms" version="1.4.0.6341" targetFramework="MonoAndroid44" />
6+
<package id="xunit" version="2.0.0" targetFramework="MonoAndroid44" />
7+
<package id="xunit.abstractions" version="2.0.0" targetFramework="MonoAndroid44" />
8+
<package id="xunit.assert" version="2.0.0" targetFramework="MonoAndroid44" />
9+
<package id="xunit.core" version="2.0.0" targetFramework="MonoAndroid44" />
10+
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="MonoAndroid44" />
11+
<package id="xunit.extensibility.execution" version="2.0.0" targetFramework="MonoAndroid44" />
12+
<package id="xunit.runner.devices" version="1.0.0" targetFramework="MonoAndroid44" />
13+
<package id="xunit.runner.utility" version="2.0.0" targetFramework="MonoAndroid44" />
14+
</packages>

‎SQLitePCL.pretty.tests/AsyncTests/ResultSet.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public async Task TestScalarsAsync()
7575

7676
var blob = Encoding.UTF8.GetBytes("ab");
7777
var resultBlob = await db.Query("SELECT ?", blob).SelectScalarBlob().FirstAsync();
78-
Assert.Equal(Encoding.UTF8.GetString(resultBlob), "ab");
78+
Assert.Equal(Encoding.UTF8.GetString(resultBlob, 0, resultBlob.Length), "ab");
7979
}
8080
}
8181
}

‎SQLitePCL.pretty.tests/DatabaseConnectionTests.cs‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ namespace SQLitePCL.pretty.tests
2525
{
2626
public class SQLiteDatabaseConnectionTests
2727
{
28+
private static string GetTempFile()
29+
{
30+
using (var db = SQLite3.OpenInMemory())
31+
{
32+
return "tmp" + db.Query("SELECT lower(hex(randomblob(16)));").SelectScalarString().First();
33+
}
34+
}
35+
2836
[Fact]
2937
public void TestFinalize()
3038
{
@@ -289,6 +297,8 @@ public void TestStatements()
289297
}
290298
}
291299

300+
// FIXME: This test creates a file which isn't PCL friendly. Need to update.
301+
292302
[Fact]
293303
public void TestTryGetFileName()
294304
{
@@ -302,16 +312,16 @@ public void TestTryGetFileName()
302312
Assert.Throws<InvalidOperationException>(() => db.GetFileName("main"));
303313
}
304314

305-
var tempFile = Path.GetTempFileName();
315+
var tempFile = GetTempFile();
306316
using (var db = SQLite3.Open(tempFile))
307317
{
308318
db.Execute("CREATE TABLE foo (x int);");
309319
string filename = null;
310320
Assert.True(db.TryGetFileName("main", out filename));
311-
Assert.Equal(tempFile, filename);
321+
Assert.True(filename.EndsWith(tempFile));
312322
Assert.Equal(db.GetFileName("main"), filename);
313323
}
314-
File.Delete(tempFile);
324+
raw.sqlite3__vfs__delete(null, tempFile, 1);
315325
}
316326

317327
[Fact]
@@ -607,7 +617,7 @@ public void TestRegisterScalarFunc()
607617
[Fact]
608618
public void TestWalCheckpoint()
609619
{
610-
var tmpFile = Path.GetTempFileName();
620+
var tmpFile = GetTempFile();
611621
using (var db = SQLite3.Open(tmpFile))
612622
{
613623
db.Execute("PRAGMA journal_mode=WAL;");

0 commit comments

Comments
 (0)