Skip to content

Commit dba363c

Browse files
committed
Update with latest overview.json + fix test
1 parent f647700 commit dba363c

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

src/AndroidClient/client/src/test/java/net/servicestack/client/TechStacksServiceTests.java

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -116,29 +116,30 @@ public void test_Can_deserialize_Full_Option() {
116116
}
117117

118118
public void test_Can_deserialize_Overview() throws IOException {
119-
//Latest Android Update broke test resources
120-
// InputStream stream = this.getClass().getClassLoader().getResourceAsStream("overview.json");
121-
// String json = Utils.readToEnd(stream, "UTF-8");
119+
//Latest Android Update broke test resources
120+
InputStream stream = this.getClass().getClassLoader().getResourceAsStream("overview.json");
121+
String json = Utils.readToEnd(stream, "UTF-8");
122+
122123
// Works from gradle -> test or check as they run 'processTestResources' that copy resources into build directory
123-
String projFolder = getClass().getClassLoader().getResource("").getPath().replace("build/classes/test/","");
124-
String overviewPath = projFolder + "src/test/resources/overview.json";
125-
String json = Utils.readToEnd(new FileInputStream(overviewPath), "UTF-8");
124+
// String projFolder = getClass().getClassLoader().getResource("").getPath().replace("build/classes/test/","");
125+
// String overviewPath = projFolder + "src/test/resources/overview.json";
126+
// String json = Utils.readToEnd(new FileInputStream(overviewPath), "UTF-8");
126127

127128
OverviewResponse dto = (OverviewResponse)client.fromJson(json, OverviewResponse.class);
128129

129-
assertEquals(6, dto.getTopUsers().size());
130+
assertEquals(20, dto.getTopUsers().size());
130131
assertEquals("demisbellot", dto.getTopUsers().get(0).getUserName());
131-
assertEquals("http:\\/\\/pbs.twimg.com\\/profile_images\\/1765666853\\/image1326949938_normal.png", dto.getTopUsers().get(0).getAvatarUrl());
132-
assertEquals(61, (int)dto.getTopUsers().get(0).getStacksCount());
132+
assertEquals("http://pbs.twimg.com/profile_images/1765666853/image1326949938_normal.png", dto.getTopUsers().get(0).getAvatarUrl());
133+
assertEquals(95, (int)dto.getTopUsers().get(0).getStacksCount());
133134

134135

135-
assertEquals(20 ,dto.getTopTechnologies().size());
136+
assertEquals(50 ,dto.getTopTechnologies().size());
136137
TechnologyInfo topTech = dto.getTopTechnologies().get(0);
137138
assertEquals(TechnologyTier.Data, topTech.getTier());
138139
assertEquals("redis", topTech.getSlug());
139140
assertEquals("Redis", topTech.getName());
140141
assertEquals("https://raw.githubusercontent.com/ServiceStack/Assets/master/img/livedemos/techstacks/redis-logo.png", topTech.getLogoUrl());
141-
assertEquals(35, (int)topTech.getStacksCount());
142+
assertEquals(73, (int)topTech.getStacksCount());
142143

143144

144145
ArrayList<TechStackDetails> latestStacks = dto.getLatestTechStacks();
@@ -148,33 +149,33 @@ public void test_Can_deserialize_Overview() throws IOException {
148149
assertEquals(1, (long)techstacks.getId());
149150
assertEquals("TechStacks Website", techstacks.getName());
150151
assertEquals("ServiceStack", techstacks.getVendorName());
151-
assertTrue(techstacks.description.startsWith("This Website! "));
152-
assertEquals("http://techstacks.io", techstacks.getAppUrl());
152+
assertTrue(techstacks.description.startsWith("The original TechStacks Website"));
153+
assertEquals("http://angular.techstacks.io", techstacks.getAppUrl());
153154
assertEquals("https://raw.githubusercontent.com/ServiceStack/Assets/master/img/livedemos/techstacks/screenshots/techstacks.png", techstacks.getScreenshotUrl());
154155
assertEquals(Utils.parseDate("2015-01-01T17:33:58.9892560"), techstacks.getCreated());
155156
assertEquals("layoric", techstacks.getCreatedBy());
156-
assertEquals(Utils.parseDate("2015-01-12T23:34:12.4516410"), techstacks.getLastModified());
157-
assertEquals("layoric", techstacks.getLastModifiedBy());
157+
assertEquals(Utils.parseDate("2018-03-23T03:18:38.9958030"), techstacks.getLastModified());
158+
assertEquals("mythz", techstacks.getLastModifiedBy());
158159
assertTrue(techstacks.getIsLocked());
159160
assertEquals("2", techstacks.getOwnerId());
160161
assertEquals("techstacks-website", techstacks.getSlug());
161-
assertEquals(Utils.parseDate("2015-01-12T23:34:12.4516410"), techstacks.getLastStatusUpdate());
162+
assertEquals(Utils.parseDate("2018-03-23T03:12:44.0426320"), techstacks.getLastStatusUpdate());
162163

163164
ArrayList<TechnologyInStack> techstackChoices = techstacks.getTechnologyChoices();
164-
assertEquals(10, techstackChoices.size());
165+
assertEquals(11, techstackChoices.size());
165166
TechnologyInStack techChoice = techstackChoices.get(0);
166167
assertEquals(1, (long)techChoice.getTechnologyId());
167168
assertEquals(1, (long)techChoice.getTechnologyStackId());
168169
assertEquals(2, (long)techChoice.getId());
169170
assertEquals("ServiceStack", techChoice.getName());
170-
assertEquals("Service Stack", techChoice.getVendorName());
171+
assertEquals("ServiceStack", techChoice.getVendorName());
171172
assertEquals("https://servicestack.net", techChoice.getVendorUrl());
172173
assertEquals("https://servicestack.net", techChoice.getProductUrl());
173174
assertEquals("https://raw.githubusercontent.com/ServiceStack/Assets/master/img/livedemos/techstacks/servicestack-logo.png", techChoice.getLogoUrl());
174175
assertEquals(Utils.parseDate("2014-12-28T08:49:20.9542550"), techChoice.getCreated());
175176
assertEquals("demisbellot", techChoice.getCreatedBy());
176-
assertEquals(Utils.parseDate("2014-12-28T08:49:20.9542550"), techChoice.getLastModified());
177-
assertEquals("demisbellot", techChoice.getLastModifiedBy());
177+
assertEquals(Utils.parseDate("2018-03-14T06:01:13.9571660"), techChoice.getLastModified());
178+
assertEquals("mythz", techChoice.getLastModifiedBy());
178179
assertEquals("1", techChoice.getOwnerId());
179180
assertEquals("servicestack", techChoice.getSlug());
180181
assertTrue(techChoice.isLogoApproved());
@@ -183,14 +184,14 @@ public void test_Can_deserialize_Overview() throws IOException {
183184

184185

185186
assertEquals(9, dto.getTopTechnologiesByTier().size());
186-
ArrayList<TechnologyInfo> langs = dto.getTopTechnologiesByTier().get(TechnologyTier.ProgrammingLanguage);
187-
assertEquals(3, langs.size());
187+
ArrayList<TechnologyInfo> langs = dto.getTopTechnologiesByTier().get(TechnologyTier.ProgrammingLanguage.toString());
188+
assertEquals(5, langs.size());
188189
TechnologyInfo lang = langs.get(0);
189190
assertEquals(TechnologyTier.ProgrammingLanguage, lang.getTier());
190191
assertEquals("python", lang.getSlug());
191192
assertEquals("Python", lang.getName());
192193
assertEquals("https://raw.githubusercontent.com/ServiceStack/Assets/master/img/livedemos/techstacks/python-logo.png", lang.getLogoUrl());
193-
assertEquals(25, (int)lang.getStacksCount());
194+
assertEquals(47, (int)lang.getStacksCount());
194195

195196
// let toJson = dto.toJson()
196197
// println(toJson)

src/AndroidClient/client/src/test/resources/overview.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)