Skip to content

Commit 998b68f

Browse files
ctmay4ctmay4
committed
Test cleanup.
1 parent cf31027 commit 998b68f

2 files changed

Lines changed: 71 additions & 70 deletions

File tree

‎build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
}
1111

1212
group = 'com.imsweb'
13-
version = '3.7'
13+
version = '3.8'
1414
description = 'Java client library for SEER*API'
1515

1616
println "Starting build using ${Jvm.current()}"
@@ -32,6 +32,7 @@ dependencies {
3232
compile 'com.squareup.retrofit2:converter-jackson:2.3.0'
3333

3434
testCompile 'junit:junit:4.11'
35+
testCompile 'org.assertj:assertj-core:3.9.0'
3536
}
3637

3738
jar {

‎src/test/java/com/imsweb/seerapi/client/staging/StagingTest.java‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
import com.imsweb.seerapi.client.SeerApi;
1313
import com.imsweb.seerapi.client.staging.cs.CsSchemaLookup;
1414

15-
import static org.junit.Assert.assertEquals;
16-
import static org.junit.Assert.assertTrue;
15+
import static org.assertj.core.api.Assertions.assertThat;
1716

1817
public class StagingTest {
1918

@@ -31,90 +30,89 @@ public static void setup() {
3130
public void testGetAlgorithms() throws IOException {
3231
List<StagingAlgorithm> algorithms = _STAGING.algorithms().execute().body();
3332

34-
assertTrue(algorithms.size() > 0);
33+
assertThat(algorithms).isNotEmpty().extracting("algorithm").contains("cs", "tnm", "eod_public");
3534
}
3635

3736
@Test
3837
public void testGetAlgorithmVersions() throws IOException {
3938
List<StagingVersion> versions = _STAGING.versions(_ALGORITHM).execute().body();
4039

41-
assertTrue(versions.size() > 0);
40+
assertThat(versions).isNotEmpty();
4241
}
4342

4443
@Test
4544
public void testListSchemas() throws IOException {
4645
List<StagingSchemaInfo> schemaInfos = _STAGING.schemas(_ALGORITHM, _VERSION).execute().body();
47-
assertTrue(schemaInfos.size() > 0);
46+
assertThat(schemaInfos).isNotEmpty();
4847

4948
schemaInfos = _STAGING.schemas(_ALGORITHM, _VERSION, "skin").execute().body();
50-
assertTrue(schemaInfos.size() > 0);
49+
assertThat(schemaInfos).isNotEmpty();
5150
}
5251

5352
@Test
5453
public void testSchemaLookup() throws IOException {
5554
// first test simple lookup that returns a single schema with site/hist only
5655
List<StagingSchemaInfo> schemas = _STAGING.schemaLookup(_ALGORITHM, _VERSION, new CsSchemaLookup("C509", "8000").getInputs()).execute().body();
57-
assertEquals(1, schemas.size());
58-
assertEquals("breast", schemas.get(0).getId());
56+
assertThat(schemas).hasSize(1).extracting("id").contains("breast");
5957

6058
// now test just site
6159
SchemaLookup data = new SchemaLookup();
6260
data.setInput(StagingData.PRIMARY_SITE_KEY, "C111");
63-
assertEquals(7, _STAGING.schemaLookup(_ALGORITHM, _VERSION, data.getInputs()).execute().body().size());
61+
assertThat(_STAGING.schemaLookup(_ALGORITHM, _VERSION, data.getInputs()).execute().body()).hasSize(7);
6462

6563
// add histology
6664
data.setInput(StagingData.HISTOLOGY_KEY, "8000");
67-
assertEquals(2, _STAGING.schemaLookup(_ALGORITHM, _VERSION, data.getInputs()).execute().body().size());
65+
assertThat(_STAGING.schemaLookup(_ALGORITHM, _VERSION, data.getInputs()).execute().body()).hasSize(2);
6866

6967
// add discriminator
7068
data.setInput("ssf25", "010");
7169
schemas = _STAGING.schemaLookup(_ALGORITHM, _VERSION, data.getInputs()).execute().body();
72-
assertEquals(1, schemas.size());
73-
assertEquals("nasopharynx", schemas.get(0).getId());
70+
assertThat(schemas).hasSize(1).extracting("id").contains("nasopharynx");
7471

7572
// test with the CsStaging class
7673
schemas = _STAGING.schemaLookup(_ALGORITHM, _VERSION, new CsSchemaLookup("C111", "8000", "010").getInputs()).execute().body();
77-
assertEquals(1, schemas.size());
78-
assertEquals("nasopharynx", schemas.get(0).getId());
74+
assertThat(schemas).hasSize(1).extracting("id").contains("nasopharynx");
7975
}
8076

8177
@Test
8278
public void testSchemaById() throws IOException {
8379
StagingSchema schema = _STAGING.schemaById(_ALGORITHM, _VERSION, "brain").execute().body();
8480

85-
assertEquals("cs", schema.getAlgorithm());
86-
assertEquals("02.05.50", schema.getVersion());
87-
assertEquals("brain", schema.getId());
81+
assertThat(schema).isNotNull();
82+
assertThat(schema.getAlgorithm()).isEqualTo("cs");
83+
assertThat(schema.getVersion()).isEqualTo("02.05.50");
84+
assertThat(schema.getId()).isEqualTo("brain");
8885
}
8986

9087
@Test
9188
public void testSchemaInvolvedTables() throws IOException {
9289
List<StagingTable> tables = _STAGING.involvedTables(_ALGORITHM, _VERSION, "brain").execute().body();
9390

94-
assertTrue(tables.size() > 0);
91+
assertThat(tables).isNotEmpty();
9592
}
9693

9794
@Test
9895
public void testListTables() throws IOException {
9996
List<StagingTable> tables = _STAGING.tables(_ALGORITHM, _VERSION, "ssf1").execute().body();
10097

101-
assertTrue(tables.size() > 0);
98+
assertThat(tables).isNotEmpty();
10299
}
103100

104101
@Test
105102
public void testTableById() throws IOException {
106103
StagingTable table = _STAGING.tableById(_ALGORITHM, _VERSION, "primary_site").execute().body();
107104

108-
assertEquals("cs", table.getAlgorithm());
109-
assertEquals("02.05.50", table.getVersion());
110-
assertEquals("primary_site", table.getId());
105+
assertThat(table).isNotNull();
106+
assertThat(table.getAlgorithm()).isEqualTo("cs");
107+
assertThat(table.getVersion()).isEqualTo("02.05.50");
108+
assertThat(table.getId()).isEqualTo("primary_site");
111109
}
112110

113111
@Test
114112
public void testTableInvoledSchemas() throws IOException {
115113
List<StagingSchema> schemas = _STAGING.involvedSchemas(_ALGORITHM, _VERSION, "extension_baa").execute().body();
116114

117-
assertTrue(schemas.size() > 0);
115+
assertThat(schemas).isNotEmpty();
118116
}
119117

120118
@Test
@@ -143,58 +141,59 @@ public void testStaging() throws IOException {
143141
// perform the staging
144142
StagingData output = _STAGING.stage(_ALGORITHM, _VERSION, data.getInput()).execute().body();
145143

146-
assertEquals(StagingData.Result.STAGED, output.getResult());
147-
assertEquals(0, output.getErrors().size());
148-
assertEquals(37, output.getPath().size());
144+
assertThat(output).isNotNull();
145+
assertThat(output.getResult()).isEqualTo(StagingData.Result.STAGED);
146+
assertThat(output.getErrors()).isEmpty();
147+
assertThat(output.getPath()).hasSize(37);
149148

150149
// check output
151-
assertEquals("129", output.getOutput("schema_number"));
152-
assertEquals("urethra", output.getSchemaId());
153-
assertEquals("020550", output.getOutput("csver_derived"));
150+
assertThat(output.getOutput("schema_number")).isEqualTo("129");
151+
assertThat(output.getSchemaId()).isEqualTo("urethra");
152+
assertThat(output.getOutput("csver_derived")).isEqualTo("020550");
154153

155154
// AJCC 6
156-
assertEquals("T1", output.getOutput("ajcc6_t"));
157-
assertEquals("10", output.getOutput("stor_ajcc6_t"));
158-
assertEquals("c", output.getOutput("ajcc6_tdescriptor"));
159-
assertEquals("c", output.getOutput("stor_ajcc6_tdescriptor"));
160-
assertEquals("N1", output.getOutput("ajcc6_n"));
161-
assertEquals("10", output.getOutput("stor_ajcc6_n"));
162-
assertEquals("c", output.getOutput("ajcc6_ndescriptor"));
163-
assertEquals("c", output.getOutput("stor_ajcc6_ndescriptor"));
164-
assertEquals("M1", output.getOutput("ajcc6_m"));
165-
assertEquals("10", output.getOutput("stor_ajcc6_m"));
166-
assertEquals("c", output.getOutput("ajcc6_mdescriptor"));
167-
assertEquals("c", output.getOutput("stor_ajcc6_mdescriptor"));
168-
assertEquals("IV", output.getOutput("ajcc6_stage"));
169-
assertEquals("70", output.getOutput("stor_ajcc6_stage"));
155+
assertThat(output.getOutput("ajcc6_t")).isEqualTo("T1");
156+
assertThat(output.getOutput("stor_ajcc6_t")).isEqualTo("10");
157+
assertThat(output.getOutput("ajcc6_tdescriptor")).isEqualTo("c");
158+
assertThat(output.getOutput("stor_ajcc6_tdescriptor")).isEqualTo("c");
159+
assertThat(output.getOutput("ajcc6_n")).isEqualTo("N1");
160+
assertThat(output.getOutput("stor_ajcc6_n")).isEqualTo("10");
161+
assertThat(output.getOutput("ajcc6_ndescriptor")).isEqualTo("c");
162+
assertThat(output.getOutput("stor_ajcc6_ndescriptor")).isEqualTo("c");
163+
assertThat(output.getOutput("ajcc6_m")).isEqualTo("M1");
164+
assertThat(output.getOutput("stor_ajcc6_m")).isEqualTo("10");
165+
assertThat(output.getOutput("ajcc6_mdescriptor")).isEqualTo("c");
166+
assertThat(output.getOutput("stor_ajcc6_mdescriptor")).isEqualTo("c");
167+
assertThat(output.getOutput("ajcc6_stage")).isEqualTo("IV");
168+
assertThat(output.getOutput("stor_ajcc6_stage")).isEqualTo("70");
170169

171170
// AJCC 7
172-
assertEquals("T1", output.getOutput("ajcc7_t"));
173-
assertEquals("100", output.getOutput("stor_ajcc7_t"));
174-
assertEquals("c", output.getOutput("ajcc7_tdescriptor"));
175-
assertEquals("c", output.getOutput("stor_ajcc7_tdescriptor"));
176-
assertEquals("N1", output.getOutput("ajcc7_n"));
177-
assertEquals("100", output.getOutput("stor_ajcc7_n"));
178-
assertEquals("c", output.getOutput("ajcc7_ndescriptor"));
179-
assertEquals("c", output.getOutput("stor_ajcc7_ndescriptor"));
180-
assertEquals("M1", output.getOutput("ajcc7_m"));
181-
assertEquals("100", output.getOutput("stor_ajcc7_m"));
182-
assertEquals("c", output.getOutput("ajcc7_mdescriptor"));
183-
assertEquals("c", output.getOutput("stor_ajcc7_mdescriptor"));
184-
assertEquals("IV", output.getOutput("ajcc7_stage"));
185-
assertEquals("700", output.getOutput("stor_ajcc7_stage"));
171+
assertThat(output.getOutput("ajcc7_t")).isEqualTo("T1");
172+
assertThat(output.getOutput("stor_ajcc7_t")).isEqualTo("100");
173+
assertThat(output.getOutput("ajcc7_tdescriptor")).isEqualTo("c");
174+
assertThat(output.getOutput("stor_ajcc7_tdescriptor")).isEqualTo("c");
175+
assertThat(output.getOutput("ajcc7_n")).isEqualTo("N1");
176+
assertThat(output.getOutput("stor_ajcc7_n")).isEqualTo("100");
177+
assertThat(output.getOutput("ajcc7_ndescriptor")).isEqualTo("c");
178+
assertThat(output.getOutput("stor_ajcc7_ndescriptor")).isEqualTo("c");
179+
assertThat(output.getOutput("ajcc7_m")).isEqualTo("M1");
180+
assertThat(output.getOutput("stor_ajcc7_m")).isEqualTo("100");
181+
assertThat(output.getOutput("ajcc7_mdescriptor")).isEqualTo("c");
182+
assertThat(output.getOutput("stor_ajcc7_mdescriptor")).isEqualTo("c");
183+
assertThat(output.getOutput("ajcc7_stage")).isEqualTo("IV");
184+
assertThat(output.getOutput("stor_ajcc7_stage")).isEqualTo("700");
186185

187186
// Summary Stage
188-
assertEquals("L", output.getOutput("t77"));
189-
assertEquals("RN", output.getOutput("n77"));
190-
assertEquals("D", output.getOutput("m77"));
191-
assertEquals("D", output.getOutput("ss77"));
192-
assertEquals("7", output.getOutput("stor_ss77"));
193-
assertEquals("L", output.getOutput("t2000"));
194-
assertEquals("RN", output.getOutput("n2000"));
195-
assertEquals("D", output.getOutput("m2000"));
196-
assertEquals("D", output.getOutput("ss2000"));
197-
assertEquals("7", output.getOutput("stor_ss2000"));
187+
assertThat(output.getOutput("t77")).isEqualTo("L");
188+
assertThat(output.getOutput("n77")).isEqualTo("RN");
189+
assertThat(output.getOutput("m77")).isEqualTo("D");
190+
assertThat(output.getOutput("ss77")).isEqualTo("D");
191+
assertThat(output.getOutput("stor_ss77")).isEqualTo("7");
192+
assertThat(output.getOutput("t2000")).isEqualTo("L");
193+
assertThat(output.getOutput("n2000")).isEqualTo("RN");
194+
assertThat(output.getOutput("m2000")).isEqualTo("D");
195+
assertThat(output.getOutput("ss2000")).isEqualTo("D");
196+
assertThat(output.getOutput("stor_ss2000")).isEqualTo("7");
198197
}
199198

200199
@Test
@@ -208,8 +207,9 @@ public void testStagingWithErrors() throws IOException {
208207
// perform the staging
209208
StagingData output = _STAGING.stage(_ALGORITHM, _VERSION, data.getInput()).execute().body();
210209

211-
assertEquals(StagingData.Result.STAGED, output.getResult());
212-
assertEquals(9, output.getErrors().size());
210+
assertThat(output).isNotNull();
211+
assertThat(output.getResult()).isEqualTo(StagingData.Result.STAGED);
212+
assertThat(output.getErrors()).hasSize(9);
213213
}
214214

215215
}

0 commit comments

Comments
 (0)