Index: Src/SQLiteProvider.sln =================================================================== --- Src/SQLiteProvider.sln (revision 4434) +++ Src/SQLiteProvider.sln (working copy) @@ -17,6 +17,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpatialIndex", "SpatialIndex\SpatialIndex.vcproj", "{826398ED-29B3-4504-9683-ABC431AC5D21}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest\UnitTest.vcproj", "{D21428C0-F639-4410-9A29-421493E0F217}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -55,6 +57,12 @@ {826398ED-29B3-4504-9683-ABC431AC5D21}.Release|Win32.Build.0 = Release|Win32 {826398ED-29B3-4504-9683-ABC431AC5D21}.Release|x64.ActiveCfg = Release|x64 {826398ED-29B3-4504-9683-ABC431AC5D21}.Release|x64.Build.0 = Release|x64 + {D21428C0-F639-4410-9A29-421493E0F217}.Debug|Win32.ActiveCfg = Debug|Win32 + {D21428C0-F639-4410-9A29-421493E0F217}.Debug|x64.ActiveCfg = Debug|x64 + {D21428C0-F639-4410-9A29-421493E0F217}.Debug|x64.Build.0 = Debug|x64 + {D21428C0-F639-4410-9A29-421493E0F217}.Release|Win32.ActiveCfg = Release|Win32 + {D21428C0-F639-4410-9A29-421493E0F217}.Release|x64.ActiveCfg = Release|x64 + {D21428C0-F639-4410-9A29-421493E0F217}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Index: Src/UnitTest/ConnectionInfoTest.cpp =================================================================== --- Src/UnitTest/ConnectionInfoTest.cpp (revision 0) +++ Src/UnitTest/ConnectionInfoTest.cpp (revision 0) @@ -0,0 +1,281 @@ +// Copyright (C) 2004-2006 Autodesk, Inc. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of version 2.1 of the GNU Lesser +// General Public License as published by the Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +#include "stdafx.h" +#include "ConnectionInfoTest.h" + +#ifdef _WIN32 +const wchar_t* CI_TEST_FILE = L"..\\..\\TestData\\ConnectionInfoTest.db"; +#else +#include +const wchar_t* CI_TEST_FILE = L"../../TestData/ConnectionInfoTest.db"; +#endif + + +CPPUNIT_TEST_SUITE_REGISTRATION( ConnectionInfoTest ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ConnectionInfoTest, "ConnectionInfoTest"); + +ConnectionInfoTest::ConnectionInfoTest () +{ +} + +ConnectionInfoTest::~ConnectionInfoTest () +{ +} + +void ConnectionInfoTest::setUp () +{ +} + +// Test whether or not the provider type and its list of dependent files is +// reported. +void ConnectionInfoTest::TestProviderInfo () +{ + FdoPtr connection; + + printf("Checking for Provider Type and Dependent List Info \n"); + try { + connection = CreateDb(); + FdoPtr connectionInfo = connection->GetConnectionInfo(); + printf(" ...> Checking for Provider Type\n"); + FdoProviderDatastoreType providerType = connectionInfo->GetProviderDatastoreType(); + + switch (providerType) { + + case FdoProviderDatastoreType_DatabaseServer: + printf(" ......> Found: 'Database Server' (unexpected result)\n"); + throw FdoException::Create(L"Unexpected provider type 'Database Server' when expecting 'File'"); + break; + case FdoProviderDatastoreType_File: + printf(" ......> Found: 'File' (expected result)\n"); + break; + case FdoProviderDatastoreType_WebServer: + printf(" ......> Found: 'Web Server' (unexpected result)\n"); + throw FdoException::Create(L"Unexpected provider type 'Web Server' when expecting 'File'"); + break; + case FdoProviderDatastoreType_Unknown: + printf(" ......> Found: 'Unknown' (unexpected result)\n"); + throw FdoException::Create(L"Unexpected provider type 'Unknown' when expecting 'File'"); + break; + + } + + + + printf(" ...> Checking for list of dependent files\n"); + FdoPtr stringCollection = connectionInfo->GetDependentFileNames(); + if (stringCollection == NULL) + throw FdoException::Create(L"Unexpected empty list of dependent files"); + + FdoInt32 stringCollectionCount = stringCollection->GetCount(); + if (stringCollectionCount > 0) { + + for (FdoInt32 index = 0; index < stringCollectionCount; index++) { + + FdoPtr stringCollectionElement = stringCollection->GetItem(0); + FdoStringP dependentFileName = stringCollectionElement->GetString(); + printf(" ......> Found: '%ls'\n", (FdoString *) dependentFileName); + + } + + } + else + throw FdoException::Create(L"Unexpected empty list of dependent files"); + + connection->Close(); + + } + catch ( FdoException *e ) + { + connection->Close(); + printf( "Exception: %ls\n", e->GetExceptionMessage() ); + } +} + +FdoIConnection *ConnectionInfoTest::CreateDb() +{ + FdoIConnection *connection; + +#ifdef _WIN32 + wchar_t fullpath[1024]; + _wfullpath(fullpath, CI_TEST_FILE, 1024); +#else + char cpath[1024]; + char cfullpath[1024]; + wcstombs(cpath, CI_TEST_FILE, 1024); + realpath(cpath, cfullpath); + wchar_t fullpath[1024]; + mbstowcs(fullpath, cfullpath, 1024); +#endif + + size_t len = wcstombs(NULL, CI_TEST_FILE, 0); + char *mbsPath = new char[len+1]; + wcstombs(mbsPath, CI_TEST_FILE, len+1); + +#ifdef _WIN32 + SetFileAttributes(mbsPath, FILE_ATTRIBUTE_NORMAL); + DeleteFile(mbsPath); +#else + unlink(mbsPath); +#endif + + delete[] mbsPath; + FdoPtr manager = FdoFeatureAccessManager::GetConnectionManager (); + connection = manager->CreateConnection (L"OSGeo.SQLite"); + + //// Create DataStore + FdoPtr crdb = static_cast(connection->CreateCommand(FdoCommandType_CreateDataStore)); + FdoPtr dictionary = crdb->GetDataStoreProperties(); + + int count; + FdoString **names = dictionary->GetPropertyNames(count); + for (int i = 0; i < count; i++) + { + FdoString *name = names[i]; + if ( wcscmp( name, L"File" ) == 0 ) + dictionary->SetProperty( name, fullpath ); + } + crdb->Execute(); + + //// Connect + std::wstring connStr = std::wstring(L"File=") + std::wstring(fullpath); + connection->SetConnectionString(connStr.c_str()); + connection->Open(); + + //// Create Spatial Context + FdoPtr cscCmd = (FdoICreateSpatialContext *)connection->CreateCommand( FdoCommandType_CreateSpatialContext ); + + cscCmd->SetName(L"LL84"); + cscCmd->SetDescription(L"LL84 Spatial Context"); + cscCmd->SetCoordinateSystem(L"LL84"); + cscCmd->SetCoordinateSystemWkt(L"GEOGCS[\"LL84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.25722293287],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.0174532925199433]]"); + + FdoPtr gf = FdoFgfGeometryFactory::GetInstance(); + FdoPtr env = gf->CreateEnvelopeXY(-180, -90, 180, 90); + FdoPtr geom = gf->CreateGeometry(env); + FdoPtr ext = gf->GetFgf( geom ); + cscCmd->SetExtent( ext ); + cscCmd->SetXYTolerance(0.001); + cscCmd->SetZTolerance(0.001); + + cscCmd->Execute(); + + //// Create Schema + FdoFeatureSchemaP pSchema = FdoFeatureSchema::Create( L"Schema1", L"AutoCAD schema" ); + + FdoFeatureClassP pClass1 = FdoFeatureClass::Create( L"Class1", L"AutoCAD entity base class" ); + FdoClassesP(pSchema->GetClasses())->Add(pClass1); + pClass1->SetIsAbstract(false); + + FdoDataPropertyP pProp = FdoDataPropertyDefinition::Create( L"FeatId", L"id" ); + pProp->SetDataType( FdoDataType_Int32 ); + pProp->SetNullable(false); + pProp->SetIsAutoGenerated(true); + FdoPropertiesP(pClass1->GetProperties())->Add( pProp ); + FdoDataPropertiesP(pClass1->GetIdentityProperties())->Add( pProp ); + + pProp = FdoDataPropertyDefinition::Create( L"Prop1", L"" ); + pProp->SetDataType( FdoDataType_Int32 ); + pProp->SetNullable(true); + FdoPropertiesP(pClass1->GetProperties())->Add( pProp ); + + pProp = FdoDataPropertyDefinition::Create( L"Prop2", L"" ); + pProp->SetDataType( FdoDataType_Int32 ); + pProp->SetNullable(true); + FdoPropertiesP(pClass1->GetProperties())->Add( pProp ); + + pProp = FdoDataPropertyDefinition::Create( L"Prop3", L"" ); + pProp->SetDataType( FdoDataType_Int32 ); + pProp->SetNullable(true); + FdoPropertiesP(pClass1->GetProperties())->Add( pProp ); + + FdoFeatureClassP pClass2 = FdoFeatureClass::Create( L"Class2", L"AutoCAD entity base class" ); + FdoClassesP(pSchema->GetClasses())->Add(pClass2); + pClass2->SetIsAbstract(false); + pClass2->SetBaseClass(pClass1); + + pProp = FdoDataPropertyDefinition::Create( L"Prop4", L"" ); + pProp->SetDataType( FdoDataType_Int32 ); + pProp->SetNullable(true); + FdoPropertiesP(pClass2->GetProperties())->Add( pProp ); + + pProp = FdoDataPropertyDefinition::Create( L"Prop5", L"" ); + pProp->SetDataType( FdoDataType_Int32 ); + pProp->SetNullable(true); + FdoPropertiesP(pClass2->GetProperties())->Add( pProp ); + + pProp = FdoDataPropertyDefinition::Create( L"Prop6", L"" ); + pProp->SetDataType( FdoDataType_Int32 ); + pProp->SetNullable(true); + FdoPropertiesP(pClass2->GetProperties())->Add( pProp ); + + FdoFeatureClassP pClass3 = FdoFeatureClass::Create( L"Class3", L"AutoCAD entity base class" ); + FdoClassesP(pSchema->GetClasses())->Add(pClass3); + pClass3->SetIsAbstract(false); + pClass3->SetBaseClass(pClass2); + + pProp = FdoDataPropertyDefinition::Create( L"Prop7", L"" ); + pProp->SetDataType( FdoDataType_Int32 ); + pProp->SetNullable(true); + FdoPropertiesP(pClass3->GetProperties())->Add( pProp ); + + pProp = FdoDataPropertyDefinition::Create( L"Prop8", L"" ); + pProp->SetDataType( FdoDataType_Int32 ); + pProp->SetNullable(true); + FdoPropertiesP(pClass3->GetProperties())->Add( pProp ); + + pProp = FdoDataPropertyDefinition::Create( L"Prop9", L"" ); + pProp->SetDataType( FdoDataType_Int32 ); + pProp->SetNullable(true); + FdoPropertiesP(pClass3->GetProperties())->Add( pProp ); + + FdoPtr pCmd = (FdoIApplySchema*) connection->CreateCommand(FdoCommandType_ApplySchema); + pCmd->SetFeatureSchema( pSchema ); + pCmd->Execute(); + + FdoPtr insertCommand = (FdoIInsert *) connection->CreateCommand(FdoCommandType_Insert); + insertCommand->SetFeatureClassName(L"Schema1:Class3"); + FdoPtr propertyValues = insertCommand->GetPropertyValues(); + FdoPtr dataValue; + FdoPtr propertyValue; + + dataValue = FdoDataValue::Create((FdoInt64) 1); + propertyValue = FdoPropertyValue::Create(); + propertyValue->SetName( L"Prop1" ); + propertyValues->Add( propertyValue ); + propertyValue->SetValue(dataValue); + + dataValue = FdoDataValue::Create((FdoInt64) 2); + propertyValue = FdoPropertyValue::Create(); + propertyValue->SetName( L"Prop2" ); + propertyValues->Add( propertyValue ); + propertyValue->SetValue(dataValue); + + dataValue = FdoDataValue::Create((FdoInt64) 3); + propertyValue = FdoPropertyValue::Create(); + propertyValue->SetName( L"Prop3" ); + propertyValues->Add( propertyValue ); + propertyValue->SetValue(dataValue); + + dataValue = FdoDataValue::Create((FdoInt64) 4); + propertyValue = FdoPropertyValue::Create(); + propertyValue->SetName( L"Prop4" ); + propertyValues->Add( propertyValue ); + propertyValue->SetValue(dataValue); + + FdoPtr reader = insertCommand->Execute(); + + return connection; +} Property changes on: Src\UnitTest\ConnectionInfoTest.cpp ___________________________________________________________________ Added: svn:eol-style + native Index: Src/UnitTest/ConnectionInfoTest.h =================================================================== --- Src/UnitTest/ConnectionInfoTest.h (revision 0) +++ Src/UnitTest/ConnectionInfoTest.h (revision 0) @@ -0,0 +1,54 @@ +// Copyright (C) 2004-2007 Autodesk, Inc. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of version 2.1 of the GNU Lesser +// General Public License as published by the Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +#ifndef _CONNECTIONINFOTEST_H_ +#define _CONNECTIONINFOTEST_H_ +#ifdef _WIN32 +#pragma once +#endif + +#ifndef CPP_UNIT_CONNECTIONINFOTEST_H +#define CPP_UNIT_CONNECTIONINFOTEST_H + +#include +#include +#include +#include + +/* + * Checks whether or not the provider type and list of dependent files + * are reported correctly. + */ + +class ConnectionInfoTest : public CppUnit::TestCase +{ + CPPUNIT_TEST_SUITE( ConnectionInfoTest ); + CPPUNIT_TEST( TestProviderInfo ); + CPPUNIT_TEST_SUITE_END(); + +public: + ConnectionInfoTest(); + virtual ~ConnectionInfoTest(); + void setUp(); + +protected: + void TestProviderInfo(); + +private: + FdoIConnection *CreateDb(); +}; + +#endif +#endif Property changes on: Src\UnitTest\ConnectionInfoTest.h ___________________________________________________________________ Added: svn:eol-style + native Index: Src/UnitTest/providers.xml =================================================================== --- Src/UnitTest/providers.xml (revision 0) +++ Src/UnitTest/providers.xml (revision 0) @@ -0,0 +1,12 @@ + + + + OSGeo.SQLite + OSGeo FDO Provider for SQLite + FDO Provider for SQLite + False + 3.4.0.0 + 3.4.0.0 + .\SQLiteProvider.dll + + Property changes on: Src\UnitTest\providers.xml ___________________________________________________________________ Added: svn:eol-style + native Index: Src/UnitTest/stdafx.cpp =================================================================== --- Src/UnitTest/stdafx.cpp (revision 0) +++ Src/UnitTest/stdafx.cpp (revision 0) @@ -0,0 +1,28 @@ +// Copyright (C) 2004-2006 Autodesk, Inc. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of version 2.1 of the GNU Lesser +// General Public License as published by the Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +#include "stdafx.h" + +// NOTE: Define __CPPUNIT_MFC_APP in order to have the CPPUNIT UI appear... +#ifdef __CPPUNIT_MFC_APP + #ifdef WIN32 + #ifdef _DEBUG + #pragma comment(lib, "testrunnerd.lib") + #else + #pragma comment(lib, "testrunner.lib") + #endif + #endif +#endif + Property changes on: Src\UnitTest\stdafx.cpp ___________________________________________________________________ Added: svn:eol-style + native Index: Src/UnitTest/stdafx.h =================================================================== --- Src/UnitTest/stdafx.h (revision 0) +++ Src/UnitTest/stdafx.h (revision 0) @@ -0,0 +1,20 @@ +// Copyright (C) 2004-2006 Autodesk, Inc. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of version 2.1 of the GNU Lesser +// General Public License as published by the Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +#ifdef _WIN32 +#pragma once +#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers +#include +#endif Property changes on: Src\UnitTest\stdafx.h ___________________________________________________________________ Added: svn:eol-style + native Index: Src/UnitTest/UnitTest.vcproj =================================================================== --- Src/UnitTest/UnitTest.vcproj (revision 0) +++ Src/UnitTest/UnitTest.vcproj (revision 0) @@ -0,0 +1,877 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: Src\UnitTest\UnitTest.vcproj ___________________________________________________________________ Added: svn:eol-style + native