From 93834e4ad18e2a966789c1f3a66191fb8d06b9aa Mon Sep 17 00:00:00 2001 From: dcodesdev <101001810+dcodesdev@users.noreply.github.com> Date: Tue, 4 Jun 2024 11:12:54 +0300 Subject: [PATCH] tests moved to tests directory --- challenges/character-counting-string/src/lib.rs | 2 -- .../character-counting-string/{src => tests}/tests.rs | 2 +- challenges/countdown/src/lib.rs | 2 -- challenges/countdown/{src => tests}/tests.rs | 2 +- challenges/determine-number-characteristics/src/lib.rs | 2 -- .../{src => tests}/tests.rs | 2 +- challenges/factorial-calculator/src/lib.rs | 2 -- challenges/factorial-calculator/{src => tests}/tests.rs | 2 +- challenges/fibonacci/src/lib.rs | 2 -- challenges/fibonacci/{src => tests}/tests.rs | 2 +- challenges/fizz-buzz/src/lib.rs | 2 -- challenges/fizz-buzz/{src => tests}/tests.rs | 2 +- challenges/graceful-error-handling/src/lib.rs | 2 -- .../graceful-error-handling/{src => tests}/tests.rs | 2 +- challenges/hello-world/src/lib.rs | 2 -- challenges/hello-world/{src => tests}/tests.rs | 2 +- challenges/if-else/src/lib.rs | 2 -- challenges/if-else/{src => tests}/tests.rs | 2 +- challenges/is-prime/src/lib.rs | 2 -- challenges/is-prime/{src => tests}/tests.rs | 2 +- challenges/mathematical-operations/src/lib.rs | 2 -- .../mathematical-operations/{src => tests}/tests.rs | 2 +- challenges/median-and-mode/src/lib.rs | 2 -- challenges/median-and-mode/{src => tests}/tests.rs | 2 +- challenges/sum-of-even-numbers/src/lib.rs | 2 -- challenges/sum-of-even-numbers/{src => tests}/tests.rs | 2 +- challenges/temperature-converter/src/lib.rs | 2 -- challenges/temperature-converter/{src => tests}/tests.rs | 2 +- challenges/the-from-trait/src/lib.rs | 8 +++----- challenges/the-from-trait/src/starter.rs | 6 +++--- challenges/the-from-trait/{src => tests}/tests.rs | 2 +- challenges/validate-user-input/src/lib.rs | 2 -- challenges/validate-user-input/{src => tests}/tests.rs | 2 +- challenges/weekday-from-number/src/lib.rs | 2 -- challenges/weekday-from-number/{src => tests}/tests.rs | 2 +- 35 files changed, 23 insertions(+), 57 deletions(-) rename challenges/character-counting-string/{src => tests}/tests.rs (94%) rename challenges/countdown/{src => tests}/tests.rs (94%) rename challenges/determine-number-characteristics/{src => tests}/tests.rs (92%) rename challenges/factorial-calculator/{src => tests}/tests.rs (93%) rename challenges/fibonacci/{src => tests}/tests.rs (95%) rename challenges/fizz-buzz/{src => tests}/tests.rs (96%) rename challenges/graceful-error-handling/{src => tests}/tests.rs (94%) rename challenges/hello-world/{src => tests}/tests.rs (82%) rename challenges/if-else/{src => tests}/tests.rs (91%) rename challenges/is-prime/{src => tests}/tests.rs (97%) rename challenges/mathematical-operations/{src => tests}/tests.rs (96%) rename challenges/median-and-mode/{src => tests}/tests.rs (96%) rename challenges/sum-of-even-numbers/{src => tests}/tests.rs (94%) rename challenges/temperature-converter/{src => tests}/tests.rs (96%) rename challenges/the-from-trait/{src => tests}/tests.rs (94%) rename challenges/validate-user-input/{src => tests}/tests.rs (96%) rename challenges/weekday-from-number/{src => tests}/tests.rs (94%) diff --git a/challenges/character-counting-string/src/lib.rs b/challenges/character-counting-string/src/lib.rs index c2dbbab..0111edb 100644 --- a/challenges/character-counting-string/src/lib.rs +++ b/challenges/character-counting-string/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn count_characters(s: &str) -> u32 { s.chars().count() as u32 } diff --git a/challenges/character-counting-string/src/tests.rs b/challenges/character-counting-string/tests/tests.rs similarity index 94% rename from challenges/character-counting-string/src/tests.rs rename to challenges/character-counting-string/tests/tests.rs index caa6063..e2faaf4 100644 --- a/challenges/character-counting-string/src/tests.rs +++ b/challenges/character-counting-string/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::count_characters; + use character_counting_string::*; #[test] fn should_count_characters() { diff --git a/challenges/countdown/src/lib.rs b/challenges/countdown/src/lib.rs index 20cce3a..dd5f395 100644 --- a/challenges/countdown/src/lib.rs +++ b/challenges/countdown/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn countdown(n: u32) -> Vec { let mut current = n; let mut result = Vec::new(); diff --git a/challenges/countdown/src/tests.rs b/challenges/countdown/tests/tests.rs similarity index 94% rename from challenges/countdown/src/tests.rs rename to challenges/countdown/tests/tests.rs index 60e827c..e7fcd20 100644 --- a/challenges/countdown/src/tests.rs +++ b/challenges/countdown/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::countdown; + use countdown::*; #[test] fn test_countdown() { diff --git a/challenges/determine-number-characteristics/src/lib.rs b/challenges/determine-number-characteristics/src/lib.rs index 1b044e8..8108e1e 100644 --- a/challenges/determine-number-characteristics/src/lib.rs +++ b/challenges/determine-number-characteristics/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn describe_number(n: i32) -> String { if n == 0 { return String::from("Zero"); diff --git a/challenges/determine-number-characteristics/src/tests.rs b/challenges/determine-number-characteristics/tests/tests.rs similarity index 92% rename from challenges/determine-number-characteristics/src/tests.rs rename to challenges/determine-number-characteristics/tests/tests.rs index 8424ce4..cac5e5a 100644 --- a/challenges/determine-number-characteristics/src/tests.rs +++ b/challenges/determine-number-characteristics/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::describe_number; + use determine_number_characteristics::*; #[test] fn test_positive_even() { diff --git a/challenges/factorial-calculator/src/lib.rs b/challenges/factorial-calculator/src/lib.rs index fc71069..5becb7d 100644 --- a/challenges/factorial-calculator/src/lib.rs +++ b/challenges/factorial-calculator/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn factorial(n: u32) -> u128 { if n == 0 { return 1; diff --git a/challenges/factorial-calculator/src/tests.rs b/challenges/factorial-calculator/tests/tests.rs similarity index 93% rename from challenges/factorial-calculator/src/tests.rs rename to challenges/factorial-calculator/tests/tests.rs index 5fa365a..c532672 100644 --- a/challenges/factorial-calculator/src/tests.rs +++ b/challenges/factorial-calculator/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::factorial; + use factorial_calculator::*; #[test] fn test_factorial_of_zero() { diff --git a/challenges/fibonacci/src/lib.rs b/challenges/fibonacci/src/lib.rs index b5fc691..6fde7b5 100644 --- a/challenges/fibonacci/src/lib.rs +++ b/challenges/fibonacci/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn fibonacci(n: u32) -> u32 { match n { 0 => 0, diff --git a/challenges/fibonacci/src/tests.rs b/challenges/fibonacci/tests/tests.rs similarity index 95% rename from challenges/fibonacci/src/tests.rs rename to challenges/fibonacci/tests/tests.rs index c7fafb7..862085a 100644 --- a/challenges/fibonacci/src/tests.rs +++ b/challenges/fibonacci/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::fibonacci; + use fibonacci::*; #[test] fn zero() { diff --git a/challenges/fizz-buzz/src/lib.rs b/challenges/fizz-buzz/src/lib.rs index 2c4e17f..884c0f6 100644 --- a/challenges/fizz-buzz/src/lib.rs +++ b/challenges/fizz-buzz/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn fizz_buzz(num: u32) -> String { match (num % 3, num % 5) { (0, 0) => "FizzBuzz".to_string(), diff --git a/challenges/fizz-buzz/src/tests.rs b/challenges/fizz-buzz/tests/tests.rs similarity index 96% rename from challenges/fizz-buzz/src/tests.rs rename to challenges/fizz-buzz/tests/tests.rs index 4f62e64..876d514 100644 --- a/challenges/fizz-buzz/src/tests.rs +++ b/challenges/fizz-buzz/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::fizz_buzz; + use fizz_buzz::*; #[test] fn should_return_fizz() { diff --git a/challenges/graceful-error-handling/src/lib.rs b/challenges/graceful-error-handling/src/lib.rs index 7016f4e..776f4f1 100644 --- a/challenges/graceful-error-handling/src/lib.rs +++ b/challenges/graceful-error-handling/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn parse_percentage(input: &str) -> Result { match input.parse::() { Ok(percentage) if percentage <= 100 => Ok(percentage), diff --git a/challenges/graceful-error-handling/src/tests.rs b/challenges/graceful-error-handling/tests/tests.rs similarity index 94% rename from challenges/graceful-error-handling/src/tests.rs rename to challenges/graceful-error-handling/tests/tests.rs index 041d590..1ead269 100644 --- a/challenges/graceful-error-handling/src/tests.rs +++ b/challenges/graceful-error-handling/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::parse_percentage; + use graceful_error_handling::*; #[test] fn test_parse_percentage_valid() { diff --git a/challenges/hello-world/src/lib.rs b/challenges/hello-world/src/lib.rs index b2c227a..deac880 100644 --- a/challenges/hello-world/src/lib.rs +++ b/challenges/hello-world/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn hello_world() -> &'static str { "Hello, World!" } diff --git a/challenges/hello-world/src/tests.rs b/challenges/hello-world/tests/tests.rs similarity index 82% rename from challenges/hello-world/src/tests.rs rename to challenges/hello-world/tests/tests.rs index 1597c70..7d4ac9e 100644 --- a/challenges/hello-world/src/tests.rs +++ b/challenges/hello-world/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::hello_world; + use hello_world::*; #[test] fn should_return_hello_world() { diff --git a/challenges/if-else/src/lib.rs b/challenges/if-else/src/lib.rs index e3e674f..3850f67 100644 --- a/challenges/if-else/src/lib.rs +++ b/challenges/if-else/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn is_even(n: i32) -> bool { if n % 2 == 0 { true diff --git a/challenges/if-else/src/tests.rs b/challenges/if-else/tests/tests.rs similarity index 91% rename from challenges/if-else/src/tests.rs rename to challenges/if-else/tests/tests.rs index 42031d3..f41f950 100644 --- a/challenges/if-else/src/tests.rs +++ b/challenges/if-else/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::is_even; + use if_else::*; #[test] fn test_is_even() { diff --git a/challenges/is-prime/src/lib.rs b/challenges/is-prime/src/lib.rs index 192c151..22ab975 100644 --- a/challenges/is-prime/src/lib.rs +++ b/challenges/is-prime/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn is_prime(n: u32) -> bool { if n < 2 { return false; diff --git a/challenges/is-prime/src/tests.rs b/challenges/is-prime/tests/tests.rs similarity index 97% rename from challenges/is-prime/src/tests.rs rename to challenges/is-prime/tests/tests.rs index a9beaa5..defa7f5 100644 --- a/challenges/is-prime/src/tests.rs +++ b/challenges/is-prime/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::is_prime; + use is_prime::*; #[test] fn test_is_prime_small_numbers() { diff --git a/challenges/mathematical-operations/src/lib.rs b/challenges/mathematical-operations/src/lib.rs index fad7a7f..1baabbd 100644 --- a/challenges/mathematical-operations/src/lib.rs +++ b/challenges/mathematical-operations/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn math_operations(a: i32, b: i32) -> (i32, i32, i32, i32) { (a + b, a - b, a * b, a / b) } diff --git a/challenges/mathematical-operations/src/tests.rs b/challenges/mathematical-operations/tests/tests.rs similarity index 96% rename from challenges/mathematical-operations/src/tests.rs rename to challenges/mathematical-operations/tests/tests.rs index 2c57a06..4329c80 100644 --- a/challenges/mathematical-operations/src/tests.rs +++ b/challenges/mathematical-operations/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::math_operations; + use mathematical_operations::*; #[test] fn math_tests() { diff --git a/challenges/median-and-mode/src/lib.rs b/challenges/median-and-mode/src/lib.rs index 7677f5a..d7c604f 100644 --- a/challenges/median-and-mode/src/lib.rs +++ b/challenges/median-and-mode/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - use std::collections::HashMap; pub fn median(numbers: &mut Vec) -> f32 { diff --git a/challenges/median-and-mode/src/tests.rs b/challenges/median-and-mode/tests/tests.rs similarity index 96% rename from challenges/median-and-mode/src/tests.rs rename to challenges/median-and-mode/tests/tests.rs index aad5b1e..1accbb7 100644 --- a/challenges/median-and-mode/src/tests.rs +++ b/challenges/median-and-mode/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::{median, mode}; + use median_and_mode::*; #[test] fn test_median() { diff --git a/challenges/sum-of-even-numbers/src/lib.rs b/challenges/sum-of-even-numbers/src/lib.rs index 70933e7..654928a 100644 --- a/challenges/sum-of-even-numbers/src/lib.rs +++ b/challenges/sum-of-even-numbers/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn sum_of_evens(start: i32, end: i32) -> i32 { if start > end { return 0; diff --git a/challenges/sum-of-even-numbers/src/tests.rs b/challenges/sum-of-even-numbers/tests/tests.rs similarity index 94% rename from challenges/sum-of-even-numbers/src/tests.rs rename to challenges/sum-of-even-numbers/tests/tests.rs index d88c00d..c346739 100644 --- a/challenges/sum-of-even-numbers/src/tests.rs +++ b/challenges/sum-of-even-numbers/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::sum_of_evens; + use sum_of_even_numbers::*; #[test] fn test_sum_of_evens_range() { diff --git a/challenges/temperature-converter/src/lib.rs b/challenges/temperature-converter/src/lib.rs index 97fcc41..f557801 100644 --- a/challenges/temperature-converter/src/lib.rs +++ b/challenges/temperature-converter/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn convert_temperature(value: f64, from_unit: &str, to_unit: &str) -> Result { match (from_unit, to_unit) { ("C", "F") => Ok(value * 9.0 / 5.0 + 32.0), diff --git a/challenges/temperature-converter/src/tests.rs b/challenges/temperature-converter/tests/tests.rs similarity index 96% rename from challenges/temperature-converter/src/tests.rs rename to challenges/temperature-converter/tests/tests.rs index 8d36970..e3131a7 100644 --- a/challenges/temperature-converter/src/tests.rs +++ b/challenges/temperature-converter/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::convert_temperature; + use temperature_converter::*; #[test] fn test_convert_celsius_to_fahrenheit() { diff --git a/challenges/the-from-trait/src/lib.rs b/challenges/the-from-trait/src/lib.rs index 34ac597..278c067 100644 --- a/challenges/the-from-trait/src/lib.rs +++ b/challenges/the-from-trait/src/lib.rs @@ -1,8 +1,6 @@ -mod tests; - -pub struct Minutes(i32); -pub struct Hours(i32); -pub struct Days(i32); +pub struct Minutes(pub i32); +pub struct Hours(pub i32); +pub struct Days(pub i32); impl From for Hours { fn from(minutes: Minutes) -> Hours { diff --git a/challenges/the-from-trait/src/starter.rs b/challenges/the-from-trait/src/starter.rs index 7033046..a44163b 100644 --- a/challenges/the-from-trait/src/starter.rs +++ b/challenges/the-from-trait/src/starter.rs @@ -1,6 +1,6 @@ -pub struct Minutes(i32); -pub struct Hours(i32); -pub struct Days(i32); +pub struct Minutes(pub i32); +pub struct Hours(pub i32); +pub struct Days(pub i32); impl From for Hours { fn from(minutes: Minutes) -> Hours { diff --git a/challenges/the-from-trait/src/tests.rs b/challenges/the-from-trait/tests/tests.rs similarity index 94% rename from challenges/the-from-trait/src/tests.rs rename to challenges/the-from-trait/tests/tests.rs index 0eb57dd..b2edfc2 100644 --- a/challenges/the-from-trait/src/tests.rs +++ b/challenges/the-from-trait/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::{Days, Hours, Minutes}; + use the_from_trait::*; #[test] fn should_convert_minutes_to_hours() { diff --git a/challenges/validate-user-input/src/lib.rs b/challenges/validate-user-input/src/lib.rs index 24cd5f2..e578441 100644 --- a/challenges/validate-user-input/src/lib.rs +++ b/challenges/validate-user-input/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn validate_user(age: i32, email: &str) -> Result<(), String> { if age < 0 || age > 120 { return Err(String::from("Invalid age")); diff --git a/challenges/validate-user-input/src/tests.rs b/challenges/validate-user-input/tests/tests.rs similarity index 96% rename from challenges/validate-user-input/src/tests.rs rename to challenges/validate-user-input/tests/tests.rs index 3f23d55..c3760d9 100644 --- a/challenges/validate-user-input/src/tests.rs +++ b/challenges/validate-user-input/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::validate_user; + use validate_user_input::*; #[test] fn test_valid_user() { diff --git a/challenges/weekday-from-number/src/lib.rs b/challenges/weekday-from-number/src/lib.rs index daab87f..f0be9ac 100644 --- a/challenges/weekday-from-number/src/lib.rs +++ b/challenges/weekday-from-number/src/lib.rs @@ -1,5 +1,3 @@ -mod tests; - pub fn weekday_from_number(day: u8) -> &'static str { match day { 1 => "Monday", diff --git a/challenges/weekday-from-number/src/tests.rs b/challenges/weekday-from-number/tests/tests.rs similarity index 94% rename from challenges/weekday-from-number/src/tests.rs rename to challenges/weekday-from-number/tests/tests.rs index 46333c2..ed53f40 100644 --- a/challenges/weekday-from-number/src/tests.rs +++ b/challenges/weekday-from-number/tests/tests.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::weekday_from_number; + use weekday_from_number::*; #[test] fn test_weekday_from_number_valid() {