Skip to content

Commit 4870d32

Browse files
halla-imshalla-ims
committed
Updated code for new staging libraries.
1 parent 7131c48 commit 4870d32

File tree

7 files changed

+89
-47
lines changed

7 files changed

+89
-47
lines changed

‎TNMStagingCSharp/TNMStagingCSharp/Src/Staging/EOD/EodDataProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ namespace TNMStagingCSharp.Src.Staging.EOD
1212
public class EodVersion
1313
{
1414

15-
public static readonly EodVersion LATEST = new EodVersion("1.1");
16-
public static readonly EodVersion v1_1 = new EodVersion("1.1");
15+
public static readonly EodVersion LATEST = new EodVersion("1.2");
16+
public static readonly EodVersion v1_2 = new EodVersion("1.2");
1717

1818
public static IEnumerable<EodVersion> Values
1919
{
2020
get
2121
{
2222
yield return LATEST;
23-
yield return v1_1;
23+
yield return v1_2;
2424
}
2525
}
2626

‎TNMStagingCSharp/TNMStagingCSharp/Src/Staging/TNM/TnmDataProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ namespace TNMStagingCSharp.Src.Staging.TNM
1010
public class TnmVersion
1111
{
1212

13-
public static readonly TnmVersion LATEST = new TnmVersion("1.7");
14-
public static readonly TnmVersion v1_7 = new TnmVersion("1.7");
13+
public static readonly TnmVersion LATEST = new TnmVersion("1.8");
14+
public static readonly TnmVersion v1_8 = new TnmVersion("1.8");
1515

1616
public static IEnumerable<TnmVersion> Values
1717
{
1818
get
1919
{
2020
yield return LATEST;
21-
yield return v1_7;
21+
yield return v1_8;
2222
}
2323
}
2424

‎TNMStagingCSharp/TNMStaging_UnitTestApp/Src/Staging/CS/CSStagingTest.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,21 @@ public class CsStagingTest : StagingTest
1919

2020
private TestContext testContextInstance;
2121

22+
[ClassInitialize()]
23+
public static void ClassInit(TestContext context)
24+
{
25+
_STAGING = TNMStagingCSharp.Src.Staging.Staging.getInstance(CsDataProvider.getInstance(CsVersion.v020550));
26+
27+
/*
28+
String filename = "CS_02_05_50.zip";
29+
FileStream SourceStream = File.Open(filename, FileMode.Open);
30+
31+
ExternalStagingFileDataProvider provider = new ExternalStagingFileDataProvider(SourceStream);
32+
33+
_STAGING = TNMStagingCSharp.Src.Staging.Staging.getInstance(provider);
34+
*/
35+
}
36+
2237
/// <summary>
2338
/// Gets or sets the test context which provides
2439
/// information about and functionality for the current test run.
@@ -36,7 +51,7 @@ public override String getAlgorithm()
3651

3752
public override String getVersion()
3853
{
39-
return "02.05.50";
54+
return CsVersion.v020550.getVersion();
4055
}
4156

4257

@@ -45,21 +60,6 @@ public override StagingFileDataProvider getProvider()
4560
return CsDataProvider.getInstance(CsVersion.v020550);
4661
}
4762

48-
[ClassInitialize()]
49-
public static void ClassInit(TestContext context)
50-
{
51-
_STAGING = TNMStagingCSharp.Src.Staging.Staging.getInstance(CsDataProvider.getInstance(CsVersion.v020550));
52-
53-
/*
54-
String filename = "CS_02_05_50.zip";
55-
FileStream SourceStream = File.Open(filename, FileMode.Open);
56-
57-
ExternalStagingFileDataProvider provider = new ExternalStagingFileDataProvider(SourceStream);
58-
59-
_STAGING = TNMStagingCSharp.Src.Staging.Staging.getInstance(provider);
60-
*/
61-
}
62-
6363
[TestMethod]
6464
public void testBasicInitialization()
6565
{

‎TNMStagingCSharp/TNMStaging_UnitTestApp/Src/Staging/EOD/EodStagingTest.cs‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public override String getAlgorithm()
3131

3232
public override String getVersion()
3333
{
34-
return "1.1";
34+
return EodVersion.v1_2.getVersion();
3535
}
3636

3737

@@ -459,6 +459,53 @@ public void testEncoding()
459459
Assert.AreNotEqual(table.getNotes(), asciiString);
460460
}
461461

462+
[TestMethod]
463+
public void testContentReturnedForInvalidInput()
464+
{
465+
EodStagingData data = new EodStagingData.EodStagingInputBuilder()
466+
.withInput(EodInput.PRIMARY_SITE, "C713")
467+
.withInput(EodInput.HISTOLOGY, "8020")
468+
.withInput(EodInput.BEHAVIOR, "3")
469+
.withInput(EodInput.DX_YEAR, "2018")
470+
.withInput(EodInput.EOD_PRIMARY_TUMOR, "200")
471+
.withInput(EodInput.EOD_REGIONAL_NODES, "300")
472+
.withInput(EodInput.EOD_METS, "00").build();
473+
474+
// perform the staging
475+
_STAGING.stage(data);
476+
477+
Assert.AreEqual(StagingData.Result.STAGED, data.getResult());
478+
Assert.AreEqual("brain", data.getSchemaId());
479+
Assert.AreEqual(5, data.getErrors().Count);
480+
Assert.AreEqual(5, data.getPath().Count);
481+
Assert.AreEqual(8, data.getOutput().Count);
482+
Assert.AreEqual("1.2", data.getOutput(EodOutput.DERIVED_VERSION.toString()));
483+
}
484+
485+
[TestMethod]
486+
public void testContentNotReturnedForInvalidYear()
487+
{
488+
EodStagingData data = new EodStagingData.EodStagingInputBuilder()
489+
.withInput(EodInput.PRIMARY_SITE, "C713")
490+
.withInput(EodInput.HISTOLOGY, "8020")
491+
.withInput(EodInput.BEHAVIOR, "3")
492+
.withInput(EodInput.DX_YEAR, "2010")
493+
.withInput(EodInput.EOD_PRIMARY_TUMOR, "200")
494+
.withInput(EodInput.EOD_REGIONAL_NODES, "300")
495+
.withInput(EodInput.EOD_METS, "00").build();
496+
497+
// perform the staging
498+
_STAGING.stage(data);
499+
500+
Assert.AreEqual(StagingData.Result.FAILED_INVALID_YEAR_DX, data.getResult());
501+
Assert.AreEqual("brain", data.getSchemaId());
502+
Assert.AreEqual(0, data.getErrors().Count);
503+
Assert.AreEqual(0, data.getPath().Count);
504+
Assert.AreEqual(0, data.getOutput().Count);
505+
}
506+
507+
508+
462509
}
463510

