Skip to content

Commit d7b6ea2

Browse files
ajoberstarajoberstar
committed
Update to work with JUnit Platform 1.1.0
1 parent 246ff3d commit d7b6ea2

File tree

10 files changed

+47
-46
lines changed

10 files changed

+47
-46
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ insert_final_newline = true
99
trim_trailing_whitespace = true
1010
charset = utf-8
1111
indent_style = space
12-
indent_size = 4
12+
indent_size = 2
1313

1414
# Clojure dialect settings
1515
[*.{clj,cljc,cljs}]
1616
indent_style = space
17-
indent_size = 2
17+
indent_size = 2

‎jovial-engine-clojure.test/build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ plugins {
44
}
55

66
dependencies {
7-
compile 'org.junit.platform:junit-platform-engine:1.0.0-M1'
7+
compile 'org.junit.platform:junit-platform-engine:1.1.0'
88
compile 'org.clojure:clojure:1.9.0'
99
compile project(':jovial-lang-clojure')
1010

1111
testCompile 'junit:junit:4.12'
12-
testCompile 'org.junit.platform:junit-platform-launcher:1.0.0-M1'
12+
testCompile 'org.junit.platform:junit-platform-launcher:1.1.0'
1313
}
1414

1515
test {
16-
systemProperty "classpath.roots", classpath.asPath
16+
classpath += files('src/test/samples')
17+
systemProperty "classpath.roots", file('src/test/samples')
1718
}

