Skip to content
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

Use Text Blocks #2122

Merged
merged 10 commits into from
Oct 13, 2020
Merged

Use Text Blocks #2122

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d36599f
Use text block for request body of LtiIntegrationTest
MaisiKoleni Sep 24, 2020
8db4548
Use text blocks for the mock requests in ProgrammingSubmissionConstants
MaisiKoleni Sep 24, 2020
fafb3b2
Use text blocks for the test files' content in FileServiceTest
MaisiKoleni Sep 24, 2020
0b5d822
Use text block for the too-long-multiline-result string test
MaisiKoleni Sep 24, 2020
f421c7a
Merge branch 'develop' into chore/use-text-blocks
MaisiKoleni Sep 25, 2020
b5e913b
Merge branch 'develop' into chore/use-text-blocks
MaisiKoleni Sep 28, 2020
ead971f
Merge branch 'develop' into chore/use-text-blocks
MaisiKoleni Oct 9, 2020
57ad9dd
Use text blocks for text submission constants and move them to own file
MaisiKoleni Oct 9, 2020
3957867
Use test blocks for all test diagrams for the compass service
MaisiKoleni Oct 9, 2020
989826e
Replace JSON text blocks by .json files in the test resource folder
MaisiKoleni Oct 12, 2020
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
35 changes: 25 additions & 10 deletions src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,31 @@ public class LtiIntegrationTest extends AbstractSpringIntegrationBambooBitbucket

private ProgrammingExercise programmingExercise;

private String requestBody = "custom_component_display_name=Exercise" + "&lti_version=LTI-1p0" + "&oauth_nonce=171298047571430710991572204884"
+ "&resource_link_id=courses.edx.org-16a90aca094448ab95caf484b5c35d32" + "&context_id=course-v1%3ATUMx%2BSEECx%2B1T2018" + "&oauth_signature_method=HMAC-SHA1"
+ "&oauth_timestamp=1572204884" + "&custom_require_existing_user=false" + "&lis_person_contact_email_primary=anh.montag%40tum.de"
+ "&oauth_signature=GYXApaIv0x7k%2FOPT9%2FoU38IBQRc%3D" + "&context_title=Software+Engineering+Essentials" + "&lti_message_type=basic-lti-launch-request"
+ "&custom_lookup_user_by_email=false" + "&launch_presentation_return_url=" + "&context_label=TUMx" + "&user_id=ff30145d6884eeb2c1cef50298939383" + "&roles=Student"
+ "&oauth_version=1.0" + "&oauth_consumer_key=artemis_lti_key"
+ "&lis_result_sourcedid=course-v1%253ATUMx%252BSEECx%252B1T2018%3Acourses.edx.org-16a90aca094448ab95caf484b5c35d32%3Aff30145d6884eeb2c1cef50298939383"
+ "&launch_presentation_locale=en"
+ "&lis_outcome_service_url=https%3A%2F%2Fcourses.edx.org%2Fcourses%2Fcourse-v1%3ATUMx%2BSEECx%2B1T2018%2Fxblock%2Fblock-v1%3ATUMx%2BSEECx%2B1T2018%2Btype%40lti_consumer%2Bblock%4016a90aca094448ab95caf484b5c35d32%2Fhandler_noauth%2Foutcome_service_handler"
+ "&lis_person_sourcedid=lovaiible" + "&oauth_callback=about%3Ablank";
private String requestBody = """
custom_component_display_name=Exercise\
&lti_version=LTI-1p0\
&oauth_nonce=171298047571430710991572204884\
&resource_link_id=courses.edx.org-16a90aca094448ab95caf484b5c35d32\
&context_id=course-v1%3ATUMx%2BSEECx%2B1T2018\
&oauth_signature_method=HMAC-SHA1\
&oauth_timestamp=1572204884\
&custom_require_existing_user=false\
&lis_person_contact_email_primary=anh.montag%40tum.de\
&oauth_signature=GYXApaIv0x7k%2FOPT9%2FoU38IBQRc%3D\
&context_title=Software+Engineering+Essentials\
&lti_message_type=basic-lti-launch-request\
&custom_lookup_user_by_email=false\
&launch_presentation_return_url=\
&context_label=TUMx\
&user_id=ff30145d6884eeb2c1cef50298939383\
&roles=Student\
&oauth_version=1.0\
&oauth_consumer_key=artemis_lti_key\
&lis_result_sourcedid=course-v1%253ATUMx%252BSEECx%252B1T2018%3Acourses.edx.org-16a90aca094448ab95caf484b5c35d32%3Aff30145d6884eeb2c1cef50298939383\
&launch_presentation_locale=en\
&lis_outcome_service_url=https%3A%2F%2Fcourses.edx.org%2Fcourses%2Fcourse-v1%3ATUMx%2BSEECx%2B1T2018%2Fxblock%2Fblock-v1%3ATUMx%2BSEECx%2B1T2018%2Btype%40lti_consumer%2Bblock%4016a90aca094448ab95caf484b5c35d32%2Fhandler_noauth%2Foutcome_service_handler\
&lis_person_sourcedid=lovaiible\
&oauth_callback=about%3Ablank""";

@BeforeEach
void init() {
Expand Down
544 changes: 400 additions & 144 deletions src/test/java/de/tum/in/www1/artemis/constants/ProgrammingSubmissionConstants.java
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 19 additions & 17 deletions src/test/java/de/tum/in/www1/artemis/service/FileServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,25 @@ public class FileServiceTest extends AbstractSpringIntegrationBambooBitbucketJir
* src/test/resources/test-data
*/

private static final String FILE_WITH_UNIX_LINE_ENDINGS = //
"public class LineEndings {\n" + //
"\n" + //
" public void someMethod() {\n" + //
" // Some logic inside here\n" + //
" someService.call();\n" + //
" }\n" + //
"}\n";

private static final String FILE_WITH_WINDOWS_LINE_ENDINGS = //
"public class LineEndings {\r\n" + //
"\r\n" + //
" public void someMethod() {\r\n" + //
" // Some logic inside here\r\n" + //
" someService.call();\r\n" + //
" }\r\n" + //
"}\r\n";
private static final String FILE_WITH_UNIX_LINE_ENDINGS = """
public class LineEndings {

public void someMethod() {
// Some logic inside here
someService.call();
}
}
""";

private static final String FILE_WITH_WINDOWS_LINE_ENDINGS = """
public class LineEndings {\r
\r
public void someMethod() {\r
// Some logic inside here\r
someService.call();\r
}\r
}\r
""";

@Autowired
FileService fileService;
Expand Down
10 changes: 3 additions & 7 deletions ...java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivityDiagramTest.java
View file
Open in desktop

Large diffs are not rendered by default.

Loading