diff --git a/feathr-config/src/test/java/com/linkedin/feathr/core/configbuilder/ConfigBuilderTest.java b/feathr-config/src/test/java/com/linkedin/feathr/core/configbuilder/ConfigBuilderTest.java index fb5e072e0..d0127eec7 100644 --- a/feathr-config/src/test/java/com/linkedin/feathr/core/configbuilder/ConfigBuilderTest.java +++ b/feathr-config/src/test/java/com/linkedin/feathr/core/configbuilder/ConfigBuilderTest.java @@ -20,15 +20,4 @@ public void testFeatureDefConfig() { fail("Test failed", e); } } - - @Test - public void testFeatureCareers() { - ConfigBuilder configBuilder = ConfigBuilder.get(); - try { - FeatureDefConfig obsFeatureDefConfigObj - = configBuilder.buildFeatureDefConfig("frame-feature-careers-featureDef-offline.conf"); - } catch (ConfigBuilderException e) { - fail("Test failed", e); - } - } } diff --git a/feathr-config/src/test/java/com/linkedin/feathr/core/configbuilder/typesafe/TypesafeConfigBuilderTest.java b/feathr-config/src/test/java/com/linkedin/feathr/core/configbuilder/typesafe/TypesafeConfigBuilderTest.java index 8ae5e884d..582ec7847 100644 --- a/feathr-config/src/test/java/com/linkedin/feathr/core/configbuilder/typesafe/TypesafeConfigBuilderTest.java +++ b/feathr-config/src/test/java/com/linkedin/feathr/core/configbuilder/typesafe/TypesafeConfigBuilderTest.java @@ -134,56 +134,4 @@ public void testFeatureDefConfigFromManifest1() { fail("Error in building config", e); } } - - @Test(description = "Tests build of FeatureDefConfig object from a config file in external jar specified in a manifest") - public void testFeatureDefConfigFromManifest2() { - try { - FeatureDefConfig obsFeatureDefConfigObj = configBuilder.buildFeatureDefConfigFromManifest("config/manifest2.conf"); - - assertTrue(obsFeatureDefConfigObj.getAnchorsConfig().isPresent()); - assertTrue(obsFeatureDefConfigObj.getSourcesConfig().isPresent()); - assertTrue(obsFeatureDefConfigObj.getDerivationsConfig().isPresent()); - } catch (ConfigBuilderException e) { - fail("Error in building config", e); - } - } - - @Test(description = "Tests build of FeatureDefConfig object from local and external config files specified in a manifest") - public void testFeatureDefConfigFromManifest3() { - try { - FeatureDefConfig obsFeatureDefConfigObj = configBuilder.buildFeatureDefConfigFromManifest("config/manifest3.conf"); - - assertTrue(obsFeatureDefConfigObj.getAnchorsConfig().isPresent()); - assertTrue(obsFeatureDefConfigObj.getSourcesConfig().isPresent()); - assertTrue(obsFeatureDefConfigObj.getDerivationsConfig().isPresent()); - } catch (ConfigBuilderException e) { - fail("Error in building config", e); - } - } - - /* - @Test(description = "Tests build of JoinConfig object from single resource file") - public void testJoinConfigFromResource1() { - try { - JoinConfig obsJoinConfigObj1 = configBuilder.buildJoinConfig("dir1/join.conf"); - - assertEquals(obsJoinConfigObj1, expJoinConfigObj1); - - } catch (ConfigBuilderException e) { - fail("Error in building config", e); - } - } - - @Test(description = "Tests build of JoinConfig object with single configuration file specified by URL") - public void testJoinConfigFromUrl1() { - try { - URL url = new File("src/test/resources/dir1/join.conf").toURI().toURL(); - JoinConfig obsJoinConfigObj1 = configBuilder.buildJoinConfig(url); - - assertEquals(obsJoinConfigObj1, expJoinConfigObj1); - - } catch (Throwable e) { - fail("Error in building config", e); - } - }*/ } diff --git a/feathr-config/src/test/java/com/linkedin/feathr/core/configdataprovider/FrameConfigFileCheckerTest.java b/feathr-config/src/test/java/com/linkedin/feathr/core/configdataprovider/FrameConfigFileCheckerTest.java index 177f3b61d..def5eb9d3 100644 --- a/feathr-config/src/test/java/com/linkedin/feathr/core/configdataprovider/FrameConfigFileCheckerTest.java +++ b/feathr-config/src/test/java/com/linkedin/feathr/core/configdataprovider/FrameConfigFileCheckerTest.java @@ -20,14 +20,6 @@ public static void init() { _classLoader = Thread.currentThread().getContextClassLoader(); } - @Test(description = "A valid Frame config file with valid syntax should return true.") - public void testValidFrameConfigFile() { - URL url = _classLoader.getResource("frame-feature-careers-featureDef-offline.conf"); - - boolean configFile = FrameConfigFileChecker.isConfigFile(url); - assertTrue(configFile); - } - @Test(description = "Test that a txt file should throw exception.", expectedExceptions = ConfigBuilderException.class) public void testTxtFile() { URL url = _classLoader.getResource("Foo.txt"); diff --git a/feathr-config/src/test/java/com/linkedin/feathr/core/configdataprovider/ManifestConfigDataProviderTest.java b/feathr-config/src/test/java/com/linkedin/feathr/core/configdataprovider/ManifestConfigDataProviderTest.java deleted file mode 100644 index 49e703bbc..000000000 --- a/feathr-config/src/test/java/com/linkedin/feathr/core/configdataprovider/ManifestConfigDataProviderTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.linkedin.feathr.core.configdataprovider; - -import java.io.BufferedReader; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import org.testng.annotations.Test; - -import static org.testng.Assert.*; - - -/** - * Unit tests for {@link ManifestConfigDataProvider} - */ -public class ManifestConfigDataProviderTest { - - @Test(description = "Tests getting Readers for files listed in a manifest file") - public void test() { - String manifest = "config/manifest3.conf"; - - try (ManifestConfigDataProvider cdp = new ManifestConfigDataProvider(manifest)) { - List readers = cdp.getConfigDataReaders() - .stream() - .map(BufferedReader::new) - .collect(Collectors.toList()); - - assertEquals(readers.size(), 2); - - for (BufferedReader r : readers) { - Stream stringStream = r.lines(); - long lineCount = stringStream.count(); - assertTrue(lineCount > 0, "Expected line count > 0, found " + lineCount); - } - } catch (Exception e) { - fail("Caught exception", e); - } - } -} diff --git a/feathr-config/src/test/java/com/linkedin/feathr/core/configvalidator/ConfigValidatorTest.java b/feathr-config/src/test/java/com/linkedin/feathr/core/configvalidator/ConfigValidatorTest.java index d5b02db2e..90b9438bf 100644 --- a/feathr-config/src/test/java/com/linkedin/feathr/core/configvalidator/ConfigValidatorTest.java +++ b/feathr-config/src/test/java/com/linkedin/feathr/core/configvalidator/ConfigValidatorTest.java @@ -144,49 +144,4 @@ public void testFeatureDefAndJoinConfigSyntax() { fail("Caught exception: " + e.getMessage(), e); } } - - /** - * In galene library, Frame-Galene online scoring uses frame-core to read frame-galene.conf as FeatureDef conf. - * For now, we need to make sure the syntax used in frame-galene.conf is supported in validation - */ - @Test(description = "Tests syntax validation of an valid Frame-Galene scoring config") - public void testFrameGaleneScoringConfigWithValidSyntax() { - try (ConfigDataProvider cdp = new ResourceConfigDataProvider("frame-galene.conf")) { - ValidationResult obsResult = _validator.validate(FeatureDef, SYNTACTIC, cdp); - if (obsResult.getValidationStatus() != VALID) { - String details = obsResult.getDetails().orElse(""); - } - - assertEquals(obsResult.getValidationStatus(), VALID); - - } catch (Exception e) { - fail("Caught exception: " + e.getMessage(), e); - } - } - - @Test(description = "Tests build of identifying valid FrameGalene configs") - public void testFrameGaleneConfigValidCases() { - ConfigRenderOptions _renderOptions = ConfigRenderOptions.defaults() - .setComments(false) - .setOriginComments(false) - .setFormatted(true) - .setJson(true); - ConfigParseOptions _parseOptions = ConfigParseOptions.defaults() - .setSyntax(ConfigSyntax.CONF) // HOCON document - .setAllowMissing(false); - InputStream inputStream = JoinConfig.class.getClassLoader() - .getResourceAsStream("FeatureDefConfigSchema.json"); - JSONObject rawSchema = new JSONObject(new JSONTokener(inputStream)); - Schema schema = SchemaLoader.load(rawSchema); - Config myCfg = ConfigFactory.parseResources("frame-feature-careers-featureDef-offline.conf", _parseOptions); - String jsonStr = myCfg.root().render(_renderOptions); - JSONTokener tokener = new JSONTokener(jsonStr); - JSONObject root = new JSONObject(tokener); - try { - schema.validate(root); - } catch (ValidationException e) { - System.out.println(e.toJSON()); - throw e; - } - } }