More Framework for unit testing providers (make it automatically run)

git-svn-id: svn+ssh://svn.abisource.com/svnroot/enchant/trunk@22963 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6

3 files changed, 17 insertions, 7 deletions

diff --git a/msvc/enchant.sln b/msvc/enchant.sln
index 4443091..8f6b27c 100644
--- a/msvc/enchant.sln
+++ b/msvc/enchant.sln
@@ -155,6 +155,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittest-providers", "unitt
 		Debug.AspNetCompiler.Debug = "True"

 		Release.AspNetCompiler.Debug = "False"

 	EndProjectSection

+	ProjectSection(ProjectDependencies) = postProject

+		{E948850F-C9DA-4824-876D-4FE97B88E79F} = {E948850F-C9DA-4824-876D-4FE97B88E79F}

+		{5DC9EE15-B080-4964-96CC-1BDC90BB873A} = {5DC9EE15-B080-4964-96CC-1BDC90BB873A}

+		{6FA58A42-075E-4671-BBB4-F7AA8061F839} = {6FA58A42-075E-4671-BBB4-F7AA8061F839}

+		{70927F4C-0446-4EF3-9F65-FA78AC210506} = {70927F4C-0446-4EF3-9F65-FA78AC210506}

+		{5612C360-309B-4E73-8512-6A1265590B90} = {5612C360-309B-4E73-8512-6A1265590B90}

+		{B35929B8-374C-442B-A0F5-494AD69EDE1A} = {B35929B8-374C-442B-A0F5-494AD69EDE1A}

+		{AA6839DF-19CB-49DD-8258-ABB86B5B0428} = {AA6839DF-19CB-49DD-8258-ABB86B5B0428}

+	EndProjectSection

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/msvc/unittest-providers.vcproj b/msvc/unittest-providers.vcproj
index 0750b63..e08a968 100644
--- a/msvc/unittest-providers.vcproj
+++ b/msvc/unittest-providers.vcproj
@@ -62,6 +62,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				LinkLibraryDependencies="false"

 				AdditionalDependencies="glib-2.0-vs8.lib  gmodule-2.0-vs8.lib UnitTest++.vsnet2005.lib shlwapi.lib"

 				LinkIncremental="2"

 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\lib\glib\$(ConfigurationName)&quot;; &quot;$(SolutionDir)..\lib\UnitTest++\$(ConfigurationName)&quot;"

@@ -93,7 +94,7 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Run All Tests"

-				CommandLine="&quot;$(TargetPath)&quot;"

+				CommandLine="&quot;$(TargetPath)&quot; &quot;$(OutDir)&quot;"

 				ExcludedFromBuild="false"

 			/>

 		</Configuration>

@@ -141,6 +142,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				LinkLibraryDependencies="false"

 				AdditionalDependencies="glib-2.0-vs8.lib  gmodule-2.0-vs8.lib UnitTest++.vsnet2005.lib shlwapi.lib"

 				LinkIncremental="1"

 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\lib\glib\$(ConfigurationName)&quot;; &quot;$(SolutionDir)..\lib\UnitTest++\$(ConfigurationName)&quot;"

@@ -174,7 +176,7 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Run All Tests"

-				CommandLine="&quot;$(TargetPath)&quot;&#x0D;&#x0A;"

+				CommandLine="&quot;$(TargetPath)&quot; &quot;$(OutDir)&quot;"

 			/>

 		</Configuration>

 	</Configurations>

diff --git a/unittests/enchant_providers/main.cpp b/unittests/enchant_providers/main.cpp
index e7fa1dd..26ff6ca 100644
--- a/unittests/enchant_providers/main.cpp
+++ b/unittests/enchant_providers/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char* argv[])
     int result = 0;

     for(int i=1; i < argc; ++i)

     {

-        int resultT = Test(argv[argc]);

+        int resultT = Test(argv[i]);

         if(resultT != 0)

         {

             result = resultT;

@@ -81,6 +81,7 @@ char* GetErrorMessage(EnchantProvider* provider)
 //path is provider filename or directory containing providers

 int Test(char* path)

 {

+    assert(path);

     if (g_file_test (path, (GFileTest)(G_FILE_TEST_IS_DIR))) 

 	{

         return TestProvidersInDirectory(path);

@@ -98,10 +99,7 @@ int TestProvidersInDirectory(char * dir_name)
 	size_t entry_len, g_module_suffix_len;

 	

 	char * filename;

-    int result;

-	

-	EnchantProviderInitFunc init_func;

-	EnchantPreConfigureFunc conf_func;

+    int result = 0;

 	

 	dir = g_dir_open (dir_name, 0, NULL);

 	if (!dir) 

@@ -126,6 +124,7 @@ int TestProvidersInDirectory(char * dir_name)
 		}

 	

 	g_dir_close (dir);

+    return result;

 }

 

 int TestProvider(char* filename)