Mercurial > hg > orthanc

comparison UnitTestsSources/MultiThreadingTests.cpp @ 3658:2d90dd30858c storage-commitment

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
providing job ID to the IJob::Step() methods
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 10 Feb 2020 16:44:26 +0100
parents f6a73611ec5c
children 898903022836
comparison
equal deleted inserted replaced
3657:115f82775c46 3658:2d90dd30858c
99 99
100 virtual void Reset() ORTHANC_OVERRIDE 100 virtual void Reset() ORTHANC_OVERRIDE
101 { 101 {
102 } 102 }
103 103
104 virtual JobStepResult Step() ORTHANC_OVERRIDE 104 virtual JobStepResult Step(const std::string& jobId) ORTHANC_OVERRIDE
105 { 105 {
106 if (fails_) 106 if (fails_)
107 { 107 {
108 return JobStepResult::Failure(ErrorCode_ParameterOutOfRange, NULL); 108 return JobStepResult::Failure(ErrorCode_ParameterOutOfRange, NULL);
109 } 109 }
1043 job.SetDescription("description"); 1043 job.SetDescription("description");
1044 job.AddInstance("hello"); 1044 job.AddInstance("hello");
1045 job.AddInstance("nope"); 1045 job.AddInstance("nope");
1046 job.AddInstance("world"); 1046 job.AddInstance("world");
1047 job.SetPermissive(true); 1047 job.SetPermissive(true);
1048 ASSERT_THROW(job.Step(), OrthancException); // Not started yet 1048 ASSERT_THROW(job.Step("jobId"), OrthancException); // Not started yet
1049 ASSERT_FALSE(job.HasTrailingStep()); 1049 ASSERT_FALSE(job.HasTrailingStep());
1050 ASSERT_FALSE(job.IsTrailingStepDone()); 1050 ASSERT_FALSE(job.IsTrailingStepDone());
1051 job.Start(); 1051 job.Start();
1052 ASSERT_EQ(JobStepCode_Continue, job.Step().GetCode()); 1052 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
1053 ASSERT_EQ(JobStepCode_Continue, job.Step().GetCode()); 1053 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
1054 1054
1055 { 1055 {
1056 DummyUnserializer unserializer; 1056 DummyUnserializer unserializer;
1057 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1057 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1058 } 1058 }
1099 lock.AddInput(a, s2); 1099 lock.AddInput(a, s2);
1100 lock.SetDicomAssociationTimeout(200); 1100 lock.SetDicomAssociationTimeout(200);
1101 lock.SetTrailingOperationTimeout(300); 1101 lock.SetTrailingOperationTimeout(300);
1102 } 1102 }
1103 1103
1104 ASSERT_EQ(JobStepCode_Continue, job.Step().GetCode()); 1104 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
1105 1105
1106 { 1106 {
1107 GenericJobUnserializer unserializer; 1107 GenericJobUnserializer unserializer;
1108 ASSERT_TRUE(CheckIdempotentSerialization(unserializer, job)); 1108 ASSERT_TRUE(CheckIdempotentSerialization(unserializer, job));
1109 } 1109 }
1616 a = job.GetTargetStudyUid(); 1616 a = job.GetTargetStudyUid();
1617 ASSERT_TRUE(job.LookupTargetSeriesUid(b, series)); 1617 ASSERT_TRUE(job.LookupTargetSeriesUid(b, series));
1618 1618
1619 job.AddTrailingStep(); 1619 job.AddTrailingStep();
1620 job.Start(); 1620 job.Start();
1621 ASSERT_EQ(JobStepCode_Continue, job.Step().GetCode()); 1621 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
1622 ASSERT_EQ(JobStepCode_Success, job.Step().GetCode()); 1622 ASSERT_EQ(JobStepCode_Success, job.Step("jobId").GetCode());
1623 1623
1624 study2 = job.GetTargetStudy(); 1624 study2 = job.GetTargetStudy();
1625 ASSERT_FALSE(study2.empty()); 1625 ASSERT_FALSE(study2.empty());
1626 1626
1627 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1627 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1675 1675
1676 ASSERT_EQ(job.GetTargetStudy(), study); 1676 ASSERT_EQ(job.GetTargetStudy(), study);
1677 1677
1678 job.AddTrailingStep(); 1678 job.AddTrailingStep();
1679 job.Start(); 1679 job.Start();
1680 ASSERT_EQ(JobStepCode_Continue, job.Step().GetCode()); 1680 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
1681 ASSERT_EQ(JobStepCode_Success, job.Step().GetCode()); 1681 ASSERT_EQ(JobStepCode_Success, job.Step("jobId").GetCode());
1682 1682
1683 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1683 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1684 ASSERT_TRUE(job.Serialize(s)); 1684 ASSERT_TRUE(job.Serialize(s));
1685 } 1685 }
1686 1686
1744 { 1744 {
1745 DummyUnserializer unserializer; 1745 DummyUnserializer unserializer;
1746 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1746 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1747 } 1747 }
1748 1748
1749 ASSERT_EQ(JobStepCode_Success, job.Step().GetCode()); 1749 ASSERT_EQ(JobStepCode_Success, job.Step("jobId").GetCode());
1750 ASSERT_EQ(1u, job.GetPosition()); 1750 ASSERT_EQ(1u, job.GetPosition());
1751 ASSERT_FALSE(job.IsTrailingStepDone()); 1751 ASSERT_FALSE(job.IsTrailingStepDone());
1752 1752
1753 { 1753 {
1754 DummyUnserializer unserializer; 1754 DummyUnserializer unserializer;
1755 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1755 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1756 } 1756 }
1757 1757
1758 ASSERT_THROW(job.Step(), OrthancException); 1758 ASSERT_THROW(job.Step("jobId"), OrthancException);
1759 } 1759 }
1760 1760
1761 { 1761 {
1762 Json::Value s; 1762 Json::Value s;
1763 1763
1775 { 1775 {
1776 DummyUnserializer unserializer; 1776 DummyUnserializer unserializer;
1777 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1777 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1778 } 1778 }
1779 1779
1780 ASSERT_EQ(JobStepCode_Continue, job.Step().GetCode()); 1780 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
1781 ASSERT_EQ(1u, job.GetPosition()); 1781 ASSERT_EQ(1u, job.GetPosition());
1782 ASSERT_FALSE(job.IsTrailingStepDone()); 1782 ASSERT_FALSE(job.IsTrailingStepDone());
1783 1783
1784 { 1784 {
1785 DummyUnserializer unserializer; 1785 DummyUnserializer unserializer;
1786 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1786 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1787 } 1787 }
1788 1788
1789 ASSERT_EQ(JobStepCode_Success, job.Step().GetCode()); 1789 ASSERT_EQ(JobStepCode_Success, job.Step("jobId").GetCode());
1790 ASSERT_EQ(2u, job.GetPosition()); 1790 ASSERT_EQ(2u, job.GetPosition());
1791 ASSERT_FALSE(job.IsTrailingStepDone()); 1791 ASSERT_FALSE(job.IsTrailingStepDone());
1792 1792
1793 { 1793 {
1794 DummyUnserializer unserializer; 1794 DummyUnserializer unserializer;
1795 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1795 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1796 } 1796 }
1797 1797
1798 ASSERT_THROW(job.Step(), OrthancException); 1798 ASSERT_THROW(job.Step("jobId"), OrthancException);
1799 } 1799 }
1800 1800
1801 { 1801 {
1802 Json::Value s; 1802 Json::Value s;
1803 1803
1816 { 1816 {
1817 DummyUnserializer unserializer; 1817 DummyUnserializer unserializer;
1818 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1818 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1819 } 1819 }
1820 1820
1821 ASSERT_EQ(JobStepCode_Success, job.Step().GetCode()); 1821 ASSERT_EQ(JobStepCode_Success, job.Step("jobId").GetCode());
1822 ASSERT_EQ(1u, job.GetPosition()); 1822 ASSERT_EQ(1u, job.GetPosition());
1823 ASSERT_TRUE(job.IsTrailingStepDone()); 1823 ASSERT_TRUE(job.IsTrailingStepDone());
1824 1824
1825 { 1825 {
1826 DummyUnserializer unserializer; 1826 DummyUnserializer unserializer;
1827 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1827 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1828 } 1828 }
1829 1829
1830 ASSERT_THROW(job.Step(), OrthancException); 1830 ASSERT_THROW(job.Step("jobId"), OrthancException);
1831 } 1831 }
1832 1832
1833 { 1833 {
1834 Json::Value s; 1834 Json::Value s;
1835 1835
1850 { 1850 {
1851 DummyUnserializer unserializer; 1851 DummyUnserializer unserializer;
1852 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1852 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1853 } 1853 }
1854 1854
1855 ASSERT_EQ(JobStepCode_Continue, job.Step().GetCode()); 1855 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
1856 ASSERT_EQ(1u, job.GetPosition()); 1856 ASSERT_EQ(1u, job.GetPosition());
1857 ASSERT_FALSE(job.IsTrailingStepDone()); 1857 ASSERT_FALSE(job.IsTrailingStepDone());
1858 1858
1859 { 1859 {
1860 DummyUnserializer unserializer; 1860 DummyUnserializer unserializer;
1861 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1861 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1862 } 1862 }
1863 1863
1864 ASSERT_EQ(JobStepCode_Success, job.Step().GetCode()); 1864 ASSERT_EQ(JobStepCode_Success, job.Step("jobId").GetCode());
1865 ASSERT_EQ(2u, job.GetPosition()); 1865 ASSERT_EQ(2u, job.GetPosition());
1866 ASSERT_TRUE(job.IsTrailingStepDone()); 1866 ASSERT_TRUE(job.IsTrailingStepDone());
1867 1867
1868 { 1868 {
1869 DummyUnserializer unserializer; 1869 DummyUnserializer unserializer;
1870 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job)); 1870 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
1871 } 1871 }
1872 1872
1873 ASSERT_THROW(job.Step(), OrthancException); 1873 ASSERT_THROW(job.Step("jobId"), OrthancException);
1874 } 1874 }
1875 } 1875 }
1876 1876
1877 1877
1878 TEST(JobsSerialization, RemoteModalityParameters) 1878 TEST(JobsSerialization, RemoteModalityParameters)