Project

General

Profile

« Previous | Next » 

Revision 9364

Added by Jing Tao over 9 years ago

Use the MN.updateSystemMetadata to replace CN.updateSystemMetadata.

View differences:

test/edu/ucsb/nceas/metacattest/IdentifierManagerTest.java
420 420
            sysmeta_case4.setObsoletedBy(pid2_case4);
421 421
            BigInteger version = BigInteger.ONE.add(BigInteger.ONE);
422 422
            sysmeta_case4.setSerialVersion(version);
423
            CNodeService.getInstance(request).updateSystemMetadata(session, pid1_case4, sysmeta_case4);
423
            MNodeService.getInstance(request).updateSystemMetadata(session, pid1_case4, sysmeta_case4);
424 424
            
425 425
            Thread.sleep(1000);
426 426
            object = new ByteArrayInputStream("test".getBytes("UTF-8"));
......
436 436
            sysmeta2_case4.setObsoletedBy(pid3_case4);
437 437
            version = version.add(BigInteger.ONE);
438 438
            sysmeta2_case4.setSerialVersion(version);
439
            CNodeService.getInstance(request).updateSystemMetadata(session, pid2_case4, sysmeta2_case4);
439
            MNodeService.getInstance(request).updateSystemMetadata(session, pid2_case4, sysmeta2_case4);
440 440
            
441 441
            //check
442 442
            meta = CNodeService.getInstance(request).getSystemMetadata(session, pid1_case4);
......
530 530
            sysmeta_case6.setObsoletedBy(pid2_case6);
531 531
            version = BigInteger.ONE.add(BigInteger.ONE);
532 532
            sysmeta_case6.setSerialVersion(version);
533
            CNodeService.getInstance(request).updateSystemMetadata(session, pid1_case6, sysmeta_case6);
533
            MNodeService.getInstance(request).updateSystemMetadata(session, pid1_case6, sysmeta_case6);
534 534
            
535 535
            Thread.sleep(1000);
536 536
            object = new ByteArrayInputStream("test".getBytes("UTF-8"));
......
543 543
            sysmeta2_case6.setObsoletedBy(pid3_case6);
544 544
            version = version.add(BigInteger.ONE);
545 545
            sysmeta2_case6.setSerialVersion(version);
546
            CNodeService.getInstance(request).updateSystemMetadata(session, pid2_case6, sysmeta2_case6);
546
            MNodeService.getInstance(request).updateSystemMetadata(session, pid2_case6, sysmeta2_case6);
547 547
            
548 548
            //check
549 549
            meta = CNodeService.getInstance(request).getSystemMetadata(session, pid1_case6);
......
585 585
            sysmeta_case7.setObsoletedBy(pid2_case7);
586 586
            version = version.add(BigInteger.ONE);
587 587
            sysmeta_case7.setSerialVersion(version);
588
            CNodeService.getInstance(request).updateSystemMetadata(session, pid1_case7, sysmeta_case7);
588
            MNodeService.getInstance(request).updateSystemMetadata(session, pid1_case7, sysmeta_case7);
589 589
            
590 590
            Thread.sleep(1000);
591 591
            object = new ByteArrayInputStream("test".getBytes("UTF-8"));
......
598 598
            sysmeta2_case7.setObsoletedBy(pid3_case7);
599 599
            version = version.add(BigInteger.ONE);
600 600
            sysmeta2_case7.setSerialVersion(version);
601
            CNodeService.getInstance(request).updateSystemMetadata(session, pid2_case7, sysmeta2_case7);
601
            MNodeService.getInstance(request).updateSystemMetadata(session, pid2_case7, sysmeta2_case7);
602 602
            
603 603
            Thread.sleep(1000);
604 604
            object = new ByteArrayInputStream("test".getBytes("UTF-8"));
......
614 614
            sysmeta3_case7.setObsoletedBy(pid4_case7);
615 615
            version = version.add(BigInteger.ONE);
616 616
            sysmeta3_case7.setSerialVersion(version);
617
            CNodeService.getInstance(request).updateSystemMetadata(session, pid3_case7, sysmeta3_case7);
617
            MNodeService.getInstance(request).updateSystemMetadata(session, pid3_case7, sysmeta3_case7);
618 618
            
619 619
            //check
620 620
            meta = CNodeService.getInstance(request).getSystemMetadata(session, pid1_case7);
......
662 662
            sysmeta_case8.setObsoletedBy(pid2_case8);
663 663
            version = version.add(BigInteger.ONE);
664 664
            sysmeta_case8.setSerialVersion(version);
665
            CNodeService.getInstance(request).updateSystemMetadata(session, pid1_case8, sysmeta_case8);
665
            MNodeService.getInstance(request).updateSystemMetadata(session, pid1_case8, sysmeta_case8);
666 666
            
667 667
            Thread.sleep(1000);
668 668
            object = new ByteArrayInputStream("test".getBytes("UTF-8"));
......
676 676
            sysmeta2_case8.setObsoletedBy(pid3_case8);
677 677
            version = version.add(BigInteger.ONE);
678 678
            sysmeta2_case8.setSerialVersion(version);
