Skip to content

Commit d90469e

Browse files
committed
making tests run both on vanilla and android submodules - initial poc-level implementation
1 parent 7c67df1 commit d90469e

File tree

225 files changed

+31
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+31
-3
lines changed

tests/android/pom.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,31 @@
2323
<target>1.8</target>
2424
</configuration>
2525
</plugin>
26+
<plugin>
27+
<groupId>org.apache.maven.plugins</groupId>
28+
<artifactId>maven-surefire-plugin</artifactId>
29+
<version>2.15</version>
30+
<configuration>
31+
<dependenciesToScan>
32+
<dependency>org.everit.json:org.everit.json.schema.tests.vanilla</dependency>
33+
</dependenciesToScan>
34+
</configuration>
35+
36+
</plugin>
2637
</plugins>
2738
</build>
2839

2940
<dependencies>
41+
<dependency>
42+
<groupId>com.vaadin.external.google</groupId>
43+
<artifactId>android-json</artifactId>
44+
<version>0.0.20131108.vaadin1</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>${project.groupId}</groupId>
48+
<artifactId>org.everit.json.schema.tests.vanilla</artifactId>
49+
<version>${project.version}</version>
50+
</dependency>
3051
<dependency>
3152
<groupId>org.everit.json</groupId>
3253
<artifactId>org.everit.json.schema</artifactId>

tests/vanilla/pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<target>1.8</target>
2424
</configuration>
2525
</plugin>
26+
<plugin>
27+
<groupId>org.apache.maven.plugins</groupId>
28+
<artifactId>maven-surefire-plugin</artifactId>
29+
<configuration>
30+
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
31+
</configuration>
32+
</plugin>
2633
</plugins>
2734
</build>
2835

@@ -36,19 +43,19 @@
3643
<groupId>junit</groupId>
3744
<artifactId>junit</artifactId>
3845
<version>4.12</version>
39-
<scope>test</scope>
46+
<!--<scope>test</scope>-->
4047
</dependency>
4148
<dependency>
4249
<groupId>org.reflections</groupId>
4350
<artifactId>reflections</artifactId>
4451
<version>0.9.10</version>
45-
<scope>test</scope>
52+
<!--<scope>test</scope>-->
4653
</dependency>
4754
<dependency>
4855
<groupId>org.eclipse.jetty</groupId>
4956
<artifactId>jetty-server</artifactId>
5057
<version>9.3.4.RC0</version>
51-
<scope>test</scope>
58+
<!--<scope>test</scope>-->
5259
</dependency>
5360
<dependency>
5461
<groupId>org.eclipse.jetty</groupId>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)