changes to testfile

Author: lego-yaw

Project.toml

@@ -8,21 +8,15 @@ DBCtoDBF_jll = "404e8f35-d372-56c3-89ac-e648a26fddda"
 DBFTables = "75c7ada1-017a-5fb6-b8c7-2125ff2d6c93"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
-
-
 Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
 
-
-
 [compat]
+DBCtoDBF_jll = "v1.0.0"
 DBFTables = "1.2.6"
 DataFrames = "1.6.1"
 Documenter = "1.6.0"
 julia = "1.10.4"
 
-DBCtoDBF_jll = "v1.0.0"
-
-
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 

src/ReadDBC.jl

@@ -1,28 +1,43 @@
-# test/test_read_dbc.jl
-using Test  # Import the Test package to write test cases
-using ReadDBC  # Import your module to test its functions
+module ReadDBC
+
+# Export functions 
+export dbcTable, dbctodbf
+
+# Importing packages 
+using DBFTables
 using DataFrames
 
-# Define paths for test input and expected output
-input_file = "src/ABOAC1909.dbc"
-output_file = "src/ABOAC1909.dbf"
+using  DBCtoDBF_jll 
 
-@testset "ReadDBC Module Tests" begin
 
-    # Test 1: Test dbctodbf function
-    @testset "Test dbctodbf" begin
-        @test isfile(input_file)  # Check if the input file exists
-        result = dbctodbf(input_file, output_file)  # Call the function
-        @test result == output_file  # Ensure the output file path is returned
-        @test isfile(output_file)  # Check if the output file was created
-    end
 
-    # Test 2: Test dbcTable function
-    @testset "Test dbcTable" begin
-        df = dbcTable(input_file)  # Call the function to convert and read
-        @test df !== nothing  # Ensure the DataFrame is not empty
-        @test isa(df, DataFrame)  # Ensure the result is a DataFrame
-        @test nrow(df) > 0  # Ensure the DataFrame has rows
+# Defining function dbctodbf
+function dbctodbf(input_file::String, output_file::String)
+    # The DBCtoDBF_jll package provides the dbc2dbf executable directly
+    exe_path = dbc2dbf()  # This gives the path to the dbc2dbf executable
+
+    # Run the executable with the input and output file arguments
+    run(`$exe_path $input_file $output_file`)
+    
+    return output_file  # Optionally return the output file name
+end
+
+# Defining function readdbc
+function dbcTable(input_file::String)
+    output_file = replace(input_file, ".dbc" => ".dbf")
+    try
+        # Convert the DBC file to a DBF file
+        dbctodbf(input_file, output_file)
+        
+        # Read the DBF file into a DataFrame
+        df = DBFTables.Table(output_file)
+        return DataFrame(df)
+        
+    catch e
+        @error "Failed to convert or read DBC file: $input_file"
+        @error "$e"
+        return nothing
     end
+end
 
-end
+end  # module readdbc

test/runtests.jl

@@ -1,39 +1,28 @@
-using Test
-using ReadDBC
+
+using Test  # Import the Test package to write test cases
+using ReadDBC  # Import your module to test its functions
 using DataFrames
 
+# Define paths for test input and expected output
+input_file = "src/ABOAC1909.dbc"
+output_file = "src/ABOAC1909.dbf"
 
-# Test the dbctodbf function
-@testset "ReadDBC Tests" begin
-    # Set up file paths 
-    input_file = "src/ABOAC1909.dbc"
-    output_file = "src/ABOAC1909.dbf"
-    dbctodbf(input_file, output_file)
-    
-    # Check if the output file is created (basic test)
-    @test isfile(output_file)
+@testset "ReadDBC Module Tests" begin
 
-    # Clean up (remove files)
-    rm(output_file)
-end
+    # Test 1: Test dbctodbf function
+    @testset "Test dbctodbf" begin
+        @test isfile(input_file)  # Check if the input file exists
+        result = dbctodbf(input_file, output_file)  # Call the function
+        @test result == output_file  # Ensure the output file path is returned
+        @test isfile(output_file)  # Check if the output file was created
+    end
 
-# Test the readdbc function
-@testset "ReadDBC Tests" begin
-    # Set up file paths
-    input_file = "src/ABOAC1909.dbc"
-    output_file = replace(input_file, ".dbc" => ".dbf")
-    
-    # Call the readdbc function
-    df = dbcTable(input_file)
-    
-    # Ensure the DataFrame is returned and is not empty (this depends on actual implementation)
-    @test df !== nothing
-    @test isa(df, DataFrame)
-    
-    # Add more tests as needed, for example, checking specific columns or data in the DataFrame
-    
-    # Clean up (remove files)
-    rm(output_file)
-end
+    # Test 2: Test dbcTable function
+    @testset "Test dbcTable" begin
+        df = dbcTable(input_file)  # Call the function to convert and read
+        @test df !== nothing  # Ensure the DataFrame is not empty
+        @test isa(df, DataFrame)  # Ensure the result is a DataFrame
+        @test nrow(df) > 0  # Ensure the DataFrame has rows
+    end
 
-println("All tests passed successfully.")
+end