Fixed surgery endpoint to match API changes

Author: ctmay4

src/main/java/com/imsweb/seerapi/client/surgery/SurgeryService.java

@@ -10,34 +10,25 @@
 import retrofit2.http.Path;
 import retrofit2.http.Query;
 
-import com.imsweb.seerapi.client.shared.Version;
-
 public interface SurgeryService {
 
     /**
-     * Return a collection of Version objects which describe the available versions
-     * @return a list of the available site-specific surgery versions and information about each of them
-     */
-    @GET("surgery/versions")
-    Call<List<Version>> versions();
-
-    /**
-     * Return a list of all the site-specific surgery table titles from a specific version
-     * @param version version
+     * Return a list of all the site-specific surgery table titles from a specific year
+     * @param year year
      * @return a list of site-specific surgery table titles
      */
-    @GET("surgery/{version}/tables")
-    Call<List<String>> tables(@Path("version") String version);
+    @GET("surgery/{year}/tables")
+    Call<List<String>> tables(@Path("year") String year);
 
     /**
-     * Return a specific site-specific surgary table from a specific version
-     * @param version version
+     * Return a specific site-specific surgary table from a specific year
+     * @param year year
      * @param title site title (optional if the site/histology is provided)
      * @param site primary site (optional if the title is provided)
      * @param histology histology (optional if the title is provided)
      * @return a site-specific surgery table
      */
-    @GET("surgery/{version}/table")
-    Call<SurgeryTable> table(@Path("version") String version, @Query("title") String title, @Query("site") String site, @Query("hist") String histology);
+    @GET("surgery/{year}/table")
+    Call<SurgeryTable> table(@Path("year") String year, @Query("title") String title, @Query("site") String site, @Query("hist") String histology);
 
 }

src/test/java/com/imsweb/seerapi/client/ndc/NdcTest.java

@@ -67,7 +67,7 @@ public void testNdcByCode() throws IOException {
         assertThat(product.getProprietaryName()).isEqualTo("Verzenio");
         assertThat(product.getSeerInfo()).as("must have 'seerinfo'").isNotNull();
         assertThat(product.getSeerInfo().getCategories()).containsExactly(Category.CHEMOTHERAPY);
-        assertThat(product.getSeerInfo().getMajorDrugClass()).startsWith("Cyclin dependent");
+        assertThat(product.getSeerInfo().getMajorDrugClass()).contains("Cyclin Dependent");
         assertThat(product.getSeerInfo().getMinorDrugClass()).isEqualTo("CDK 4/6");
 
         // the subcategory is being removed but still exists in production; the key should be ignored

src/test/java/com/imsweb/seerapi/client/surgery/SurgeryTest.java

@@ -10,13 +10,8 @@
 import org.junit.Test;
 
 import com.imsweb.seerapi.client.SeerApi;
-import com.imsweb.seerapi.client.shared.Version;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class SurgeryTest {
 
@@ -27,43 +22,33 @@ public static void setup() {
         _SURGERY = new SeerApi.Builder().connect().surgery();
     }
 
-    @Test
-    public void testSiteSpecificSurgeryVersions() throws IOException {
-        List<Version> versions = _SURGERY.versions().execute().body();
-
-        assertTrue(versions.size() > 0);
-        for (Version version : versions) {
-            assertTrue(version.getVersion().length() > 0);
-            assertTrue(version.getCount() > 0);
-        }
-    }
-
     @Test
     public void testSiteSpecificSurgeryTables() throws IOException {
         List<String> titles = _SURGERY.tables("2014").execute().body();
 
-        assertTrue(titles.size() > 0);
-        assertTrue(titles.contains("Oral Cavity"));
+        assertThat(titles).isNotEmpty();
+        assertThat(titles).containsAnyOf("Oral Cavity");
     }
 
     @Test
     public void testSiteSpecificSurgeryTable() throws IOException {
         SurgeryTable table = _SURGERY.table("2014", "Oral Cavity", null, null).execute().body();
 
-        assertNotNull(table);
-        assertEquals("Oral Cavity", table.getTitle());
-        assertNotNull(table.getSiteInclusions());
-        assertNotNull(table.getHistExclusions());
-        assertNull(table.getHistInclusions());
-        assertNotNull(table.getPreNote());
-        assertNull(table.getPostNote());
+        assertThat(table).isNotNull();
+        assertThat(table.getTitle()).isEqualTo("Oral Cavity");
+        assertThat(table.getSiteInclusions()).isNotNull();
+        assertThat(table.getHistExclusions()).isNotNull();
+        assertThat(table.getHistInclusions()).isNull();
+        assertThat(table.getPreNote()).isNotNull();
+        assertThat(table.getPostNote()).isNull();
+
         SurgeryRow row = table.getRows().get(0);
-        assertEquals("00", row.getCode());
-        assertNotNull(row.getDescription());
-        assertEquals(Integer.valueOf(0), row.getLevel());
-        assertFalse(row.getLineBreak());
+        assertThat(row.getCode()).isEqualTo("00");
+        assertThat(row.getDescription()).isNotNull();
+        assertThat(row.getLevel()).isEqualTo(Integer.valueOf(0));
+        assertThat(row.getLineBreak()).isFalse();
 
         table = _SURGERY.table("2014", null, "C001", "8000").execute().body();
-        assertEquals("Oral Cavity", table.getTitle());
+        assertThat(table.getTitle()).isEqualTo("Oral Cavity");
     }
 }