Skip to content

add source versions #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 9, 2022
Merged

add source versions #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8513473
add source versions
YaleChen299 Oct 9, 2022
9321a57
fix format
YaleChen299 Oct 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/cadet/assessments/library.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,14 @@ defmodule Cadet.Assessments.Library do
@valid_chapter_variants [
{1, "wasm"},
{1, "lazy"},
{1, "native"},
{2, "lazy"},
{2, "native"},
{3, "concurrent"},
{3, "non-det"},
{4, "gpu"}
{3, "native"},
{4, "gpu"},
{4, "native"}
]

defp validate_chapter_variant(changeset) do
Expand Down
13 changes: 9 additions & 4 deletions lib/cadet/courses/course.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,21 @@ defmodule Cadet.Courses.Course do
{true, true} ->
case get_field(changeset, :source_chapter) do
1 ->
validate_inclusion(changeset, :source_variant, ["default", "lazy", "wasm"])
validate_inclusion(changeset, :source_variant, ["default", "lazy", "wasm", "native"])

2 ->
validate_inclusion(changeset, :source_variant, ["default", "lazy"])
validate_inclusion(changeset, :source_variant, ["default", "lazy", "native"])

3 ->
validate_inclusion(changeset, :source_variant, ["default", "concurrent", "non-det"])
validate_inclusion(changeset, :source_variant, [
"default",
"concurrent",
"non-det",
"native"
])

4 ->
validate_inclusion(changeset, :source_variant, ["default", "gpu"])
validate_inclusion(changeset, :source_variant, ["default", "gpu", "native"])

_ ->
add_error(changeset, :source_chapter, "is invalid")
Expand Down
6 changes: 5 additions & 1 deletion test/cadet/assessments/library_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,17 @@ defmodule Cadet.Assessments.LibraryTest do
{1, "default"},
{1, "wasm"},
{1, "lazy"},
{1, "native"},
{2, "default"},
{2, "lazy"},
{2, "native"},
{3, "default"},
{3, "concurrent"},
{3, "non-det"},
{3, "native"},
{4, "default"},
{4, "gpu"}
{4, "gpu"},
{4, "native"}
]

for {c, v} <- variants do
Expand Down
9 changes: 9 additions & 0 deletions test/cadet/courses/course_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,15 @@ defmodule Cadet.Courses.CourseTest do
:valid
)

assert_changeset(
%{
source_chapter: 3,
source_variant: "native",
course_name: "Data Structures and Algorithms"
},
:valid
)

assert_changeset(
%{
source_chapter: 4,
Expand Down