‎jovial-engine-clojure.test/src/main/java/org/ajoberstar/jovial/engine/clojure_test/ClojureNamespaceDescriptor.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import clojure.lang.Namespace;
1919
import java.util.Set;
2020
import org.ajoberstar.jovial.lang.clojure.util.SimpleClojure;
21+
import org.junit.platform.engine.TestDescriptor.Type;
2122
import org.junit.platform.engine.TestTag;
2223
import org.junit.platform.engine.UniqueId;
2324
import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
@@ -27,24 +28,21 @@ public class ClojureNamespaceDescriptor extends AbstractTestDescriptor {
2728
private final Set<TestTag> tags;
2829

2930
public ClojureNamespaceDescriptor(UniqueId id, Namespace ns) {
30-
super(id, ns.toString());
31+
super(
32+
id,
33+
ns.toString(),
34+
SimpleClojure.invoke("org.ajoberstar.jovial.lang.clojure", "ns-source", ns));
3135
this.ns = ns;
3236
this.tags = SimpleClojure.invoke("org.ajoberstar.jovial.lang.clojure", "tags", ns);
33-
setSource(SimpleClojure.invoke("org.ajoberstar.jovial.lang.clojure", "ns-source", ns));
3437
}
3538

3639
public Namespace getNamespace() {
3740
return ns;
3841
}
3942

4043
@Override
41-
public boolean isContainer() {
42-
return true;
43-
}
44-
45-
@Override
46-
public boolean isTest() {
47-
return false;
44+
public Type getType() {
45+
return Type.CONTAINER;
4846
}
4947

5048
@Override

‎jovial-engine-clojure.test/src/main/java/org/ajoberstar/jovial/engine/clojure_test/ClojureVarDescriptor.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,22 @@
1919
import clojure.lang.Var;
2020
import java.util.Set;
2121
import org.ajoberstar.jovial.lang.clojure.util.SimpleClojure;
22+
import org.junit.platform.engine.TestDescriptor.Type;
2223
import org.junit.platform.engine.TestTag;
2324
import org.junit.platform.engine.UniqueId;
2425
import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
2526

26-
public class ClojureVarDescriptor extends AbstractTestDescriptor {
27+
public final class ClojureVarDescriptor extends AbstractTestDescriptor {
2728
private final Var var;
2829
private final Set<TestTag> tags;
2930

3031
public ClojureVarDescriptor(UniqueId id, Var var) {
31-
super(id, var.sym.getName());
32+
super(
33+
id,
34+
var.sym.getName(),
35+
SimpleClojure.invoke("org.ajoberstar.jovial.lang.clojure", "var-source", var));
3236
this.var = var;
3337
this.tags = SimpleClojure.invoke("org.ajoberstar.jovial.lang.clojure", "tags", var);
34-
setSource(SimpleClojure.invoke("org.ajoberstar.jovial.lang.clojure", "var-source", var));
3538
}
3639

3740
public Var getVar() {
@@ -43,13 +46,8 @@ public Namespace getNamespace() {
4346
}
4447

4548
@Override
46-
public boolean isContainer() {
47-
return false;
48-
}
49-
50-
@Override
51-
public boolean isTest() {
52-
return true;
49+
public Type getType() {
50+
return Type.TEST;
5351
}
5452

5553
@Override

‎jovial-engine-clojure.test/src/test/java/org/ajoberstar/jovial/engine/clojure_test/ClojureTestEngineTest.java‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
2424

2525
import java.io.File;
26+
import java.nio.file.Path;
27+
import java.nio.file.Paths;
2628
import java.util.Arrays;
2729
import java.util.HashMap;
2830
import java.util.List;
@@ -40,9 +42,9 @@
4042
public class ClojureTestEngineTest {
4143
@Test
4244
public void selectingByClasspathDir() {
43-
Set<File> roots =
45+
Set<Path> roots =
4446
Arrays.stream(System.getProperty("classpath.roots").split(File.pathSeparator))
45-
.map(File::new)
47+
.map(Paths::get)
4648
.collect(Collectors.toSet());
4749

4850
EngineDiscoveryRequest request =
@@ -63,7 +65,7 @@ public void selectingByClasspathDir() {
6365
TestDescriptor descriptor = new ClojureTestEngine().discover(request, root);
6466
List<UniqueId> actualIds =
6567
descriptor
66-
.getAllDescendants()
68+
.getDescendants()
6769
.stream()
6870
.map(TestDescriptor::getUniqueId)
6971
.collect(Collectors.toList());
@@ -90,7 +92,7 @@ public void selectingByNamespace() {
9092
TestDescriptor descriptor = new ClojureTestEngine().discover(request, root);
9193
List<UniqueId> actualIds =
9294
descriptor
93-
.getAllDescendants()
95+
.getDescendants()
9496
.stream()
9597
.map(TestDescriptor::getUniqueId)
9698
.collect(Collectors.toList());
@@ -115,7 +117,7 @@ public void selectingByVar() {
115117
TestDescriptor descriptor = new ClojureTestEngine().discover(request, root);
116118
List<UniqueId> actualIds =
117119
descriptor
118-
.getAllDescendants()
120+
.getDescendants()
119121
.stream()
120122
.map(TestDescriptor::getUniqueId)
121123
.collect(Collectors.toList());
@@ -144,7 +146,7 @@ public void selectingTestByUniqueId() {
144146
TestDescriptor descriptor = new ClojureTestEngine().discover(request, root);
145147
List<UniqueId> actualIds =
146148
descriptor
147-
.getAllDescendants()
149+
.getDescendants()
148150
.stream()
149151
.map(TestDescriptor::getUniqueId)
150152
.collect(Collectors.toList());
@@ -173,7 +175,7 @@ public void selectingContainerByUniqueId() {
173175
TestDescriptor descriptor = new ClojureTestEngine().discover(request, root);
174176
List<UniqueId> actualIds =
175177
descriptor
176-
.getAllDescendants()
178+
.getDescendants()
177179
.stream()
178180
.map(TestDescriptor::getUniqueId)
179181
.collect(Collectors.toList());
@@ -183,9 +185,9 @@ public void selectingContainerByUniqueId() {
183185

184186
@Test
185187
public void filteringByNamespace() {
186-
Set<File> roots =
188+
Set<Path> roots =
187189
Arrays.stream(System.getProperty("classpath.roots").split(File.pathSeparator))
188-
.map(File::new)
190+
.map(Paths::get)
189191
.collect(Collectors.toSet());
190192

191193
EngineDiscoveryRequest request =
@@ -206,7 +208,7 @@ public void filteringByNamespace() {
206208
TestDescriptor descriptor = new ClojureTestEngine().discover(request, root);
207209
List<UniqueId> actualIds =
208210
descriptor
209-
.getAllDescendants()
211+
.getDescendants()
210212
.stream()
211213
.map(TestDescriptor::getUniqueId)
212214
.collect(Collectors.toList());
@@ -216,9 +218,9 @@ public void filteringByNamespace() {
216218

217219
@Test
218220
public void getsTagsFromMetadata() {
219-
Set<File> roots =
221+
Set<Path> roots =
220222
Arrays.stream(System.getProperty("classpath.roots").split(File.pathSeparator))
221-
.map(File::new)
223+
.map(Paths::get)
222224
.collect(Collectors.toSet());
223225

224226
EngineDiscoveryRequest request =
@@ -245,7 +247,7 @@ public void getsTagsFromMetadata() {
245247
TestDescriptor descriptor = new ClojureTestEngine().discover(request, root);
246248
Map<UniqueId, Set<TestTag>> actualTags =
247249
descriptor
248-
.getAllDescendants()
250+
.getDescendants()
249251
.stream()
250252
.collect(Collectors.toMap(TestDescriptor::getUniqueId, TestDescriptor::getTags));
251253

‎jovial-engine-clojure.test/src/test/resources/sample/core_test.clj‎ renamed to ‎jovial-engine-clojure.test/src/test/samples/sample/core_test.clj‎

File renamed without changes.

‎jovial-engine-clojure.test/src/test/resources/sample/other_test.clj‎ renamed to ‎jovial-engine-clojure.test/src/test/samples/sample/other_test.clj‎

File renamed without changes.

‎jovial-lang-clojure/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
dependencies {
7-
compile 'org.junit.platform:junit-platform-engine:1.0.0-M1'
7+
compile 'org.junit.platform:junit-platform-engine:1.1.0'
88
compile 'org.clojure:clojure:1.9.0'
99
compile 'org.clojure:tools.namespace:0.2.11'
1010

‎jovial-lang-clojure/src/main/clojure/org/ajoberstar/jovial/lang/clojure.clj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747

4848
(defn var-source [var]
4949
(let [{:keys [ns name file line column]} (meta var)
50-
file-pos (if (and line column) (FilePosition. line column))
51-
file (if file (FileSource. (io/file *root-dir* file) file-pos))
50+
file-pos (if (and line column) (FilePosition/from line column))
51+
file (if file (FileSource/from (io/file *root-dir* file) file-pos))
5252
var (->ClojureVarSource (str ns) (str name))]
5353
(if file
54-
(CompositeTestSource. [var file])
54+
(CompositeTestSource/from [var file])
5555
var)))
5656

5757
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

‎jovial-lang-clojure/src/main/clojure/org/ajoberstar/jovial/lang/clojure/impl/discovery.clj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
[clojure.string :as str])
66
(:import (clojure.lang Var Namespace)
77
(java.io File)
8-
(java.nio.file Path)
8+
(java.nio.file Path Paths)
9+
(java.net URI)
910
(org.ajoberstar.jovial.lang.clojure VarSelector NamespaceSelector NamespaceFilter)
1011
(org.junit.platform.engine UniqueId EngineDiscoveryRequest Filter DiscoverySelector)
11-
(org.junit.platform.engine.discovery UniqueIdSelector ClasspathSelector ClassSelector)))
12+
(org.junit.platform.engine.discovery UniqueIdSelector ClasspathRootSelector ClassSelector)))
1213

1314
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1415
;; Selecting candidates for discovery
@@ -37,6 +38,8 @@
3738
(->> [dir] find-namespaces (map sym->ns) (mapcat -select)))))
3839
Path
3940
(-select [dir] (-select (.toFile dir)))
41+
URI
42+
(-select [uri] (-select (Paths/get uri)))
4043
Class
4144
(-select [clazz]
4245
(let [clazz-name (.getCanonicalName clazz)
@@ -56,20 +59,19 @@
5659
(-select [selector] (-select (.getNamespace selector)))
5760
UniqueIdSelector
5861
(-select [selector] (-select (.getUniqueId selector)))
59-
ClasspathSelector
62+
ClasspathRootSelector
6063
(-select [selector] (-select (.getClasspathRoot selector)))
6164
ClassSelector
6265
(-select [selector] (-select (.getJavaClass selector))))
6366

64-
6567
(defn select [^EngineDiscoveryRequest request]
6668
(mapcat -select (.getSelectorsByType request DiscoverySelector)))
6769

6870
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
6971
;; Filtering candidates for discovery
7072
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
7173
(defn- ns-filter [request candidates]
72-
(let [filters (.getDiscoveryFiltersByType request NamespaceFilter)
74+
(let [filters (.getFiltersByType request NamespaceFilter)
7375
unified (Filter/composeFilters filters)
7476
included? (fn [cand] (->> cand :namespace (.apply unified) .included))]
7577
(clojure.core/filter included? candidates)))

0 commit comments

Comments
 (0)