464511
}

‎TNMStagingCSharp/TNMStaging_UnitTestApp/Src/Staging/ExternalStagingFileDataProviderTest.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using TNMStagingCSharp.Src.DecisionEngine;
44
using TNMStagingCSharp.Src.Staging;
55
using TNMStagingCSharp.Src.Staging.Entities;
6-
using TNMStagingCSharp.Src.Staging.CS;
76
using System.IO;
87
using System.Reflection;
98
using System.Collections.Generic;
@@ -54,7 +53,7 @@ public void testExternalLoad()
5453
Assert.AreEqual(62, involved.Count);
5554
Assert.IsTrue(involved.Contains("mets_eval_ipa"));
5655

57-
CsStagingData data = new CsStagingData();
56+
StagingData data = new StagingData();
5857
data.setInput("site", "C680");
5958
data.setInput("hist", "8000");
6059
data.setInput("behavior", "3");

‎TNMStagingCSharp/TNMStaging_UnitTestApp/Src/Staging/StagingTest.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
using TNMStagingCSharp.Src.DecisionEngine;
99
using TNMStagingCSharp.Src.Staging;
10-
using TNMStagingCSharp.Src.Staging.TNM;
11-
using TNMStagingCSharp.Src.Staging.CS;
1210
using TNMStagingCSharp.Src.Staging.Entities;
1311

