Skip to content

Commit 651df22

Browse files
vschvsch
committed
change to static RESOURCE_LOCATION
1 parent 3103d3f commit 651df22

File tree

171 files changed

+349
-779
lines changed

Some content is hidden

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

171 files changed

+349
-779
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ import com.vladsch.flexmark.profile.pegdown.PegdownOptionsAdapter;
129129
import com.vladsch.flexmark.util.data.DataHolder;
130130

131131
public class PegdownOptions {
132-
static final DataHolder OPTIONS = PegdownOptionsAdapter.flexmarkOptions(
132+
private static final DataHolder OPTIONS = PegdownOptionsAdapter.flexmarkOptions(
133133
Extensions.ALL
134134
);
135135

@@ -155,7 +155,7 @@ import com.vladsch.flexmark.profile.pegdown.PegdownOptionsAdapter;
155155
import com.vladsch.flexmark.util.data.DataHolder;
156156

157157
public class PegdownOptions {
158-
static final DataHolder OPTIONS = PegdownOptionsAdapter.flexmarkOptions(true,
158+
private static final DataHolder OPTIONS = PegdownOptionsAdapter.flexmarkOptions(true,
159159
Extensions.ALL
160160
);
161161

‎VERSION.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ flexmark-java
99
- [Next 0.60.0](#next-0600)
1010
- [API Changes](#api-changes)
1111
- [Next 0.59.21](#next-05921)
12+
- [0.59.23](#05923)
1213
- [0.59.21](#05921)
1314
- [0.59.19](#05919)
1415
- [0.59.17](#05917)
@@ -157,6 +158,15 @@ Next 0.59.21
157158
spec test and not requiring deep inheritance dependencies. Merge full test spec and
158159
individual tests. for example see MdNav `LightPlatformCodeInsightSpecTestCase`
159160

161+
0.59.23
162+
-------
163+
164+
* Fix: change all tests to use static const `ResourceLocation` instead of creating a new
165+
instance.
166+
* Fix: make `ComboSpecTestCase.getSpecResourceLocation()` final and remove it from all
167+
subclasses.
168+
169+
160170
0.59.21
161171
-------
162172

‎flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/FormatterSpecTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import com.vladsch.flexmark.formatter.Formatter;
44
import com.vladsch.flexmark.parser.Parser;
5-
import com.vladsch.flexmark.test.util.spec.SpecExample;
65
import com.vladsch.flexmark.test.util.FlexmarkSpecExampleRenderer;
76
import com.vladsch.flexmark.test.util.SpecExampleRenderer;
7+
import com.vladsch.flexmark.test.util.spec.SpecExample;
88
import com.vladsch.flexmark.util.data.DataHolder;
9-
import com.vladsch.flexmark.util.data.DataSet;
109
import org.jetbrains.annotations.NotNull;
1110
import org.jetbrains.annotations.Nullable;
1211

‎flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/FormatterTranslationSpecTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.vladsch.flexmark.formatter.Formatter;
44
import com.vladsch.flexmark.parser.Parser;
55
import com.vladsch.flexmark.parser.ParserEmulationProfile;
6-
import com.vladsch.flexmark.test.util.spec.SpecExample;
76
import com.vladsch.flexmark.test.util.ComboSpecTestCase;
87
import com.vladsch.flexmark.test.util.TestUtils;
8+
import com.vladsch.flexmark.test.util.spec.SpecExample;
99
import com.vladsch.flexmark.util.data.DataHolder;
1010
import com.vladsch.flexmark.util.data.MutableDataSet;
1111
import org.jetbrains.annotations.NotNull;

‎flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/RendererSpecTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
import com.vladsch.flexmark.html.HtmlRenderer;
44
import com.vladsch.flexmark.parser.Parser;
5-
import com.vladsch.flexmark.test.util.spec.SpecExample;
65
import com.vladsch.flexmark.test.util.ComboSpecTestCase;
76
import com.vladsch.flexmark.test.util.FlexmarkSpecExampleRenderer;
87
import com.vladsch.flexmark.test.util.SpecExampleRenderer;
8+
import com.vladsch.flexmark.test.util.spec.SpecExample;
99
import com.vladsch.flexmark.util.data.DataHolder;
10-
import com.vladsch.flexmark.util.data.DataSet;
1110
import com.vladsch.flexmark.util.data.MutableDataSet;
1211
import org.jetbrains.annotations.NotNull;
1312
import org.jetbrains.annotations.Nullable;

‎flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/TranslationFormatterSpecTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55
import com.vladsch.flexmark.formatter.TranslationHandler;
66
import com.vladsch.flexmark.html.renderer.HeaderIdGenerator;
77
import com.vladsch.flexmark.parser.Parser;
8-
import com.vladsch.flexmark.test.util.spec.SpecExample;
98
import com.vladsch.flexmark.test.util.ComboSpecTestCase;
109
import com.vladsch.flexmark.test.util.FlexmarkSpecExampleRenderer;
1110
import com.vladsch.flexmark.test.util.SpecExampleRenderer;
1211
import com.vladsch.flexmark.test.util.TestUtils;
12+
import com.vladsch.flexmark.test.util.spec.SpecExample;
1313
import com.vladsch.flexmark.util.ast.Document;
1414
import com.vladsch.flexmark.util.ast.IRender;
1515
import com.vladsch.flexmark.util.ast.Node;
1616
import com.vladsch.flexmark.util.data.DataHolder;
1717
import com.vladsch.flexmark.util.data.DataKey;
18-
import com.vladsch.flexmark.util.data.DataSet;
1918
import com.vladsch.flexmark.util.data.MutableDataSet;
2019
import org.jetbrains.annotations.NotNull;
2120
import org.jetbrains.annotations.Nullable;

‎flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/formatter/ComboCoreFormatterNoBlankLinesSpecTest.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.vladsch.flexmark.core.test.util.formatter;
22

33
import com.vladsch.flexmark.parser.Parser;
4+
import com.vladsch.flexmark.test.util.ComboSpecTestCase;
45
import com.vladsch.flexmark.test.util.spec.ResourceLocation;
56
import com.vladsch.flexmark.test.util.spec.SpecExample;
6-
import com.vladsch.flexmark.test.util.ComboSpecTestCase;
77
import com.vladsch.flexmark.util.data.DataHolder;
88
import com.vladsch.flexmark.util.data.MutableDataSet;
99
import org.jetbrains.annotations.NotNull;
@@ -13,6 +13,7 @@
1313

1414
public class ComboCoreFormatterNoBlankLinesSpecTest extends ComboCoreFormatterSpecTestBase {
1515
private static final String SPEC_RESOURCE = "/core_formatter_no_blanklines_spec.md";
16+
public static final @NotNull ResourceLocation RESOURCE_LOCATION = ResourceLocation.of(SPEC_RESOURCE);
1617
private static final DataHolder OPTIONS = new MutableDataSet()
1718
.set(Parser.BLANK_LINES_IN_AST, false)
1819
.toImmutable();
@@ -23,11 +24,6 @@ public ComboCoreFormatterNoBlankLinesSpecTest(@NotNull SpecExample example) {
2324

2425
@Parameterized.Parameters(name = "{0}")
2526
public static List<Object[]> data() {
26-
return ComboSpecTestCase.getTestData(SPEC_RESOURCE);
27-
}
28-
29-
@Override
30-
public @NotNull ResourceLocation getSpecResourceLocation() {
31-
return ResourceLocation.of(SPEC_RESOURCE);
27+
return ComboSpecTestCase.getTestData(RESOURCE_LOCATION);
3228
}
3329
}

‎flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/formatter/ComboCoreFormatterSpecTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,14 @@
99

1010
public class ComboCoreFormatterSpecTest extends ComboCoreFormatterSpecTestBase {
1111
private static final String SPEC_RESOURCE = "/core_formatter_spec.md";
12+
public static final @NotNull ResourceLocation RESOURCE_LOCATION = ResourceLocation.of(SPEC_RESOURCE);
1213

1314
public ComboCoreFormatterSpecTest(@NotNull SpecExample example) {
1415
super(example, null);
1516
}
1617

1718
@Parameterized.Parameters(name = "{0}")
1819
public static List<Object[]> data() {
19-
return getTestData(SPEC_RESOURCE);
20-
}
21-
22-
@Override
23-
public @NotNull ResourceLocation getSpecResourceLocation() {
24-
return ResourceLocation.of(SPEC_RESOURCE);
20+
return getTestData(RESOURCE_LOCATION);
2521
}
2622
}

‎flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/formatter/ComboCoreFormatterSpecTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.vladsch.flexmark.core.test.util.FormatterSpecTest;
44
import com.vladsch.flexmark.formatter.Formatter;
55
import com.vladsch.flexmark.parser.Parser;
6-
import com.vladsch.flexmark.test.util.spec.SpecExample;
76
import com.vladsch.flexmark.test.util.ComboSpecTestCase;
7+
import com.vladsch.flexmark.test.util.spec.SpecExample;
88
import com.vladsch.flexmark.util.ast.KeepType;
99
import com.vladsch.flexmark.util.data.DataHolder;
1010
import com.vladsch.flexmark.util.data.MutableDataSet;

‎flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/formatter/ComboCoreTranslationFormatterSpecTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
public class ComboCoreTranslationFormatterSpecTest extends TranslationFormatterSpecTest {
1919
private static final String SPEC_RESOURCE = "/core_translation_formatter_spec.md";
20+
public static final @NotNull ResourceLocation RESOURCE_LOCATION = ResourceLocation.of(SPEC_RESOURCE);
2021

2122
private static final Map<String, DataHolder> optionsMap = placementAndSortOptions(Formatter.REFERENCE_PLACEMENT, Formatter.REFERENCE_SORT);
2223
static {
@@ -62,11 +63,6 @@ public ComboCoreTranslationFormatterSpecTest(@NotNull SpecExample example) {
6263

6364
@Parameterized.Parameters(name = "{0}")
6465
public static List<Object[]> data() {
65-
return getTestData(SPEC_RESOURCE);
66-
}
67-
68-
@Override
69-
public @NotNull ResourceLocation getSpecResourceLocation() {
70-
return ResourceLocation.of(SPEC_RESOURCE);
66+
return getTestData(RESOURCE_LOCATION);
7167
}
7268
}

0 commit comments

Comments
 (0)