Repository: reef Updated Branches: refs/heads/master 22c047754 -> 94a2ccb91
[REEF-1221] Remove hard coded evaluator.conf * Remove the config file from Example and tests * Update Evaluator unit testing to simulate the config data on the fly instead of reading it from hard coded file * Clean up the EvaluatorConfiguaration tests and remove an unnecessary test * Update Evaluator method comments JIRA: [REEF-1221](https://issues.apache.org/jira/browse/REEF-1221) Pull Request: This closes #860 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/94a2ccb9 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/94a2ccb9 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/94a2ccb9 Branch: refs/heads/master Commit: 94a2ccb9112029fc635364d245d6dc4b3c77fdb5 Parents: 22c0477 Author: Julia Wang <[email protected]> Authored: Mon Feb 29 14:35:04 2016 -0800 Committer: Markus Weimer <[email protected]> Committed: Mon Feb 29 17:15:36 2016 -0800 ---------------------------------------------------------------------- .../ContextRuntimeTests.cs | 2 +- .../EvaluatorConfigurationsTests.cs | 154 +++++++++++++++---- .../EvaluatorTests.cs | 92 ----------- .../Org.Apache.REEF.Evaluator.Tests.csproj | 7 - lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs | 7 +- .../ConfigFiles/evaluator.conf | Bin 1862 -> 0 bytes .../ConfigFiles/evaluatorWithService.conf | Bin 6975 -> 0 bytes .../Org.Apache.REEF.Examples.csproj | 8 - .../Format/TestConfigurationModule.cs | 9 +- .../Org.Apache.REEF.Tang.Tests.csproj | 3 - 10 files changed, 138 insertions(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/94a2ccb9/lang/cs/Org.Apache.REEF.Evaluator.Tests/ContextRuntimeTests.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator.Tests/ContextRuntimeTests.cs b/lang/cs/Org.Apache.REEF.Evaluator.Tests/ContextRuntimeTests.cs index 854a52b..0894ee7 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/ContextRuntimeTests.cs +++ b/lang/cs/Org.Apache.REEF.Evaluator.Tests/ContextRuntimeTests.cs @@ -378,7 +378,7 @@ namespace Org.Apache.REEF.Evaluator.Tests // empty } - private sealed class TestService : ITestService, IDisposable + internal sealed class TestService : ITestService, IDisposable { [Inject] private TestService() http://git-wip-us.apache.org/repos/asf/reef/blob/94a2ccb9/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorConfigurationsTests.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorConfigurationsTests.cs b/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorConfigurationsTests.cs index 3b00cc3..980f512 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorConfigurationsTests.cs +++ b/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorConfigurationsTests.cs @@ -15,12 +15,18 @@ // specific language governing permissions and limitations // under the License. +using System.Collections.Generic; using Org.Apache.REEF.Common.Runtime.Evaluator.Utils; +using Org.Apache.REEF.Common.Services; +using Org.Apache.REEF.Common.Tasks; +using Org.Apache.REEF.Examples.HelloREEF; using Org.Apache.REEF.Tang.Formats; +using Org.Apache.REEF.Tang.Formats.AvroConfigurationDataContract; using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; using Org.Apache.REEF.Utilities.Logging; +using Org.Apache.REEF.Wake.StreamingCodec; using Xunit; namespace Org.Apache.REEF.Evaluator.Tests @@ -29,53 +35,149 @@ namespace Org.Apache.REEF.Evaluator.Tests { private static readonly Logger Logger = Logger.GetLogger(typeof(EvaluatorConfigurationsTests)); private const string EvaluatorIdPrefix = "Node-"; + private const string ContextIdPrefix = "RootContext_"; private const string RemoteIdPrefix = "socket://"; private const string AppIdForTest = "REEF_LOCAL_RUNTIME"; + /// <summary> + /// This test is to deserialize evaluator configuration for identifiers + /// using alias if the parameter in the configuration cannot be found in the class hierarchy. + /// </summary> [Fact] [Trait("Priority", "0")] [Trait("Category", "Unit")] - public void TestEvaluatorConfigurationFile() + public void TestDeserializationIdsWithAlias() { - AvroConfigurationSerializer serializer = new AvroConfigurationSerializer(); - var avroConfiguration = serializer.AvroDeserializeFromFile("evaluator.conf"); + var config = DeserializeConfigWithAlias(); + var evaluatorInjector = TangFactory.GetTang().NewInjector(config); - Assert.NotNull(avroConfiguration); - Assert.Equal(avroConfiguration.language, Language.Java.ToString()); + string appid = evaluatorInjector.GetNamedInstance<ApplicationIdentifier, string>(); + string remoteId = evaluatorInjector.GetNamedInstance<DriverRemoteIdentifier, string>(); - foreach (var b in avroConfiguration.Bindings) - { - Logger.Log(Level.Info, "Key = " + b.key + " Value = " + b.value); - } + string evaluatorIdentifier = evaluatorInjector.GetNamedInstance<EvaluatorIdentifier, string>(); + string rid = evaluatorInjector.GetNamedInstance<ErrorHandlerRid, string>(); + string launchId = evaluatorInjector.GetNamedInstance<LaunchId, string>(); + + Assert.True(remoteId.StartsWith(RemoteIdPrefix)); + Assert.True(appid.Equals(AppIdForTest)); + Assert.True(evaluatorIdentifier.StartsWith(EvaluatorIdPrefix)); + Assert.True(rid.StartsWith(RemoteIdPrefix)); + Assert.True(launchId.Equals(AppIdForTest)); } + /// <summary> + /// This test is to deserialize evaluator configuration for Task, Context and Service + /// using alias if the parameter in the configuration cannot be found in the class hierarchy. + /// </summary> [Fact] [Trait("Priority", "0")] [Trait("Category", "Unit")] - public void TestDeserializationWithAlias() + public void TestDeserializeContextServiceTaskWithAlias() { - AvroConfigurationSerializer serializer = new AvroConfigurationSerializer(); - var avroConfiguration = serializer.AvroDeserializeFromFile("evaluator.conf"); - var language = avroConfiguration.language; - Assert.True(language.ToString().Equals(Language.Java.ToString())); + var serializer = new AvroConfigurationSerializer(); + var config = DeserializeConfigWithAlias(); + var evaluatorInjector = TangFactory.GetTang().NewInjector(config); + + var taskConfigString = evaluatorInjector.GetNamedInstance<InitialTaskConfiguration, string>(); + var contextConfigString = evaluatorInjector.GetNamedInstance<RootContextConfiguration, string>(); + var serviceConfigString = evaluatorInjector.GetNamedInstance<RootServiceConfiguration, string>(); + + var contextClassHierarchy = TangFactory.GetTang().GetClassHierarchy(new string[] + { + typeof(Common.Context.ContextConfigurationOptions.ContextIdentifier).Assembly.GetName().Name + }); + var contextConfig = serializer.FromString(contextConfigString, contextClassHierarchy); + + var taskClassHierarchy = TangFactory.GetTang().GetClassHierarchy(new string[] + { + typeof(ITask).Assembly.GetName().Name, + typeof(HelloTask).Assembly.GetName().Name + }); + var taskConfig = serializer.FromString(taskConfigString, taskClassHierarchy); + + var serviceClassHierarchy = TangFactory.GetTang().GetClassHierarchy(new string[] + { + typeof(ServiceConfiguration).Assembly.GetName().Name, + typeof(IStreamingCodec<>).Assembly.GetName().Name + }); + var serviceConfig = serializer.FromString(serviceConfigString, serviceClassHierarchy); + + var contextInjector = evaluatorInjector.ForkInjector(contextConfig); + string contextId = contextInjector.GetNamedInstance<Common.Context.ContextConfigurationOptions.ContextIdentifier, string>(); + Assert.True(contextId.StartsWith(ContextIdPrefix)); + + var serviceInjector = contextInjector.ForkInjector(serviceConfig); + var service = serviceInjector.GetInstance<ContextRuntimeTests.TestService>(); + Assert.NotNull(service); + + var taskInjector = serviceInjector.ForkInjector(taskConfig); + var taskId = taskInjector.GetNamedInstance<TaskConfigurationOptions.Identifier, string>(); + var task = taskInjector.GetInstance<ITask>(); + Assert.True(taskId.StartsWith("HelloTask")); + Assert.True(task is HelloTask); + } + + /// <summary> + /// Deserialize evaluator configuration with alias + /// </summary> + /// <returns></returns> + private static IConfiguration DeserializeConfigWithAlias() + { + var serializer = new AvroConfigurationSerializer(); var classHierarchy = TangFactory.GetTang() .GetClassHierarchy(new string[] { typeof(ApplicationIdentifier).Assembly.GetName().Name }); - var config = serializer.FromAvro(avroConfiguration, classHierarchy); - IInjector evaluatorInjector = TangFactory.GetTang().NewInjector(config); - string appid = evaluatorInjector.GetNamedInstance<ApplicationIdentifier, string>(); - string remoteId = evaluatorInjector.GetNamedInstance<DriverRemoteIdentifier, string>(); + var avroConfiguration = EvaluatorConfig(serializer); + return serializer.FromAvro(avroConfiguration, classHierarchy); + } - string evaluatorIdentifier = evaluatorInjector.GetNamedInstance<EvaluatorIdentifier, string>(); - string rid = evaluatorInjector.GetNamedInstance<ErrorHandlerRid, string>(); - string launchId = evaluatorInjector.GetNamedInstance<LaunchId, string>(); + /// <summary> + /// Simulate evaluator configuration generated from Java for unit testing + /// </summary> + /// <param name="serializer"></param> + /// <returns></returns> + private static AvroConfiguration EvaluatorConfig(AvroConfigurationSerializer serializer) + { + var configurationEntries = new HashSet<ConfigurationEntry>(); - Assert.True(remoteId.StartsWith(RemoteIdPrefix)); - Assert.True(appid.Equals(AppIdForTest)); - Assert.True(evaluatorIdentifier.StartsWith(EvaluatorIdPrefix)); - Assert.True(rid.StartsWith(RemoteIdPrefix)); - Assert.True(launchId.Equals(AppIdForTest)); + configurationEntries.Add( + new ConfigurationEntry("org.apache.reef.runtime.common.evaluator.parameters.ApplicationIdentifier", + "REEF_LOCAL_RUNTIME")); + configurationEntries.Add( + new ConfigurationEntry("org.apache.reef.runtime.common.evaluator.parameters.DriverRemoteIdentifier", + "socket://10.130.68.76:9723")); + configurationEntries.Add( + new ConfigurationEntry("org.apache.reef.runtime.common.evaluator.parameters.EvaluatorIdentifier", + "Node-2-1447450298921")); + + var taskConfiguration = TaskConfiguration.ConfigurationModule + .Set(TaskConfiguration.Identifier, "HelloTask") + .Set(TaskConfiguration.Task, GenericType<HelloTask>.Class) + .Build(); + var taskString = serializer.ToString(taskConfiguration); + configurationEntries.Add( + new ConfigurationEntry("org.apache.reef.runtime.common.evaluator.parameters.InitialTaskConfiguration", + taskString)); + + var contextConfig = Common.Context.ContextConfiguration.ConfigurationModule.Set(Common.Context.ContextConfiguration.Identifier, ContextIdPrefix).Build(); + configurationEntries.Add( + new ConfigurationEntry("org.apache.reef.runtime.common.evaluator.parameters.RootContextConfiguration", + serializer.ToString(contextConfig))); + + var serviceConfiguration = ServiceConfiguration.ConfigurationModule + .Set(ServiceConfiguration.Services, GenericType<ContextRuntimeTests.TestService>.Class) + .Build(); + configurationEntries.Add( + new ConfigurationEntry("org.apache.reef.runtime.common.evaluator.parameters.RootServiceConfiguration", + serializer.ToString(serviceConfiguration))); + + configurationEntries.Add(new ConfigurationEntry("org.apache.reef.runtime.common.launch.parameters.ErrorHandlerRID", + "socket://10.130.68.76:9723")); + configurationEntries.Add(new ConfigurationEntry("org.apache.reef.runtime.common.launch.parameters.LaunchID", + "REEF_LOCAL_RUNTIME")); + + return new AvroConfiguration(Language.Java.ToString(), configurationEntries); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/94a2ccb9/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorTests.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorTests.cs b/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorTests.cs deleted file mode 100644 index 73d4708..0000000 --- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorTests.cs +++ /dev/null @@ -1,92 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -using System; -using System.IO; -using Org.Apache.REEF.Common.Avro; -using Org.Apache.REEF.Common.Evaluator; -using Org.Apache.REEF.Common.Tasks; -using Org.Apache.REEF.Examples.Tasks.ShellTask; -using Org.Apache.REEF.Tang.Formats; -using Org.Apache.REEF.Tang.Formats.AvroConfigurationDataContract; -using Org.Apache.REEF.Tang.Implementations.Tang; -using Org.Apache.REEF.Tang.Interface; -using Org.Apache.REEF.Tang.Util; -using Xunit; - -namespace Org.Apache.REEF.Evaluator.Tests -{ - public class EvaluatorTests - { - [Fact] - [Trait("Priority", "0")] - [Trait("Category", "Functional")] - [Trait("Description", "Parse Evaluator configuration from Java, inject and execute Shell task with DIR command based on the configuration")] - public void CanInjectAndExecuteTask() - { - // to enforce that shell task dll be copied to output directory. - var tmpTask = new ShellTask("invalid"); - Assert.NotNull(tmpTask); - - string tmp = Directory.GetCurrentDirectory(); - Assert.NotNull(tmp); - - AvroConfigurationSerializer serializer = new AvroConfigurationSerializer(); - AvroConfiguration avroConfiguration = serializer.AvroDeserializeFromFile("evaluator.conf"); - Assert.NotNull(avroConfiguration); - - ICsConfigurationBuilder cb = TangFactory.GetTang().NewConfigurationBuilder(); - cb.AddConfiguration(TaskConfiguration.ConfigurationModule - .Set(TaskConfiguration.Identifier, "Test_CLRContext_task") - .Set(TaskConfiguration.Task, GenericType<ShellTask>.Class) - .Build()); - cb.BindNamedParameter<ShellTask.Command, string>(GenericType<ShellTask.Command>.Class, "dir"); - - var config = cb.Build(); - ITask task; - - try - { - IInjector injector = TangFactory.GetTang().NewInjector(config); - task = (ITask)injector.GetInstance(typeof(ITask)); - } - catch (Exception e) - { - throw new InvalidOperationException("unable to inject task with configuration: " + config, e); - } - - byte[] bytes = task.Call(null); - string result = System.Text.Encoding.Default.GetString(bytes); - - // a dir command is executed in the container directory, which includes the file "evaluator.conf" - Assert.True(result.Contains("evaluator.conf")); - } - - [Fact] - [Trait("Priority", "0")] - [Trait("Category", "Unit")] - [Trait("Description", "Test driver information extracted from Http server")] - public void CanExtractDriverInformation() - { - const string infoString = "{\"remoteId\":\"socket://10.121.136.231:14272\",\"startTime\":\"2014 08 28 10:50:32\",\"services\":[{\"serviceName\":\"NameServer\",\"serviceInfo\":\"10.121.136.231:16663\"}]}"; - AvroDriverInfo info = AvroJsonSerializer<AvroDriverInfo>.FromString(infoString); - Assert.True(info.remoteId.Equals("socket://10.121.136.231:14272")); - Assert.True(info.startTime.Equals("2014 08 28 10:50:32")); - Assert.True(new DriverInformation(info.remoteId, info.startTime, info.services).NameServerId.Equals("10.121.136.231:16663")); - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/94a2ccb9/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj index f7fc8d1..ae6aa98 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj @@ -52,7 +52,6 @@ under the License. <ItemGroup> <Compile Include="ContextRuntimeTests.cs" /> <Compile Include="EvaluatorConfigurationsTests.cs" /> - <Compile Include="EvaluatorTests.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="TaskRuntimeTests.cs" /> </ItemGroup> @@ -91,12 +90,6 @@ under the License. </ProjectReference> </ItemGroup> <ItemGroup> - <None Include="$(SolutionDir)\Org.Apache.REEF.Examples\ConfigFiles\evaluator.conf"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </None> - <None Include="$(SolutionDir)\Org.Apache.REEF.Examples\ConfigFiles\evaluatorWithService.conf"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </None> <None Include="packages.config" /> </ItemGroup> <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" /> http://git-wip-us.apache.org/repos/asf/reef/blob/94a2ccb9/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs b/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs index 07e7a53..225e13d 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs +++ b/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs @@ -128,6 +128,7 @@ namespace Org.Apache.REEF.Evaluator /// <exception cref="EvaluatorConfigurationFileNotFoundException">When the configuration file cannot be found.</exception> /// <exception cref="EvaluatorConfigurationParseException">When the configuration file exists, but can't be deserialized.</exception> /// <returns></returns> + //// TODO[JIRA REEF-217]: Remove this method. private static IConfiguration ReadClrBridgeConfiguration() { var clrRuntimeConfigurationFile = Path.Combine(Directory.GetCurrentDirectory(), "reef", "global", @@ -151,7 +152,11 @@ namespace Org.Apache.REEF.Evaluator } } - // TODO[JIRA REEF-217]: Remove this method. + /// <summary> + /// Read evaluator configuration from evaluator.conf generated from Java + /// </summary> + /// <param name="evaluatorConfigFile"></param> + /// <returns></returns> private static IConfiguration ReadEvaluatorConfiguration(string evaluatorConfigFile) { if (string.IsNullOrWhiteSpace(evaluatorConfigFile)) http://git-wip-us.apache.org/repos/asf/reef/blob/94a2ccb9/lang/cs/Org.Apache.REEF.Examples/ConfigFiles/evaluator.conf ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples/ConfigFiles/evaluator.conf b/lang/cs/Org.Apache.REEF.Examples/ConfigFiles/evaluator.conf deleted file mode 100644 index 20c2016..0000000 Binary files a/lang/cs/Org.Apache.REEF.Examples/ConfigFiles/evaluator.conf and /dev/null differ http://git-wip-us.apache.org/repos/asf/reef/blob/94a2ccb9/lang/cs/Org.Apache.REEF.Examples/ConfigFiles/evaluatorWithService.conf ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples/ConfigFiles/evaluatorWithService.conf b/lang/cs/Org.Apache.REEF.Examples/ConfigFiles/evaluatorWithService.conf deleted file mode 100644 index 8b91c06..0000000 Binary files a/lang/cs/Org.Apache.REEF.Examples/ConfigFiles/evaluatorWithService.conf and /dev/null differ http://git-wip-us.apache.org/repos/asf/reef/blob/94a2ccb9/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.csproj b/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.csproj index b7db9eb..70e7f96 100644 --- a/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.csproj +++ b/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.csproj @@ -90,14 +90,6 @@ under the License. <Name>Org.Apache.REEF.Wake</Name> </ProjectReference> </ItemGroup> - <ItemGroup> - <None Include="ConfigFiles\evaluator.conf"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="ConfigFiles\evaluatorWithService.conf"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" /> http://git-wip-us.apache.org/repos/asf/reef/blob/94a2ccb9/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModule.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModule.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModule.cs index 67f3076..a3285e5 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModule.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModule.cs @@ -80,16 +80,13 @@ namespace Org.Apache.REEF.Tang.Tests.Format IFoo f4 = (IFoo)TangFactory.GetTang().NewInjector(c4).GetInstance(fooType); Assert.Equal(f4.getFooness(), 12); - IConfigurationSerializer serializerImpl = (IConfigurationSerializer)TangFactory.GetTang().NewInjector().GetInstance(typeof(IConfigurationSerializer)); + IConfigurationSerializer serializerImpl = + (IConfigurationSerializer) + TangFactory.GetTang().NewInjector().GetInstance(typeof(IConfigurationSerializer)); serializerImpl.ToFile(c, "TangTestCs1.avro"); var c5 = serializerImpl.FromFile("TangTestCs1.avro"); IFoo f5 = (IFoo)TangFactory.GetTang().NewInjector(c5).GetInstance(fooType); Assert.Equal(f5.getFooness(), 12); - - // this is to test the file generated from Java. name,value b=must be recognized by C# class hierarchy - AvroConfigurationSerializer serializer = new AvroConfigurationSerializer(); - var avroConfig = serializer.AvroDeserializeFromFile("Evaluator.conf"); - Assert.NotNull(avroConfig); } [Fact] http://git-wip-us.apache.org/repos/asf/reef/blob/94a2ccb9/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj index d079c8a..36b2604 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj @@ -113,9 +113,6 @@ under the License. <Compile Include="Utilities\Utilities.cs" /> </ItemGroup> <ItemGroup> - <None Include="$(SolutionDir)\Org.Apache.REEF.Examples\ConfigFiles\evaluator.conf"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </None> <None Include="packages.config"> <SubType>Designer</SubType> </None>
