Skip to content

Commit 42a78aa

Browse files
GPortasGPortas
committed
Refactor: more readable JSON strings in DatasetsIT
1 parent 5b1c06d commit 42a78aa

File tree

1 file changed

+120
-110
lines changed

1 file changed

+120
-110
lines changed

‎src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java‎

Lines changed: 120 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -498,25 +498,27 @@ public void testAddUpdateDatasetViaNativeAPI() {
498498

499499
// Step 1 - Set controlled vocabulary field
500500

501-
String jsonString = "{\n" +
502-
" \"fields\": [\n" +
503-
" {\n" +
504-
" \"typeName\": \"author\",\n" +
505-
" \"value\": [\n" +
506-
" {\n" +
507-
" \"authorName\": {\n" +
508-
" \"typeName\": \"authorName\",\n" +
509-
" \"value\": \"Belicheck, Bill\"\n" +
510-
" },\n" +
511-
" \"authorAffiliation\": {\n" +
512-
" \"typeName\": \"authorIdentifierScheme\",\n" +
513-
" \"value\": \"ORCID\"\n" +
514-
" }\n" +
515-
" }\n" +
516-
" ]\n" +
517-
" }\n" +
518-
" ]\n" +
519-
"}";
501+
String jsonString = """
502+
{
503+
"fields": [
504+
{
505+
"typeName": "author",
506+
"value": [
507+
{
508+
"authorName": {
509+
"typeName": "authorName",
510+
"value": "Belicheck, Bill"
511+
},
512+
"authorAffiliation": {
513+
"typeName": "authorIdentifierScheme",
514+
"value": "ORCID"
515+
}
516+
}
517+
]
518+
}
519+
]
520+
}
521+
""";
520522

521523
Response updateMetadataAddAuthorWithOptionalCvv = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
522524
updateMetadataAddAuthorWithOptionalCvv.then().assertThat()
@@ -525,25 +527,27 @@ public void testAddUpdateDatasetViaNativeAPI() {
525527

526528
// Step 2 - Remove controlled vocabulary field
527529

528-
jsonString = "{\n" +
529-
" \"fields\": [\n" +
530-
" {\n" +
531-
" \"typeName\": \"author\",\n" +
532-
" \"value\": [\n" +
533-
" {\n" +
534-
" \"authorName\": {\n" +
535-
" \"typeName\": \"authorName\",\n" +
536-
" \"value\": \"Belicheck, Bill\"\n" +
537-
" },\n" +
538-
" \"authorAffiliation\": {\n" +
539-
" \"typeName\": \"authorIdentifierScheme\",\n" +
540-
" \"value\": \"\"\n" +
541-
" }\n" +
542-
" }\n" +
543-
" ]\n" +
544-
" }\n" +
545-
" ]\n" +
546-
"}";
530+
jsonString = """
531+
{
532+
"fields": [
533+
{
534+
"typeName": "author",
535+
"value": [
536+
{
537+
"authorName": {
538+
"typeName": "authorName",
539+
"value": "Belicheck, Bill"
540+
},
541+
"authorAffiliation": {
542+
"typeName": "authorIdentifierScheme",
543+
"value": ""
544+
}
545+
}
546+
]
547+
}
548+
]
549+
}
550+
""";
547551

548552
Response updateMetadataRemoveOptionalCvv = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
549553
updateMetadataRemoveOptionalCvv.then().assertThat()
@@ -554,32 +558,33 @@ public void testAddUpdateDatasetViaNativeAPI() {
554558

555559
// Step 1 - Set optional compound field
556560

557-
jsonString = "{\n" +
558-
" \"fields\": [\n" +
559-
" {\n" +
560-
" \"typeName\": \"distributor\",\n" +
561-
" \"multiple\": true,\n" +
562-
" \"typeClass\": \"compound\",\n" +
563-
" \"value\": [\n" +
564-
" {\n" +
565-
" \"distributorName\": {\n" +
566-
" \"typeName\": \"distributorName\",\n" +
567-
" \"multiple\": false,\n" +
568-
" \"typeClass\": \"primitive\",\n" +
569-
" \"value\": \"LastDistributor1, FirstDistributor1\"\n" +
570-
" },\n" +
571-
" \"distributorAffiliation\": {\n" +
572-
" \"typeName\": \"distributorAffiliation\",\n" +
573-
" \"multiple\": false,\n" +
574-
" \"typeClass\": \"primitive\",\n" +
575-
" \"value\": \"DistributorAffiliation1\"\n" +
576-
" }\n" +
577-
" \n" +
578-
" }\n" +
579-
" ]\n" +
580-
" }\n" +
581-
" ]\n" +
582-
"}\n";
561+
jsonString = """
562+
{
563+
"fields": [
564+
{
565+
"typeName": "distributor",
566+
"multiple": true,
567+
"typeClass": "compound",
568+
"value": [
569+
{
570+
"distributorName": {
571+
"typeName": "distributorName",
572+
"multiple": false,
573+
"typeClass": "primitive",
574+
"value": "LastDistributor1, FirstDistributor1"
575+
},
576+
"distributorAffiliation": {
577+
"typeName": "distributorAffiliation",
578+
"multiple": false,
579+
"typeClass": "primitive",
580+
"value": "DistributorAffiliation1"
581+
}
582+
}
583+
]
584+
}
585+
]
586+
}
587+
""";
583588

584589
Response updateMetadataAddDistributor = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
585590
updateMetadataAddDistributor.then().assertThat()
@@ -589,32 +594,33 @@ public void testAddUpdateDatasetViaNativeAPI() {
589594

590595
// Step 2 - Remove optional compound field
591596

592-
jsonString = "{\n" +
593-
" \"fields\": [\n" +
594-
" {\n" +
595-
" \"typeName\": \"distributor\",\n" +
596-
" \"multiple\": true,\n" +
597-
" \"typeClass\": \"compound\",\n" +
598-
" \"value\": [\n" +
599-
" {\n" +
600-
" \"distributorName\": {\n" +
601-
" \"typeName\": \"distributorName\",\n" +
602-
" \"multiple\": false,\n" +
603-
" \"typeClass\": \"primitive\",\n" +
604-
" \"value\": \"\"\n" +
605-
" },\n" +
606-
" \"distributorAffiliation\": {\n" +
607-
" \"typeName\": \"distributorAffiliation\",\n" +
608-
" \"multiple\": false,\n" +
609-
" \"typeClass\": \"primitive\",\n" +
610-
" \"value\": \"\"\n" +
611-
" }\n" +
612-
" \n" +
613-
" }\n" +
614-
" ]\n" +
615-
" }\n" +
616-
" ]\n" +
617-
"}\n";
597+
jsonString = """
598+
{
599+
"fields": [
600+
{
601+
"typeName": "distributor",
602+
"multiple": true,
603+
"typeClass": "compound",
604+
"value": [
605+
{
606+
"distributorName": {
607+
"typeName": "distributorName",
608+
"multiple": false,
609+
"typeClass": "primitive",
610+
"value": ""
611+
},
612+
"distributorAffiliation": {
613+
"typeName": "distributorAffiliation",
614+
"multiple": false,
615+
"typeClass": "primitive",
616+
"value": ""
617+
}
618+
}
619+
]
620+
}
621+
]
622+
}
623+
""";
618624

619625
Response updateMetadataRemoveDistributor = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
620626
updateMetadataRemoveDistributor.then().assertThat()
@@ -625,16 +631,18 @@ public void testAddUpdateDatasetViaNativeAPI() {
625631

626632
// Step 1 - Set optional multiple field
627633

628-
jsonString = "{\n" +
629-
" \"fields\": [\n" +
630-
" {\n" +
631-
" \"typeName\": \"alternativeTitle\",\n" +
632-
" \"multiple\": true,\n" +
633-
" \"typeClass\": \"primitive\",\n" +
634-
" \"value\": [\"Alternative1\",\"Alternative2\"]\n" +
635-
" }\n" +
636-
" ]\n" +
637-
"}\n";
634+
jsonString = """
635+
{
636+
"fields": [
637+
{
638+
"typeName": "alternativeTitle",
639+
"multiple": true,
640+
"typeClass": "primitive",
641+
"value": ["Alternative1","Alternative2"]
642+
}
643+
]
644+
}
645+
""";
638646

639647
Response updateMetadataAddAlternativeTitles = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
640648
updateMetadataAddAlternativeTitles.then().assertThat()
@@ -643,16 +651,18 @@ public void testAddUpdateDatasetViaNativeAPI() {
643651

644652
// Step 2 - Remove optional multiple field
645653

646-
jsonString = "{\n" +
647-
" \"fields\": [\n" +
648-
" {\n" +
649-
" \"typeName\": \"alternativeTitle\",\n" +
650-
" \"multiple\": true,\n" +
651-
" \"typeClass\": \"primitive\",\n" +
652-
" \"value\": []\n" +
653-
" }\n" +
654-
" ]\n" +
655-
"}\n";
654+
jsonString = """
655+
{
656+
"fields": [
657+
{
658+
"typeName": "alternativeTitle",
659+
"multiple": true,
660+
"typeClass": "primitive",
661+
"value": []
662+
}
663+
]
664+
}
665+
""";
656666

657667
Response updateMetadataRemoveAlternativeTitles = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
658668
updateMetadataRemoveAlternativeTitles.then().assertThat()

0 commit comments

Comments
 (0)