Skip to content

Commit c73c5f4

Browse files
committed
fix client tests by loading overview.json in relative path instead of trying to access it as a resource
1 parent fba29fe commit c73c5f4

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/AndroidClient/client/client.iml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
2222
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
2323
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
24-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
24+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
2525
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
2626
<excludeFolder url="file://$MODULE_DIR$/build" />
2727
</content>
@@ -34,5 +34,8 @@
3434
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
3535
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
3636
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
37+
<orderEntry type="library" exported="" name="client.client-1.0.20" level="project" />
38+
<orderEntry type="library" exported="" name="client.client-1.0.20-sources" level="project" />
39+
<orderEntry type="library" exported="" name="client.client-1.0.20-javadoc" level="project" />
3740
</component>
3841
</module>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ public void test_Can_deserialize_Full_Option() {
115115
}
116116

117117
public void test_Can_deserialize_Overview() throws IOException {
118-
119118
//Latest Android Update broke test resources
120-
//InputStream is = TechStacksServiceTests.class.getResourceAsStream("/overview.json");
121-
//String json = Utils.readToEnd(is, "UTF-8");
122-
String json = Utils.readToEnd(new FileInputStream("C:\\src\\ServiceStack.Java\\src\\AndroidClient\\client\\src\\test\\resources\\overview.json"), "UTF-8");
119+
// InputStream stream = this.getClass().getClassLoader().getResourceAsStream("overview.json");
120+
// String json = Utils.readToEnd(stream, "UTF-8");
121+
122+
String json = Utils.readToEnd(new FileInputStream("src\\test\\res\\overview.json"), "UTF-8");
123123

124124
OverviewResponse dto = (OverviewResponse)client.fromJson(json, OverviewResponse.class);
125125

src/AndroidClient/client/src/test/resources/overview.json renamed to src/AndroidClient/client/src/test/res/overview.json

File renamed without changes.

0 commit comments

Comments
 (0)