Skip to content

Commit e887796

Browse files
authored
feat: use core type blue ids from blue-repository (#11)
wip Update dependencies in build.gradle and change default Blue ID in Preprocessor.java tests: Enhance test logging in build.gradle and update sample Blue IDs in test resources
1 parent c10691f commit e887796

File tree

10 files changed

+28
-23
lines changed

10 files changed

+28
-23
lines changed

build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ compileTestJava {
3838

3939
dependencies {
4040
// JUnit Jupiter (JUnit 5)
41-
testImplementation(platform("org.junit:junit-bom:5.9.1"))
41+
testImplementation(platform("org.junit:junit-bom:5.10.2"))
4242
testImplementation("org.junit.jupiter:junit-jupiter")
43+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
4344
testImplementation("org.mockito:mockito-core:3.12.4")
4445

4546
// Jackson
@@ -62,6 +63,10 @@ test {
6263
junitXml.required = false
6364
html.required = true
6465
}
66+
testLogging {
67+
events 'PASSED', 'FAILED', 'SKIPPED'
68+
showStandardStreams = true
69+
}
6570
}
6671

6772
ext.genResourcesDir = file("$buildDir/generated-resources")

src/main/java/blue/language/preprocess/Preprocessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
public class Preprocessor {
2020

21-
public static final String DEFAULT_BLUE_BLUE_ID = "FREHAAGDZSzpnoTUoCQ86bBmxbVCULMjvx9JZM6fyqT1";
21+
public static final String DEFAULT_BLUE_BLUE_ID = "5r24T2gs9no9mDhjgf4sD6j43JeYSwndXmyMz4H8wSMV";
2222

2323
private TransformationProcessorProvider processorProvider;
2424
private NodeProvider nodeProvider;

src/main/java/blue/language/utils/Properties.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public class Properties {
3131
Arrays.asList(TEXT_TYPE, DOUBLE_TYPE, INTEGER_TYPE, BOOLEAN_TYPE, LIST_TYPE, DICTIONARY_TYPE);
3232

3333

34-
public static final String TEXT_TYPE_BLUE_ID = "F92yo19rCcbBoBSpUA5LRxpfDejJDAaP1PRxxbWAraVP";
35-
public static final String DOUBLE_TYPE_BLUE_ID = "68ryJtnmui4j5rCZWUnkZ3DChtmEb7Z9F8atn1mBSM3L";
36-
public static final String INTEGER_TYPE_BLUE_ID = "DHmxTkFbXePZHCHCYmQr2dSzcNLcryFVjXVHkdQrrZr8";
37-
public static final String BOOLEAN_TYPE_BLUE_ID = "EL6AjrbJsxTWRTPzY8WR8Y2zAMXRbydQj83PcZwuAHbo";
38-
public static final String LIST_TYPE_BLUE_ID = "G8wmfjEqugPEEXByMYWJXiEdbLToPRWNQEekNxrxfQWB";
39-
public static final String DICTIONARY_TYPE_BLUE_ID = "294NBTj2mFRL3RB4kDRUSckwGg7Kzj6T8CTAFeR1kcSA";
34+
public static final String TEXT_TYPE_BLUE_ID = "DLRQwz7MQeCrzjy9bohPNwtCxKEBbKaMK65KBrwjfG6K";
35+
public static final String DOUBLE_TYPE_BLUE_ID = "7pwXmXYCJtWnd348c2JQGBkm9C4renmZRwxbfaypsx5y";
36+
public static final String INTEGER_TYPE_BLUE_ID = "5WNMiV9Knz63B4dVY5JtMyh3FB4FSGqv7ceScvuapdE1";
37+
public static final String BOOLEAN_TYPE_BLUE_ID = "4EzhSubEimSQD3zrYHRtobfPPWntUuhEz8YcdxHsi12u";
38+
public static final String LIST_TYPE_BLUE_ID = "3MhWSaTRoPQidNkFJqRkYcFwNcAwYjLRTYu44Y5DeFh7";
39+
public static final String DICTIONARY_TYPE_BLUE_ID = "G7fBT9PSod1RfHLHkpafAGBDVAJMrMhAMY51ERcyXNrj";
4040
public static final List<String> BASIC_TYPE_BLUE_IDS = Arrays.asList(TEXT_TYPE_BLUE_ID, DOUBLE_TYPE_BLUE_ID, INTEGER_TYPE_BLUE_ID, BOOLEAN_TYPE_BLUE_ID);
4141
public static final List<String> CORE_TYPE_BLUE_IDS =
4242
Arrays.asList(TEXT_TYPE_BLUE_ID, DOUBLE_TYPE_BLUE_ID, INTEGER_TYPE_BLUE_ID, BOOLEAN_TYPE_BLUE_ID, LIST_TYPE_BLUE_ID, DICTIONARY_TYPE_BLUE_ID);
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
- type:
22
blueId: 27B7fuxQCS1VAptiCPc2RMkKoutP5qxkh3uDxZ7dr6Eo
33
mappings:
4-
Text: F92yo19rCcbBoBSpUA5LRxpfDejJDAaP1PRxxbWAraVP
5-
Double: 68ryJtnmui4j5rCZWUnkZ3DChtmEb7Z9F8atn1mBSM3L
6-
Integer: DHmxTkFbXePZHCHCYmQr2dSzcNLcryFVjXVHkdQrrZr8
7-
Boolean: EL6AjrbJsxTWRTPzY8WR8Y2zAMXRbydQj83PcZwuAHbo
8-
List: G8wmfjEqugPEEXByMYWJXiEdbLToPRWNQEekNxrxfQWB
9-
Dictionary: 294NBTj2mFRL3RB4kDRUSckwGg7Kzj6T8CTAFeR1kcSA
4+
Text: DLRQwz7MQeCrzjy9bohPNwtCxKEBbKaMK65KBrwjfG6K
5+
Double: 7pwXmXYCJtWnd348c2JQGBkm9C4renmZRwxbfaypsx5y
6+
Integer: 5WNMiV9Knz63B4dVY5JtMyh3FB4FSGqv7ceScvuapdE1
7+
Boolean: 4EzhSubEimSQD3zrYHRtobfPPWntUuhEz8YcdxHsi12u
8+
List: 3MhWSaTRoPQidNkFJqRkYcFwNcAwYjLRTYu44Y5DeFh7
9+
Dictionary: G7fBT9PSod1RfHLHkpafAGBDVAJMrMhAMY51ERcyXNrj
1010
- type:
1111
blueId: FGYuTXwaoSKfZmpTysLTLsb8WzSqf43384rKZDkXhxD4

src/test/java/blue/language/mapping/NodeToObjectConverterTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,19 +480,19 @@ public void testValueVariants() throws Exception {
480480
" blueId: PersonValue-BlueId\n" +
481481
"age1:\n" +
482482
" type:\n" +
483-
" blueId: DHmxTkFbXePZHCHCYmQr2dSzcNLcryFVjXVHkdQrrZr8\n" +
483+
" blueId: 5WNMiV9Knz63B4dVY5JtMyh3FB4FSGqv7ceScvuapdE1\n" +
484484
" name: Official Age\n" +
485485
" description: Description for official age\n" +
486486
" value: 25\n" +
487487
"age2:\n" +
488488
" type:\n" +
489-
" blueId: DHmxTkFbXePZHCHCYmQr2dSzcNLcryFVjXVHkdQrrZr8\n" +
489+
" blueId: 5WNMiV9Knz63B4dVY5JtMyh3FB4FSGqv7ceScvuapdE1\n" +
490490
" name: Official Age\n" +
491491
" description: Description for official age\n" +
492492
" value: 25\n" +
493493
"age3:\n" +
494494
" type:\n" +
495-
" blueId: DHmxTkFbXePZHCHCYmQr2dSzcNLcryFVjXVHkdQrrZr8\n" +
495+
" blueId: 5WNMiV9Knz63B4dVY5JtMyh3FB4FSGqv7ceScvuapdE1\n" +
496496
" name: Official Age\n" +
497497
" description: Description for official age\n" +
498498
" value: 25";

src/test/java/blue/language/provider/ClasspathBasedNodeProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void setUp() throws IOException {
2020

2121
@Test
2222
void testFetchByBlueId() {
23-
String knownBlueId = "8RTziohyZKuSMrybq9NfH1RroL91uwmAahV5KwfgiXKX";
23+
String knownBlueId = "7hSVRWdTCXpr4TKvf5dibF24vAxyqGuVERVrvgHrxzYs";
2424
List<Node> nodes = provider.fetchByBlueId(knownBlueId);
2525
assertNotNull(nodes);
2626
assertFalse(nodes.isEmpty());

src/test/java/blue/language/utils/BlueIdCalculatorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void testMultilineText1() {
233233
Node node = YAML_MAPPER.readValue(yaml, Node.class);
234234
String blueId = BlueIdCalculator.calculateBlueId(node);
235235

236-
String json = "{\"text\":{\"type\":{\"blueId\":\"F92yo19rCcbBoBSpUA5LRxpfDejJDAaP1PRxxbWAraVP\"},\"value\":\"abc\\ndef\"}}";
236+
String json = "{\"text\":{\"type\":{\"blueId\":\"DLRQwz7MQeCrzjy9bohPNwtCxKEBbKaMK65KBrwjfG6K\"},\"value\":\"abc\\ndef\"}}";
237237
Node node2 = JSON_MAPPER.readValue(json, Node.class);
238238
String blueId2 = BlueIdCalculator.calculateBlueId(node2);
239239

@@ -249,7 +249,7 @@ public void testMultilineText2() {
249249
Node node = YAML_MAPPER.readValue(yaml, Node.class);
250250
String blueId = BlueIdCalculator.calculateBlueId(node);
251251

252-
String json = "{\"text\":{\"type\":{\"blueId\":\"F92yo19rCcbBoBSpUA5LRxpfDejJDAaP1PRxxbWAraVP\"},\"value\":\"abc def\"}}\n";
252+
String json = "{\"text\":{\"type\":{\"blueId\":\"DLRQwz7MQeCrzjy9bohPNwtCxKEBbKaMK65KBrwjfG6K\"},\"value\":\"abc def\"}}\n";
253253
Node node2 = JSON_MAPPER.readValue(json, Node.class);
254254
String blueId2 = BlueIdCalculator.calculateBlueId(node2);
255255

src/test/resources/samples/Hattori2.blue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Celebrating Kill Bill Anniversary 2024
22
type:
3-
blueId: 8RTziohyZKuSMrybq9NfH1RroL91uwmAahV5KwfgiXKX
3+
blueId: 7hSVRWdTCXpr4TKvf5dibF24vAxyqGuVERVrvgHrxzYs
44
availableMenuItems:
55
appetizers:
66
- SakuraSpringSalad:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: My Voucher
22
type:
33
name: Celebrating Kill Bill Anniversary 2024
4-
blueId: 76W6FPpv3mZxtT6mKjgQ7iDjJjHUsfq9LBeySNiPqFgF
4+
blueId: Csue6YkqPiwPU8FbGctT8thc2GDv4QHZLzGKhcXDV1EJ
55
serialNumber: 30902345235
66
purchaseDate: 2024-04-01

src/test/resources/samples/Person.blue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ age:
66
pets:
77
type:
88
name: Pet
9-
blueId: 68Y1GazJSKJL1irezxJ3S4ZE7UCVXVswTRAhJf5RatK8
9+
blueId: GwjPFDPV5Ay9tSrAjk8W8ENfRUuLJ9QC9kdNp48YAo9M

0 commit comments

Comments
 (0)