Commit b3086a5

authored

Merge pull request clearloop#7 from Raees678/master

Allow for custom testcases with the `leetcode test` command, and some minor edits

2 parents cf2deee + 965de8d commit b3086a5Copy full SHA for b3086a5

File tree

+30

-11

lines changed

+30

-11

lines changed

Lines changed: 2 additions & 0 deletions

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,7 @@ impl Cache {`
`186`	`186`	`&self,`
`187`	`187`	`run: Run,`
`188`	`188`	`rfid: i32,`
	`189`	`+ testcase: Option<String>`
`189`	`190`	`) -> Result<(HashMap<&'static str, String>, [String; 2]), Error> {`
`190`	`191`	`trace!("pre run code...");`
`191`	`192`	`use crate::helper::code_path;`
`@@ -207,7 +208,11 @@ impl Cache {`
`207`	`208`
`208`	`209`	`// pass manually data`
`209`	`210`	`json.insert("name", p.name.to_string());`
`210`		`- json.insert("data_input", d.case);`
	`211`	`+ match testcase {`
	`212`	`+ Some(case) => json.insert("data_input", case),`
	`213`	`+ _ => json.insert("data_input", d.case)`
	`214`	`+`
	`215`	`+ };`
`211`	`216`
`212`	`217`	`let url = match run {`
`213`	`218`	`Run::Test => conf.sys.urls.get("test")?.replace("$slug", &p.slug),`
`@@ -251,10 +256,10 @@ impl Cache {`
`251`	`256`	`Ok(res)`
`252`	`257`	`}`
`253`	`258`
`254`		`- /// Exec problem fliter —— Test or Submit`
`255`		`- pub fn exec_problem(&self, rfid: i32, run: Run) -> Result<VerifyResult, Error> {`
`256`		`- trace!("Exec problem fliter —— Test or Submit");`
`257`		`- let pre = self.pre_run_code(run.clone(), rfid)?;`
	`259`	`+ /// Exec problem filter —— Test or Submit`
	`260`	`+ pub fn exec_problem(&self, rfid: i32, run: Run,testcase:Option<String>) -> Result<VerifyResult, Error> {`
	`261`	`+ trace!("Exec problem filter —— Test or Submit");`
	`262`	`+ let pre = self.pre_run_code(run.clone(), rfid, testcase)?;`
`258`	`263`	`let json = pre.0;`
`259`	`264`
`260`	`265`	`let run_res: RunCode = self`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ impl std::fmt::Display for VerifyResult {`
`261`	`261`	`" Runtime: ".dimmed(),`
`262`	`262`	`&self.status.status_runtime.dimmed(),`
`263`	`263`	`"\n Your input: ",`
`264`		`- &self.data_input.replace("\n", ", "),`
	`264`	`+ &self.data_input.replace("\n", "↩"),`
`265`	`265`	`"\n Output: ",`
`266`	`266`	`ca,`
`267`	`267`	`"\n Expected: ",`
`@@ -331,7 +331,7 @@ impl std::fmt::Display for VerifyResult {`
`331`	`331`	`" Runtime: ".dimmed(),`
`332`	`332`	`&self.status.status_runtime.dimmed(),`
`333`	`333`	`"\n Your input: ",`
`334`		`- &self.data_input.replace("\n", ", "),`
	`334`	`+ &self.data_input.replace("\n", "↩"),`
`335`	`335`	`"\n Output: ",`
`336`	`336`	`ca,`
`337`	`337`	`"\n Expected: ",`
`@@ -387,7 +387,7 @@ impl std::fmt::Display for VerifyResult {`
`387`	`387`	`&self.status.status_msg.red().bold(),`
`388`	`388`	`&self.error.full_compile_error`
`389`	`389`	`),`
`390`		`- _ => write!(f, "{}", "\nUnKnow Error...\n".red().bold()),`
	`390`	`+ _ => write!(f, "{}", "\nUnknown Error...\n".red().bold()),`
`391`	`391`	`}`
`392`	`392`	`}`
`393`	`393`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ impl Command for ExecCommand {`
`41`	`41`
`42`	`42`	`let id: i32 = m.value_of("id")?.parse()?;`
`43`	`43`	`let cache = Cache::new()?;`
`44`		`- let res = cache.exec_problem(id, Run::Submit)?;`
	`44`	`+ let res = cache.exec_problem(id, Run::Submit,None)?;`
`45`	`45`
`46`	`46`	`println!("{}", res);`
`47`	`47`	`Ok(())`

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,22 +25,34 @@ impl Command for TestCommand {`
`25`	`25`	`fn usage<'a, 'edit>() -> App<'a, 'edit> {`
`26`	`26`	`use clap::{Arg, SubCommand};`
`27`	`27`	`SubCommand::with_name("test")`
`28`		`- .about("Edit question by id")`
	`28`	`+ .about("Test question by id")`
`29`	`29`	`.visible_alias("t")`
`30`	`30`	`.arg(`
`31`	`31`	`Arg::with_name("id")`
`32`	`32`	`.takes_value(true)`
`33`	`33`	`.required(true)`
`34`	`34`	`.help("question id"),`
`35`	`35`	`)`
	`36`	`+ .arg(`
	`37`	`+ Arg::with_name("testcase")`
	`38`	`+ .takes_value(true)`
	`39`	`+ .required(false)`
	`40`	`+ .help("custom testcase"),`
	`41`	`+ )`
`36`	`42`	`}`
`37`	`43`
`38`	`44`	/// `test` handler
`39`	`45`	`fn handler(m: &ArgMatches) -> Result<(), crate::Error> {`
`40`	`46`	`use crate::cache::{Cache, Run};`
`41`	`47`	`let id: i32 = m.value_of("id")?.parse()?;`
	`48`	`+ let testcase = m.value_of("testcase");`
	`49`	`+ let case_str: Option<String>;`
	`50`	`+ match testcase {`
	`51`	`+ Some(case) => case_str = Option::from(case.replace("\\n", "\n").to_string()),`
	`52`	`+ _ => case_str = None,`
	`53`	`+ }`
`42`	`54`	`let cache = Cache::new()?;`
`43`		`- let res = cache.exec_problem(id, Run::Test)?;`
	`55`	`+ let res = cache.exec_problem(id, Run::Test, case_str)?;`
`44`	`56`
`45`	`57`	`println!("{}", res);`
`46`	`58`	`Ok(())`

Comments

(0)