From 0d7efaefc87810b3988e92b67f841dbdf9262ff3 Mon Sep 17 00:00:00 2001 From: Alex | Kronox Date: Sat, 20 Apr 2024 10:10:13 +0200 Subject: [PATCH 1/4] add cpp python and c# e2e tests --- .github/workflows/files/cpp.zip | Bin 0 -> 548 bytes .github/workflows/files/csharp.zip | Bin 0 -> 924 bytes .github/workflows/files/python.zip | Bin 0 -> 637 bytes .../tests/e2e/OpenComparisonTest.spec.ts | 15 +++++++++++++++ 4 files changed, 15 insertions(+) create mode 100644 .github/workflows/files/cpp.zip create mode 100644 .github/workflows/files/csharp.zip create mode 100644 .github/workflows/files/python.zip diff --git a/.github/workflows/files/cpp.zip b/.github/workflows/files/cpp.zip new file mode 100644 index 0000000000000000000000000000000000000000..4977bab09e0e0345c059559350faf1bc02de3d63 GIT binary patch literal 548 zcmWIWW@Zs#U|`^2VDX(2!C_+AupG#H3dCGMoLo?#Z(yhgqI9Q9Vs{8DrWn3gR%8*T~pDw0bvF2Ygg_reOz?x=Fc@N z&j(#u^}>2_sP;47pL1+2i+!&0w<$OT9lN1;kWJ*zr!8JJKP=PNZ#;kR(JGV9K#gKe zC6QjEgDd3QFK^%cj>nF3QX${1Q!1O4dDgzQFi)Nvb>QnMR+T-q)26u>DF=LM_q=>r zQhy%9y#T`AF&a|dVPq0vz#TupC}Ln_PykUtfQYRCZ({YGhv@?cOMo{k8^|OkAS?jV I^B6%q09HK12LJ#7 literal 0 HcmV?d00001 diff --git a/.github/workflows/files/csharp.zip b/.github/workflows/files/csharp.zip new file mode 100644 index 0000000000000000000000000000000000000000..c6cc4360ce9755da4c8c29fe6fd7c4568b9b9c7e GIT binary patch literal 924 zcmWIWW@Zs#U|`^2i1MEj!Mi%vAfAzd;XE?~0}oI%xi}-Ss6gMqP%pW7ZIG}3VFRAM z;jij9RCz6skA7&zyHb9-XM=!3Ap_q@*WCJ_<=Rx${e{x#_zmx+wL~@gkM8 zu0D3Z-&xL%;XcWkTfTL|WxXd~>?ds2d-5jbNv?3;Ov&?gGlTEG>3uRu^oMgx&H6L^ zj9s(6PUh8oWMgT!YLWXp`RO*30||i}J6FADIDVlcs7>AQnMI$-xeLrYj^sDZUP(fQjI9ZYsFmjP~fZn;m3FNgVSf*CszYI{>nb-jyY=fD!QQQ#q)~WXLV{K zG@OgPbZ0-krP};1CHh3+8<|%1Vw3pH!B;+G$tS{0n$Ri I{Kvom06pn|KL7v# literal 0 HcmV?d00001 diff --git a/.github/workflows/files/python.zip b/.github/workflows/files/python.zip new file mode 100644 index 0000000000000000000000000000000000000000..61fc945265750ff4ec46b91be3e2b26e7774b8b3 GIT binary patch literal 637 zcmWIWW@Zs#U|`^2aP*lHp~Usj^EQyj%f!II1EdQoOEU8F^bHL43My+S-0eDKAkg}r zxw74PozV7`>nc=B7TRC`%_X!YX~8yA*}(gC$GyrgUgPyKI(er2oIrifYzGS~E02fr z)8Ae5RCMiP`Ms)eN%QWUn!EEnSN~pY)K>ldfz81rUDk@N2d}eyy(=K&m%g35?~j=3 z@+Y&SY8+o)Wv6vYFyGAw6Z}IzFVu29nAs-TezfcS6y^8q+G=dOl>!BG+AODi zZ2Dee6WCv8*qQ!ibGqqa`M>^0?`lra>!}o#Zg{GnaGyE#>eSa01;3o0AsBMRzust@ zfq&>?w`cEN-u&0H4}b@PKQIv7&iy}g1nBwajHrQN1P+ALd`$)duHSus@lReCwY1}i zD5sjk|HB&^ZnR7fQ2w{qnO94HwvYAPmpjXYV$Djk7x$@xAZFC`8|{a05$ znAOIVT)o4a?mUsRF~9hL4U7H)mIB2mX?x9Lcyjg}JElB)P3h!~-kpa`+GN{Wgy#vm zCFx#WpL+S#DTddIDSRg+_#W(*dv~!&se9hU7R{(fW9JQyAMy@) z%#jyU4<6$9k>kTYqj~B2o{*$VqB)8CRF(d(-op^!&B!FefIHHGUT0urPykUtfSd%7 kbz%!Cka~ztR$$n{bb`Vyz?+o~B+CSZB|!Q!P@aJS0DQmk5&!@I literal 0 HcmV?d00001 diff --git a/report-viewer/tests/e2e/OpenComparisonTest.spec.ts b/report-viewer/tests/e2e/OpenComparisonTest.spec.ts index 4dcdf4783..a024a8452 100644 --- a/report-viewer/tests/e2e/OpenComparisonTest.spec.ts +++ b/report-viewer/tests/e2e/OpenComparisonTest.spec.ts @@ -38,6 +38,21 @@ const testSets: DataSet[] = [ datasetName: 'folderMultiRoot-report.zip', firstSubmissionName: 'f0\\\\|/0', secondSubmissionName: 'f1\\\\|/1' + }, + { + datasetName: 'python-report.zip', + firstSubmissionName: '02.py', + secondSubmissionName: '01.py' + }, + { + datasetName: 'cpp-report.zip', + firstSubmissionName: '02.cpp', + secondSubmissionName: '01.cpp' + }, + { + datasetName: 'csharp-report.zip', + firstSubmissionName: '02.cs', + secondSubmissionName: '01.cs' } ] From 29bee595e0682c19dd4c6fb70307694e6e45b3a4 Mon Sep 17 00:00:00 2001 From: Alexander Vogt Date: Mon, 22 Apr 2024 10:13:42 +0200 Subject: [PATCH 2/4] update workflow file --- .github/workflows/complete-e2e.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/complete-e2e.yml b/.github/workflows/complete-e2e.yml index d27eb0018..7168d63a0 100644 --- a/.github/workflows/complete-e2e.yml +++ b/.github/workflows/complete-e2e.yml @@ -69,7 +69,10 @@ jobs: {zip: "fileMultiRoot.zip", name: "fileMultiRoot", folder: "f0", language: "java", cliArgs: "--new f1"}, {zip: "folderMultiRoot.zip", name: "folderMultiRoot", folder: "f0", language: "java", cliArgs: "--new f1"}, {zip: "mixedMultiRoot.zip", name: "mixedBaseFile", folder: "f0", language: "java", cliArgs: "--new f1"}, - {zip: "mixedMultiRoot.zip", name: "mixedBaseFolder", folder: "f1", language: "java", cliArgs: "--new f0"} + {zip: "mixedMultiRoot.zip", name: "mixedBaseFolder", folder: "f1", language: "java", cliArgs: "--new f0"}, + {zip: "cpp.zip", name: "cpp", folder: "cpp", language: "cpp", cliArgs: ""}, + {zip: "csharp.zip", name: "csharp", folder: "csharp", language: "csharp", cliArgs: ""}, + {zip: "python.zip", name: "python", folder: "python", language: "python3", cliArgs: ""} ] steps: From 3c2547cac957e2a8508ffa901ca71dbe8434aa88 Mon Sep 17 00:00:00 2001 From: Alexander Vogt Date: Mon, 22 Apr 2024 10:24:19 +0200 Subject: [PATCH 3/4] add slash to path --- .github/workflows/complete-e2e.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/complete-e2e.yml b/.github/workflows/complete-e2e.yml index 7168d63a0..332cc834e 100644 --- a/.github/workflows/complete-e2e.yml +++ b/.github/workflows/complete-e2e.yml @@ -70,9 +70,9 @@ jobs: {zip: "folderMultiRoot.zip", name: "folderMultiRoot", folder: "f0", language: "java", cliArgs: "--new f1"}, {zip: "mixedMultiRoot.zip", name: "mixedBaseFile", folder: "f0", language: "java", cliArgs: "--new f1"}, {zip: "mixedMultiRoot.zip", name: "mixedBaseFolder", folder: "f1", language: "java", cliArgs: "--new f0"}, - {zip: "cpp.zip", name: "cpp", folder: "cpp", language: "cpp", cliArgs: ""}, - {zip: "csharp.zip", name: "csharp", folder: "csharp", language: "csharp", cliArgs: ""}, - {zip: "python.zip", name: "python", folder: "python", language: "python3", cliArgs: ""} + {zip: "cpp.zip", name: "cpp", folder: "./cpp", language: "cpp", cliArgs: ""}, + {zip: "csharp.zip", name: "csharp", folder: "./csharp", language: "csharp", cliArgs: ""}, + {zip: "python.zip", name: "python", folder: "./python", language: "python3", cliArgs: ""} ] steps: From a14d2e1466c5c7af54016f92a1d7324a076af312 Mon Sep 17 00:00:00 2001 From: Alexander Vogt Date: Mon, 22 Apr 2024 10:38:23 +0200 Subject: [PATCH 4/4] fix order of submissions --- report-viewer/tests/e2e/OpenComparisonTest.spec.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/report-viewer/tests/e2e/OpenComparisonTest.spec.ts b/report-viewer/tests/e2e/OpenComparisonTest.spec.ts index a024a8452..8b9a9bdd1 100644 --- a/report-viewer/tests/e2e/OpenComparisonTest.spec.ts +++ b/report-viewer/tests/e2e/OpenComparisonTest.spec.ts @@ -41,18 +41,18 @@ const testSets: DataSet[] = [ }, { datasetName: 'python-report.zip', - firstSubmissionName: '02.py', - secondSubmissionName: '01.py' + firstSubmissionName: '01.py', + secondSubmissionName: '02.py' }, { datasetName: 'cpp-report.zip', - firstSubmissionName: '02.cpp', - secondSubmissionName: '01.cpp' + firstSubmissionName: '01.cpp', + secondSubmissionName: '02.cpp' }, { datasetName: 'csharp-report.zip', - firstSubmissionName: '02.cs', - secondSubmissionName: '01.cs' + firstSubmissionName: '01.cs', + secondSubmissionName: '02.cs' } ]