#186 passing all tests now!

jellepoland · jellepoland · commit a26ec1e5c4c8 · 2025-08-07T12:00:30.000+02:00
diff --git a/test/Aqua.jl b/test/Aqua.jl
@@ -0,0 +1,8 @@
+using Aqua
+@testset "Aqua.jl" begin
+    Aqua.test_all(
+      VortexStepMethod;
+      stale_deps=(ignore=[:Xfoil, :Timers, :PyCall],),
+      deps_compat=(ignore=[:PyCall],)
+    )
+end
diff --git a/test/README.md b/test/README.md
@@ -2,103 +2,71 @@
 
 This directory contains organized test data for the VortexStepMethod.jl test suite.
 
-## Structure
-
-The test data is organized by source module being tested, following the structure of the `src/` directory:
+## Running Tests
 
+You can run tests in different ways:
+```bash
+# Run all tests
+julia --project=. test/runtests.jl
 ```
-test/data/
-├── body_aerodynamics/          # Tests for src/body_aerodynamics.jl
-│   ├── wings/
-│   │   └── test_wing.yaml
-│   ├── polars/
-│   │   └── simple_polar.csv
-│   └── complete_settings.yaml
-├── yaml_geometry/              # Tests for src/yaml_geometry.jl
-│   ├── wings/
-│   │   ├── simple_wing.yaml
-│   │   └── complex_wing.yaml
-│   └── polars/
-│       ├── standard_airfoil.csv
-│       └── alternate_airfoil.csv
-├── solver/                     # Tests for src/solver.jl
-│   ├── wings/
-│   │   └── solver_test_wing.yaml
-│   ├── polars/
-│   │   └── solver_test_polar.csv
-│   └── solver_settings.yaml
-├── settings/                   # Common settings files
-│   ├── basic_vsm.yaml
-│   └── basic_llt.yaml
-└── wing_geometry/              # Tests for src/wing_geometry.jl (future)
-```
-
-## Usage
-
-Use the helper functions in `test_data_utils.jl` to access test data:
-
-### Basic Path Access
-```julia
-include("test_data_utils.jl")
-
-# Get paths to test data files
-wing_file = test_data_path("yaml_geometry", "wings", "simple_wing.yaml")
-polar_file = test_data_path("yaml_geometry", "polars", "standard_airfoil.csv")
-settings_file = test_data_path("settings", "basic_vsm.yaml")
-```
-
-### Module-Specific Convenience Functions
-```julia
-# Get standard wing file for a module
-wing_file = get_standard_wing_file("body_aerodynamics")
-
-# Get complete settings file for a module
-settings_file = get_complete_settings_file("solver")
-
-# Create temporary settings with custom parameters
-temp_settings = create_temp_wing_settings("yaml_geometry", "simple_wing.yaml"; 
-                                         alpha=15.0, wind_speed=25.0)
+```bash
+# Run specific test files
+julia --project=. test/yaml_geometry/test_yaml_geometry.jl
+julia --project=. test/body_aerodynamics/test_body_aerodynamics.jl
+julia --project=. test/solver/test_solver.jl
+# etc.
 ```
-
-## Design Principles
-
-1. **Module Isolation**: Each source module has its own test data directory
-2. **Consistent Structure**: All modules follow the same subdirectory pattern (wings/, polars/, etc.)
-3. **Reusable Components**: Common files (like basic settings) are shared in the `settings/` directory
-4. **Clear Naming**: File names clearly indicate their purpose and content
-5. **Self-Contained**: Each module's data is independent and can be used in isolation
-
 ## Adding New Test Data
 
 When adding test data for a new source module:
 
-1. Create a new directory under `test/data/` matching the source file name
-2. Add subdirectories as needed (`wings/`, `polars/`, etc.)
-3. Update `test_data_utils.jl` to include helper functions for the new module
+1. Create test files in the appropriate module directory under `test/`
+2. Add any required data files (YAML, CSV) in the same directory
+3. Use `test_data_path()` helper function to access files with proper paths
 4. Follow the existing naming conventions
 
