Skip to content

Factor out classes in KidlTest that aren't part of KIDL #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrCreosote merged 1 commit into from
Mar 27, 2025
Merged

Factor out classes in KidlTest that aren't part of KIDL #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 24 additions & 28 deletions src/java/us/kbase/test/kidl/KidlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package us.kbase.test.kidl;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;

Expand All @@ -13,9 +14,6 @@
import java.io.PrintWriter;
import java.io.StringReader;
import java.io.StringWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
Expand All @@ -36,7 +34,6 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;

import us.kbase.common.service.UObject;
import us.kbase.jkidl.StaticIncludeProvider;
import us.kbase.kidl.KbAnnotations;
import us.kbase.kidl.KbModule;
Expand All @@ -49,15 +46,17 @@
import us.kbase.kidl.KbTypedef;
import us.kbase.kidl.KidlParseException;
import us.kbase.kidl.KidlParser;
import us.kbase.test.sdk.scripts.TestConfigHelper;

public class KidlTest {
public static final String tempDirName = "temp_test";

private static File prepareWorkDir() throws Exception {
final Path workDir = Paths.get(TestConfigHelper.getTempTestDir(), "test_kidl");
Files.createDirectories(workDir);
return workDir.toFile();
File tempDir = new File(".").getCanonicalFile();
File workDir = new File(tempDir, "test_kidl");
if (!workDir.exists()) {
workDir.mkdir();
}
return workDir;
}

private static List<String> getLines(String text) throws Exception {
Expand Down Expand Up @@ -159,39 +158,36 @@ private void failDeprecation(String spec, String exp) throws Exception {
}

@SuppressWarnings("unchecked")
private void checkDeprecation(String spec, String deptarg, boolean isdep,
Map<String, Object> unknown)
throws Exception {
private void checkDeprecation(
final String spec,
final String deptarg,
final boolean isdep,
final Map<String, Object> unknown
) throws Exception {
Map<String, Map<String, String>> schemas =
new HashMap<String, Map<String, String>>();
Map<?, ?> parsed = KidlParser.parseSpecInt(new StringReader(spec),
schemas, new StaticIncludeProvider());
final UObject modComps = new UObject(parsed)
.asMap().get("t1")
.asList().get(0)
.asList().get(0)
.asMap().get("module_components");
Map<String, UObject> annotations = modComps
.asList().get(0)
.asMap().get("annotations").asMap();
final Map<String, Object> parsed = (Map<String, Object>) KidlParser.parseSpecInt(
new StringReader(spec), schemas, new StaticIncludeProvider()
);
final List<Map<String, Map<String, Object>>> modComps =
((List<List<Map<String, List<Map<String, Map<String, Object>>>>>>)parsed.get("t1"))
.get(0).get(0).get("module_components");
final Map<String, Object> annotations = modComps.get(0).get("annotations");
assertThat("incorrect deprecation",
annotations.containsKey("deprecated"), is(true));
if (deptarg != null) {
assertThat("incorrect deprecation target",
annotations.get("deprecated").asClassInstance(String.class),
(String) annotations.get("deprecated"),
is(deptarg));
} else {
assertThat("incorrect deprecation target",
annotations.get("deprecated").isNull(), is(true));
annotations.get("deprecated"), is(nullValue()));
}
if (unknown != null) {
Map<String, Object> uk = annotations.get("unknown_annotations")
.asClassInstance(Map.class);
Map<String, Object> uk = (Map<String, Object>) annotations.get("unknown_annotations");
assertThat("incorrect unknown annotations", uk, is(unknown));
}
Map<String, UObject> stdtarget = modComps
.asList().get(1)
.asMap().get("annotations").asMap();
final Map<String, Object> stdtarget = modComps.get(1).get("annotations");
assertThat("incorrect deprection", stdtarget.containsKey("deprecation"),
is(false));
List<KbService> reparsed = KidlParser.parseSpec(parsed);
Expand Down