1412

@@ -119,7 +117,7 @@ public void testGetTable()
119117
[TestMethod]
120118
public void testCachedSiteAndHistology()
121119
{
122-
TnmDataProvider provider = TnmDataProvider.getInstance(TnmVersion.LATEST);
120+
StagingDataProvider provider = getProvider();
123121
Assert.IsTrue(provider.getValidSites().Count > 0);
124122
Assert.IsTrue(provider.getValidHistologies().Count > 0);
125123

‎TNMStagingCSharp/TNMStaging_UnitTestApp/Src/Staging/TNM/TnmStagingTest.cs‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,20 @@ namespace TNMStaging_UnitTestApp.Src.Staging.TNM
1919
[TestClass]
2020
public class TnmStagingTest : StagingTest
2121
{
22-
private String sCurrentVersion = "1.7";
22+
[ClassInitialize()]
23+
public static void ClassInit(TestContext context)
24+
{
25+
_STAGING = TNMStagingCSharp.Src.Staging.Staging.getInstance(TnmDataProvider.getInstance(TnmVersion.LATEST));
26+
27+
/*
28+
String filename = "TNM_14.zip";
29+
FileStream SourceStream = File.Open(filename, FileMode.Open);
30+
31+
ExternalStagingFileDataProvider provider = new ExternalStagingFileDataProvider(SourceStream);
32+
33+
_STAGING = TNMStagingCSharp.Src.Staging.Staging.getInstance(provider);
34+
*/
35+
}
2336

2437
public override String getAlgorithm()
2538
{
@@ -29,29 +42,14 @@ public override String getAlgorithm()
2942

3043
public override String getVersion()
3144
{
32-
return sCurrentVersion;
45+
return TnmVersion.LATEST.getVersion();
3346
}
3447

3548
public override StagingFileDataProvider getProvider()
3649
{
3750
return TnmDataProvider.getInstance(TnmVersion.LATEST);
3851
}
3952

40-
[ClassInitialize()]
41-
public static void ClassInit(TestContext context)
42-
{
43-
_STAGING = TNMStagingCSharp.Src.Staging.Staging.getInstance(TnmDataProvider.getInstance(TnmVersion.LATEST));
44-
45-
/*
46-
String filename = "TNM_14.zip";
47-
FileStream SourceStream = File.Open(filename, FileMode.Open);
48-
49-
ExternalStagingFileDataProvider provider = new ExternalStagingFileDataProvider(SourceStream);
50-
51-
_STAGING = TNMStagingCSharp.Src.Staging.Staging.getInstance(provider);
52-
*/
53-
}
54-
5553
[TestMethod]
5654
public void testBasicInitialization()
5755
{
@@ -558,7 +556,7 @@ public void testExpectedOutput()
558556
String basedir = System.IO.Directory.GetCurrentDirectory() + "\\..\\..\\..\\";
559557
if (System.IO.Directory.GetCurrentDirectory().IndexOf("x64") >= 0) basedir += "\\..\\";
560558

561-
sCurrentVersion = "1.3";
559+
//String sCurrentVersion = "1.3";
562560
String sFilePath = basedir + "Resources\\Test\\TNM\\TNM_13.zip";
563561

564562
FileStream SourceStream = File.Open(sFilePath, FileMode.Open);
@@ -580,7 +578,7 @@ public void testExpectedOutput()
580578
decompressionStream.Close();
581579

582580
_STAGING = OLD_STAGING;
583-
sCurrentVersion = "1.5";
581+
//sCurrentVersion = "1.5";
584582

585583

586584
// make sure there were no errors returned

0 commit comments

Comments
 (0)