679
            CNodeService.getInstance(request).updateSystemMetadata(session, pid2_case8, sysmeta2_case8);
679
            MNodeService.getInstance(request).updateSystemMetadata(session, pid2_case8, sysmeta2_case8);
680 680
            
681 681
            Thread.sleep(1000);
682 682
            object = new ByteArrayInputStream("test".getBytes("UTF-8"));
......
739 739
            sysmeta_case9.setObsoletedBy(pid2_case9);
740 740
            version = version.add(BigInteger.ONE);
741 741
            sysmeta_case9.setSerialVersion(version);
742
            CNodeService.getInstance(request).updateSystemMetadata(session, pid1_case9, sysmeta_case9);
742
            MNodeService.getInstance(request).updateSystemMetadata(session, pid1_case9, sysmeta_case9);
743 743
            //check
744 744
            meta = CNodeService.getInstance(request).getSystemMetadata(session, pid1_case9);
745 745
            assertTrue(meta.getObsoletedBy().equals(pid2_case9));
......
817 817
            sysmeta_case10.setObsoletedBy(pid2_case10);
818 818
            version = version.add(BigInteger.ONE);
819 819
            sysmeta_case10.setSerialVersion(version);
820
            CNodeService.getInstance(request).updateSystemMetadata(session, pid1_case10, sysmeta_case10);
820
            MNodeService.getInstance(request).updateSystemMetadata(session, pid1_case10, sysmeta_case10);
821 821
            //check
822 822
            meta = CNodeService.getInstance(request).getSystemMetadata(session, pid1_case10);
823 823
            assertTrue(meta.getObsoletedBy().equals(pid2_case10));
......
834 834
            sysmeta2_case10.setObsoletedBy(pid3_case10);
835 835
            version = version.add(BigInteger.ONE);
836 836
            sysmeta2_case10.setSerialVersion(version);
837
            CNodeService.getInstance(request).updateSystemMetadata(session, pid2_case10, sysmeta2_case10);
837
            MNodeService.getInstance(request).updateSystemMetadata(session, pid2_case10, sysmeta2_case10);
838 838
            
839 839
            Thread.sleep(1000);
840 840
            object = new ByteArrayInputStream("test".getBytes("UTF-8"));
......
897 897
            sysmeta_case11.setObsoletedBy(pid2_case11);
898 898
            version = version.add(BigInteger.ONE);
899 899
            sysmeta_case11.setSerialVersion(version);
900
            CNodeService.getInstance(request).updateSystemMetadata(session, pid1_case11, sysmeta_case11);
900
            MNodeService.getInstance(request).updateSystemMetadata(session, pid1_case11, sysmeta_case11);
901 901
            //check
902 902
            meta = CNodeService.getInstance(request).getSystemMetadata(session, pid1_case11);
903 903
            assertTrue(meta.getObsoletedBy().equals(pid2_case11));
......
914 914
            sysmeta2_case11.setObsoletedBy(pid3_case11);
915 915
            version = version.add(BigInteger.ONE);
916 916
            sysmeta2_case11.setSerialVersion(version);
917
            CNodeService.getInstance(request).updateSystemMetadata(session, pid2_case11, sysmeta2_case11);
917
            MNodeService.getInstance(request).updateSystemMetadata(session, pid2_case11, sysmeta2_case11);
918 918
            
919 919
            //archive pid3_case11 
920
            CNodeService.getInstance(request).archive(session, pid3_case11);
920
            sysmeta3_case11.setArchived(true);
921
            MNodeService.getInstance(request).updateSystemMetadata(session, pid3_case11, sysmeta3_case11);
922
            //CNodeService.getInstance(request).archive(session, pid3_case11);
921 923
            
922 924
            //check
923 925
            meta = CNodeService.getInstance(request).getSystemMetadata(session, pid1_case11);
......
960 962
            sysmeta_case12.setObsoletedBy(pid2_case12);
961 963
            version = version.add(BigInteger.ONE);
962 964
            sysmeta_case12.setSerialVersion(version);
963
            CNodeService.getInstance(request).updateSystemMetadata(session, pid1_case12, sysmeta_case12);
965
            MNodeService.getInstance(request).updateSystemMetadata(session, pid1_case12, sysmeta_case12);
964 966
            //check
965 967
            meta = CNodeService.getInstance(request).getSystemMetadata(session, pid1_case12);
966 968
            assertTrue(meta.getObsoletedBy().equals(pid2_case12));
......
977 979
            sysmeta2_case12.setObsoletedBy(pid3_case12);
978 980
            version = version.add(BigInteger.ONE);
979 981
            sysmeta2_case12.setSerialVersion(version);
980
            CNodeService.getInstance(request).updateSystemMetadata(session, pid2_case12, sysmeta2_case12);
982
            MNodeService.getInstance(request).updateSystemMetadata(session, pid2_case12, sysmeta2_case12);
981 983
            
982 984
            //archive pid3_case12 
983
            CNodeService.getInstance(request).delete(session, pid3_case12);
985
            MNodeService.getInstance(request).delete(session, pid3_case12);