-## File Descriptions
-
-### Wing Geometry Files (.yaml)
-- `simple_wing.yaml`: Basic 2-section wing for common tests
-- `complex_wing.yaml`: Multi-section wing with multiple airfoil types
-- `test_wing.yaml`: Simple wing for body aerodynamics tests
-- `solver_test_wing.yaml`: Wing optimized for solver testing
 
-### Polar Data Files (.csv)
-- `standard_airfoil.csv`: Standard 6-point polar data
-- `alternate_airfoil.csv`: Alternative airfoil with different coefficients
-- `simple_polar.csv`: Minimal 3-point polar for basic tests
-- `solver_test_polar.csv`: Polar data for solver tests
+## Structure
 
-### Settings Files (.yaml)
-- `basic_vsm.yaml`: Basic VSM solver settings
-- `basic_llt.yaml`: Basic LLT solver settings
-- `complete_settings.yaml`: Full wing + solver configuration
-- `solver_settings.yaml`: Solver-specific configuration
+The test data is organized by source module being tested, following the structure of the `src/` directory:
 
-This organization makes it easy to:
-- Find test data relevant to specific source modules
-- Avoid conflicts between different test requirements
-- Maintain and update test data independently
-- Add new test cases without affecting existing ones
+```
+test/
+├── body_aerodynamics/          # Tests for src/body_aerodynamics.jl
+│   ├── test_body_aerodynamics.jl
+│   ├── test_results.jl
+│   └── test_wing.yaml         # Wing geometry for body aero tests
+├── yaml_geometry/              # Tests for src/yaml_geometry.jl
+│   ├── test_yaml_geometry.jl
+│   ├── simple_wing.yaml       # Basic 2-section wing
+│   ├── complex_wing.yaml      # Multi-section wing
+│   ├── standard_airfoil.csv   # Standard polar data
+│   └── alternate_airfoil.csv  # Alternative airfoil data
+├── solver/                     # Tests for src/solver.jl
+│   ├── test_solver.jl
+│   ├── solver_settings.yaml   # Settings for solver tests
+│   ├── solver_test_polar.csv  # Polar data for solver tests
+│   └── solver_test_wing.yaml  # Wing for solver tests
+├── settings/                   # Tests for src/settings.jl
+│   └── test_settings.jl
+├── filament/                   # Tests for src/filament.jl
+│   ├── test_bound_filament.jl
+│   └── test_semi_infinite_filament.jl
+├── panel/                      # Tests for src/panel.jl
+│   └── test_panel.jl
+├── plotting/                   # Tests for src/plotting.jl
+│   └── test_plotting.jl
+├── polars/                     # Tests for src/polars.jl
+│   └── test_polars.jl
+├── ram_geometry/               # Tests for src/ram_geometry.jl
+│   └── test_kite_geometry.jl
+├── wake/                       # Tests for src/wake.jl
+│   └── test_wake.jl
+├── wing_geometry/              # Tests for src/wing_geometry.jl
+│   └── test_wing_geometry.jl
+├── VortexStepMethod/           # Tests for main module
+│   └── test_VortexStepMethod.jl
+├── test_data_utils.jl          # Shared utilities for test data access
+├── runtests.jl                 # Main test runner
+└── README.md                   # This file
+```
diff --git a/test/VortexStepMethod/test_VortexStepMethod.jl b/test/VortexStepMethod/test_VortexStepMethod.jl
@@ -0,0 +1 @@
+##TODO: populate
diff --git a/test/filament/test_semi_infinite_filament.jl b/test/filament/test_semi_infinite_filament.jl
@@ -41,26 +41,6 @@ end
     gamma = 1.0
     core_radius_fraction = 0.01
     work_vectors = ntuple(_ -> Vector{Float64}(undef, 3), 10)