984 986
            try {
985 987
                meta =  CNodeService.getInstance(request).getSystemMetadata(session, pid3_case12);
986 988
                fail("The pid "+pid3_case12.getValue()+" should be deleted.");
......
1072 1074
            sysmeta2_case14.setObsoletedBy(pid3_case14);
1073 1075
            version = version.add(BigInteger.ONE);
1074 1076
            sysmeta2_case14.setSerialVersion(version);
1075
            CNodeService.getInstance(request).updateSystemMetadata(session, pid2_case14, sysmeta2_case14);
1077
            MNodeService.getInstance(request).updateSystemMetadata(session, pid2_case14, sysmeta2_case14);
1076 1078
            
1077 1079
            meta =  CNodeService.getInstance(request).getSystemMetadata(session, pid2_case14);
1078 1080
            assertTrue(meta.getObsoletedBy().equals(pid3_case14));
......
1115 1117
            sysmeta_case15.setObsoletedBy(pid2_case15);
1116 1118
            version = version.add(BigInteger.ONE);
1117 1119
            sysmeta_case15.setSerialVersion(version);
1118
            CNodeService.getInstance(request).updateSystemMetadata(session, pid1_case15, sysmeta_case15);
1120
            MNodeService.getInstance(request).updateSystemMetadata(session, pid1_case15, sysmeta_case15);
1119 1121
            //check
1120 1122
            meta = CNodeService.getInstance(request).getSystemMetadata(session, pid1_case15);
1121 1123
            assertTrue(meta.getObsoletedBy().equals(pid2_case15));
......
1152 1154
            sysmeta4_case15.setObsoletedBy(pid5_case15);
1153 1155
            version = version.add(BigInteger.ONE);
1154 1156
            sysmeta4_case15.setSerialVersion(version);
1155
            CNodeService.getInstance(request).updateSystemMetadata(session, pid4_case15, sysmeta4_case15);
1157
            MNodeService.getInstance(request).updateSystemMetadata(session, pid4_case15, sysmeta4_case15);
1156 1158
            
1157 1159
            CNodeService.getInstance(request).delete(session, pid3_case15);
1158 1160
            try {
......
1218 1220
            sysmeta2_case16.setObsoletedBy(pid3_case16);
1219 1221
            version = version.add(BigInteger.ONE);
1220 1222
            sysmeta2_case16.setSerialVersion(version);
1221
            CNodeService.getInstance(request).updateSystemMetadata(session, pid2_case16, sysmeta2_case16);
1223
            MNodeService.getInstance(request).updateSystemMetadata(session, pid2_case16, sysmeta2_case16);
1222 1224
            
1223 1225
            Thread.sleep(1000);
1224 1226
            object = new ByteArrayInputStream("test".getBytes("UTF-8"));
......
1289 1291
            sysmeta2_case17.setObsoletedBy(pid3_case17);
1290 1292
            version = version.add(BigInteger.ONE);
1291 1293
            sysmeta2_case17.setSerialVersion(version);
1292
            CNodeService.getInstance(request).updateSystemMetadata(session, pid2_case17, sysmeta2_case17);
1294
            MNodeService.getInstance(request).updateSystemMetadata(session, pid2_case17, sysmeta2_case17);
1293 1295
            
1294 1296
            Thread.sleep(1000);
1295 1297
            object = new ByteArrayInputStream("test".getBytes("UTF-8"));
......
1348 1350
            sysmeta_case18.setObsoletedBy(pid2_case18);
1349 1351
            version = version.add(BigInteger.ONE);
1350 1352
            sysmeta_case18.setSerialVersion(version);
1351
            CNodeService.getInstance(request).updateSystemMetadata(session, pid1_case18, sysmeta_case18);
1353
            MNodeService.getInstance(request).updateSystemMetadata(session, pid1_case18, sysmeta_case18);
1352 1354
                 
1353 1355
            Thread.sleep(1000);
1354 1356
            object = new ByteArrayInputStream("test".getBytes("UTF-8"));
......
1362 1364
            sysmeta2_case18.setObsoletedBy(pid3_case18);
1363 1365
            version = version.add(BigInteger.ONE);
1364 1366
            sysmeta2_case18.setSerialVersion(version);
1365
            CNodeService.getInstance(request).updateSystemMetadata(session, pid2_case18, sysmeta2_case18);
1367
            MNodeService.getInstance(request).updateSystemMetadata(session, pid2_case18, sysmeta2_case18);
1366 1368
            
1367 1369
            Thread.sleep(1000);
1368 1370
            object = new ByteArrayInputStream("test".getBytes("UTF-8"));
......
1385 1387
            sysmeta4_case18.setObsoletedBy(pid5_case18);
1386 1388
            version = version.add(BigInteger.ONE);
1387 1389
            sysmeta4_case18.setSerialVersion(version);
1388
            CNodeService.getInstance(request).updateSystemMetadata(session, pid4_case18, sysmeta4_case18);
1390
            MNodeService.getInstance(request).updateSystemMetadata(session, pid4_case18, sysmeta4_case18);
1389 1391
            
1390 1392
            CNodeService.getInstance(request).delete(session, pid3_case18);
1391 1393
            try {

Also available in: Unified diff