-
-    # @testset "Allocation Tests" begin
-    #     filament = create_test_filament2()
-    #     control_point = [0.5, 0.5, 2.0]
-    #     induced_velocity = zeros(3)
-    #     
-    #     b = @benchmarkable velocity_3D_trailing_vortex_semiinfinite!(
-    #         $induced_velocity,
-    #         $filament,
-    #         $filament.direction,
-    #         $control_point,
-    #         $gamma,
-    #         $filament.vel_mag,
-    #         $work_vectors
-    #     )
-    #     result = run(b)
-    #     @test result.allocs == 0
-    #     @test result.memory == 0
-    # end
-
     @testset "Calculate Induced Velocity" begin
         filament = create_test_filament2()
         control_point = [0.5, 0.5, 2.0]
diff --git a/test/panel/test_panel.jl b/test/panel/test_panel.jl
@@ -1,8 +1,7 @@
-using VortexStepMethod: Panel, Section, calculate_relative_alpha_and_relative_velocity, calculate_cl, calculate_cd_cm, reinit!
+using VortexStepMethod: Panel, Section, calculate_relative_alpha_and_relative_velocity, calculate_cl, calculate_cd_cm, reinit!, INVISCID, POLAR_VECTORS, MVec3
 using Interpolations: linear_interpolation, Line
 using LinearAlgebra
 using Test
-# using BenchmarkTools
 
 function create_panel(section1::Section, section2::Section)
     # Calculate panel geometry
diff --git a/test/plotting/test_plotting.jl b/test/plotting/test_plotting.jl
@@ -2,11 +2,13 @@ using VortexStepMethod
 using ControlPlots
 using Test
 
+include("../test_data_utils.jl")
+
 if !@isdefined ram_wing
     body_path = joinpath(tempdir(), "ram_air_kite_body.obj")
     foil_path = joinpath(tempdir(), "ram_air_kite_foil.dat")
-    cp("data/ram_air_kite/ram_air_kite_body.obj", body_path; force=true)
-    cp("data/ram_air_kite/ram_air_kite_foil.dat", foil_path; force=true)
+    cp("../data/ram_air_kite/ram_air_kite_body.obj", body_path; force=true)
+    cp("../data/ram_air_kite/ram_air_kite_foil.dat", foil_path; force=true)
     ram_wing = RamAirWing(body_path, foil_path; alpha_range=deg2rad.(-1:1), delta_range=deg2rad.(-1:1))
 end
 
diff --git a/test/polars/test_polars.jl b/test/polars/test_polars.jl
@@ -1,8 +1 @@
-using Aqua
-@testset "Aqua.jl" begin
-    Aqua.test_all(
-      VortexStepMethod;
-      stale_deps=(ignore=[:Xfoil, :Timers, :PyCall],),
-      deps_compat=(ignore=[:PyCall],)
-    )
-  end
+##TODO: populate
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -33,10 +33,10 @@ println("Running tests...")
     include("ram_geometry/test_kite_geometry.jl")
     include("settings/test_settings.jl")
     include("solver/test_solver.jl")
-    include("solver/test_solver_results.jl")
-    include("wing_geometry/test_wing_settings.jl")
-    include("VortexStepMethod/test_vortex_step_method.jl")
+    include("VortexStepMethod/test_VortexStepMethod.jl")
     include("wake/test_wake.jl")
     include("wing_geometry/test_wing_geometry.jl")
     include("yaml_geometry/test_yaml_geometry.jl")
+    include("Aqua.jl")
+
 end
diff --git a/test/settings/test_settings.jl b/test/settings/test_settings.jl
@@ -6,17 +6,18 @@ end
 using VortexStepMethod
 using Test
 
+include("../test_data_utils.jl")
+
 @testset "Test settings.jl" begin
-    # Change to project root directory for the test
+    # Use the absolute path to test data to avoid path concatenation issues
     project_root = dirname(dirname(@__DIR__))
-    cd(project_root) do
-        vss = VSMSettings("data/ram_air_kite/vsm_settings_dual.yaml")
-        @test vss isa VSMSettings
-        @test vss.solver_settings isa SolverSettings
-        @test vss.wings isa Vector{WingSettings}
-        @test length(vss.wings) == 2
-        io = IOBuffer(repr(vss))
-        @test countlines(io) == 40  # Updated to match new output format
-    end
+    settings_file = joinpath(project_root, "data", "ram_air_kite", "vsm_settings_dual.yaml")
+    vss = VSMSettings(settings_file)
+    @test vss isa VSMSettings
+    @test vss.solver_settings isa SolverSettings
+    @test vss.wings isa Vector{WingSettings}
+    @test length(vss.wings) == 2
+    io = IOBuffer(repr(vss))
+    @test countlines(io) == 40  # Updated to match new output format
 end
 nothing
diff --git a/test/wake/test_wake.jl b/test/wake/test_wake.jl
@@ -0,0 +1,49 @@
+using Test
+using LinearAlgebra
+using VortexStepMethod
+
+# Test the actual frozen_wake! function using real objects
+@testset "frozen_wake! Tests" begin
+    @testset "frozen_wake! basic functionality" begin
+        # Use existing test data that we know works
+        data_dir = joinpath(dirname(dirname(@__DIR__)), "data", "ram_air_kite")
+        body_path = joinpath(tempdir(), "ram_air_kite_body.obj")
+        foil_path = joinpath(tempdir(), "ram_air_kite_foil.dat")
+        
+        body_src = joinpath(data_dir, "ram_air_kite_body.obj")
+        foil_src = joinpath(data_dir, "ram_air_kite_foil.dat")
+        
+        # Check if source files exist before copying
+        if isfile(body_src) && isfile(foil_src)
+            cp(body_src, body_path; force=true)
+            cp(foil_src, foil_path; force=true)
+            
+            try
+                # Create wing and body aerodynamics with known good geometry
+                wing = RamAirWing(body_path, foil_path; n_panels=56)  # Use default panels
+                body_aero = BodyAerodynamics([wing])
+                
+                # Test that frozen_wake! doesn't throw errors
+                n_panels = length(body_aero.panels)
+                va_distribution = ones(n_panels, 3)  # Create velocity distribution for all panels
+                va_distribution[:, 1] .= 15.0  # X velocity = 15.0 m/s
+                va_distribution[:, 2] .= 0.0   # Y velocity = 0.0  
+                va_distribution[:, 3] .= 0.0   # Z velocity = 0.0
+                
+                # This should not throw an error
+                @test_nowarn VortexStepMethod.frozen_wake!(body_aero, va_distribution)
+                
+                # Test that the function accepts the right number of velocity vectors
+                @test size(va_distribution, 1) == length(body_aero.panels)
+                @test size(va_distribution, 2) == 3  # 3D velocity vectors
+                
+            finally
+                # Clean up
+                rm(body_path; force=true)
+                rm(foil_path; force=true)
+            end
+        else
+            @test_skip "Ram air kite test data files not found, skipping frozen_wake! test"
+        end
+    end
+end
diff --git a/test/yaml_geometry/complex_wing.yaml b/test/yaml_geometry/complex_wing.yaml
@@ -14,5 +14,5 @@ wing_airfoils:
   reynolds: 1000000
   headers: [airfoil_id, type, info_dict]
   data:
-    - [1, polars, {csv_file_path: "../standard_airfoil.csv"}]
-    - [2, polars, {csv_file_path: "../alternate_airfoil.csv"}]
+    - [1, polars, {csv_file_path: "standard_airfoil.csv"}]
+    - [2, polars, {csv_file_path: "alternate_airfoil.csv"}]
diff --git a/test/yaml_geometry/simple_wing.yaml b/test/yaml_geometry/simple_wing.yaml
@@ -9,4 +9,4 @@ wing_airfoils:
   reynolds: 1000000
   headers: [airfoil_id, type, info_dict]
   data:
-    - [1, polars, {csv_file_path: "../standard_airfoil.csv"}]
+    - [1, polars, {csv_file_path: "standard_airfoil.csv"}]
diff --git a/test/yaml_geometry/test_yaml_geometry.jl b/test/yaml_geometry/test_yaml_geometry.jl
