You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by af...@apache.org on 2016/01/14 19:00:33 UTC
reef git commit: [REEF-1028] Migrate Org.Apache.REEF.Evaluator.Tests
to xUnit
Repository: reef
Updated Branches:
refs/heads/master 0bd7114ef -> e9fdc17ac
[REEF-1028] Migrate Org.Apache.REEF.Evaluator.Tests to xUnit
JIRA:
[REEF-1028](https://issues.apache.org/jira/browse/REEF-1028)
Pull request:
This closes #767
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/e9fdc17a
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/e9fdc17a
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/e9fdc17a
Branch: refs/heads/master
Commit: e9fdc17accdead7f4164a963012ff5103e99656c
Parents: 0bd7114
Author: Mariia Mykhailova <ma...@apache.org>
Authored: Wed Jan 13 11:31:39 2016 -0800
Committer: Andrew Chung <af...@gmail.com>
Committed: Thu Jan 14 09:59:54 2016 -0800
----------------------------------------------------------------------
.../EvaluatorConfigurationsTests.cs | 65 +++++++++++---------
.../EvaluatorTests.cs | 31 +++++-----
2 files changed, 52 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/e9fdc17a/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 7078955..816c462 100644
--- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorConfigurationsTests.cs
+++ b/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorConfigurationsTests.cs
@@ -17,7 +17,6 @@
* under the License.
*/
-using Microsoft.VisualStudio.TestTools.UnitTesting;
using Org.Apache.REEF.Common.Runtime.Evaluator.Utils;
using Org.Apache.REEF.Common.Services;
using Org.Apache.REEF.Common.Tasks;
@@ -31,10 +30,10 @@ using Org.Apache.REEF.Tang.Util;
using Org.Apache.REEF.Utilities.Logging;
using Org.Apache.REEF.Wake.Remote.Parameters;
using Org.Apache.REEF.Wake.StreamingCodec;
+using Xunit;
namespace Org.Apache.REEF.Evaluator.Tests
{
- [TestClass]
public class EvaluatorConfigurationsTests
{
private static readonly Logger Logger = Logger.GetLogger(typeof(EvaluatorConfigurationsTests));
@@ -43,7 +42,9 @@ namespace Org.Apache.REEF.Evaluator.Tests
private const string RemoteIdPrefix = "socket://";
private const string AppIdForTest = "REEF_LOCAL_RUNTIME";
- [TestMethod, Priority(0), TestCategory("Unit")]
+ [Fact]
+ [Trait("Priority", "0")]
+ [Trait("Category", "Unit")]
public void TestEvaluatorConfigurations()
{
EvaluatorConfigurations evaluatorConfigurations = new EvaluatorConfigurations("evaluator.conf");
@@ -56,27 +57,28 @@ namespace Org.Apache.REEF.Evaluator.Tests
Logger.Log(Level.Info, "ApplicationId = " + aId);
Logger.Log(Level.Info, "ErrorHandlerRID = " + rId);
- Assert.IsTrue(eId.StartsWith(EvaluatorIdPrefix));
- Assert.IsTrue(aId.Equals(AppIdForTest));
- Assert.IsTrue(rId.StartsWith(RemoteIdPrefix));
+ Assert.True(eId.StartsWith(EvaluatorIdPrefix));
+ Assert.True(aId.Equals(AppIdForTest));
+ Assert.True(rId.StartsWith(RemoteIdPrefix));
var contextConfigString = evaluatorConfigurations.RootContextConfigurationString;
var serviceConfigString = evaluatorConfigurations.RootServiceConfigurationString;
var taskConfigString = evaluatorConfigurations.TaskConfigurationString;
- Assert.IsFalse(string.IsNullOrWhiteSpace(contextConfigString));
- Assert.IsFalse(string.IsNullOrWhiteSpace(taskConfigString));
+ Assert.False(string.IsNullOrWhiteSpace(contextConfigString));
+ Assert.False(string.IsNullOrWhiteSpace(taskConfigString));
}
- [TestMethod, Priority(0), TestCategory("Unit")]
- [DeploymentItem(@".")]
+ [Fact]
+ [Trait("Priority", "0")]
+ [Trait("Category", "Unit")]
public void TestEvaluatorConfigurationFile()
{
AvroConfigurationSerializer serializer = new AvroConfigurationSerializer();
var avroConfiguration = serializer.AvroDeserializeFromFile("evaluator.conf");
- Assert.IsNotNull(avroConfiguration);
- Assert.AreEqual(avroConfiguration.language, Language.Java.ToString());
+ Assert.NotNull(avroConfiguration);
+ Assert.Equal(avroConfiguration.language, Language.Java.ToString());
foreach (var b in avroConfiguration.Bindings)
{
@@ -84,14 +86,15 @@ namespace Org.Apache.REEF.Evaluator.Tests
}
}
- [TestMethod, Priority(0), TestCategory("Unit")]
- [DeploymentItem(@".")]
+ [Fact]
+ [Trait("Priority", "0")]
+ [Trait("Category", "Unit")]
public void TestDeserializationWithAlias()
{
AvroConfigurationSerializer serializer = new AvroConfigurationSerializer();
var avroConfiguration = serializer.AvroDeserializeFromFile("evaluator.conf");
var language = avroConfiguration.language;
- Assert.IsTrue(language.ToString().Equals(Language.Java.ToString()));
+ Assert.True(language.ToString().Equals(Language.Java.ToString()));
var classHierarchy = TangFactory.GetTang()
.GetClassHierarchy(new string[] { typeof(ApplicationIdentifier).Assembly.GetName().Name });
@@ -105,11 +108,11 @@ namespace Org.Apache.REEF.Evaluator.Tests
string rid = evaluatorInjector.GetNamedInstance<ErrorHandlerRid, string>();
string launchId = evaluatorInjector.GetNamedInstance<LaunchId, string>();
- Assert.IsTrue(remoteId.StartsWith(RemoteIdPrefix));
- Assert.IsTrue(appid.Equals(AppIdForTest));
- Assert.IsTrue(evaluatorIdentifier.StartsWith(EvaluatorIdPrefix));
- Assert.IsTrue(rid.StartsWith(RemoteIdPrefix));
- Assert.IsTrue(launchId.Equals(AppIdForTest));
+ 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>
@@ -117,8 +120,9 @@ namespace Org.Apache.REEF.Evaluator.Tests
/// found in the class hierarchy. The config file used in the test was generated when running HelloRREEF.
/// It contains task and context configuration strings.
/// </summary>
- [TestMethod, Priority(0), TestCategory("Unit")]
- [DeploymentItem(@".")]
+ [Fact]
+ [Trait("Priority", "0")]
+ [Trait("Category", "Unit")]
public void TestDeserializationForContextAndTask()
{
AvroConfigurationSerializer serializer = new AvroConfigurationSerializer();
@@ -147,14 +151,14 @@ namespace Org.Apache.REEF.Evaluator.Tests
var contextInjector = evaluatorInjector.ForkInjector(contextConfig);
string contextId = contextInjector.GetNamedInstance<ContextConfigurationOptions.ContextIdentifier, string>();
- Assert.IsTrue(contextId.StartsWith(ContextIdPrefix));
+ Assert.True(contextId.StartsWith(ContextIdPrefix));
var taskInjector = contextInjector.ForkInjector(taskConfig);
string taskId = taskInjector.GetNamedInstance<TaskConfigurationOptions.Identifier, string>();
ITask task = taskInjector.GetInstance<ITask>();
- Assert.IsTrue(taskId.StartsWith("HelloTask"));
- Assert.IsTrue(task is HelloTask);
+ Assert.True(taskId.StartsWith("HelloTask"));
+ Assert.True(task is HelloTask);
}
/// <summary>
@@ -162,8 +166,9 @@ namespace Org.Apache.REEF.Evaluator.Tests
/// found in the class hierarchy. The config file used in the test was generated when running TestBroadCastReduceOperators.
/// It contains service and context configuration strings.
/// </summary>
- [TestMethod, Priority(0), TestCategory("Unit")]
- [DeploymentItem(@".")]
+ [Fact]
+ [Trait("Priority", "0")]
+ [Trait("Category", "Unit")]
public void TestDeserializationForServiceAndContext()
{
AvroConfigurationSerializer serializer = new AvroConfigurationSerializer();
@@ -193,7 +198,7 @@ namespace Org.Apache.REEF.Evaluator.Tests
var contextInjector = evaluatorInjector.ForkInjector(contextConfig);
string contextId = contextInjector.GetNamedInstance<ContextConfigurationOptions.ContextIdentifier, string>();
- Assert.IsTrue(contextId.StartsWith("MasterTaskContext"));
+ Assert.True(contextId.StartsWith("MasterTaskContext"));
string serviceConfigString = TangFactory.GetTang().NewInjector(rootServiceConfig)
.GetNamedInstance<ServicesConfigurationOptions.ServiceConfigString, string>();
@@ -203,8 +208,8 @@ namespace Org.Apache.REEF.Evaluator.Tests
var serviceInjector = contextInjector.ForkInjector(serviceConfig);
var tcpCountRange = serviceInjector.GetNamedInstance<TcpPortRangeStart, int>();
var tcpCountCount = serviceInjector.GetNamedInstance<TcpPortRangeCount, int>();
- Assert.IsTrue(tcpCountRange > 0);
- Assert.IsTrue(tcpCountCount > 0);
+ Assert.True(tcpCountRange > 0);
+ Assert.True(tcpCountCount > 0);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/e9fdc17a/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
index 9a8afcc..7d25a69 100644
--- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorTests.cs
+++ b/lang/cs/Org.Apache.REEF.Evaluator.Tests/EvaluatorTests.cs
@@ -19,7 +19,6 @@
using System;
using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
using Org.Apache.REEF.Common.Avro;
using Org.Apache.REEF.Common.Evaluator;
using Org.Apache.REEF.Common.Tasks;
@@ -29,26 +28,28 @@ 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
{
- [TestClass]
public class EvaluatorTests
{
- [TestMethod, Priority(0), TestCategory("Functional")]
- [Description("Parse Evaluator configuration from Java, inject and execute Shell task with DIR command based on the configuration")]
+ [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.
ShellTask tmpTask = new ShellTask("invalid");
- Assert.IsNotNull(tmpTask);
+ Assert.NotNull(tmpTask);
string tmp = Directory.GetCurrentDirectory();
- Assert.IsNotNull(tmp);
+ Assert.NotNull(tmp);
AvroConfigurationSerializer serializer = new AvroConfigurationSerializer();
AvroConfiguration avroConfiguration = serializer.AvroDeserializeFromFile("evaluator.conf");
- Assert.IsNotNull(avroConfiguration);
+ Assert.NotNull(avroConfiguration);
ICsConfigurationBuilder cb = TangFactory.GetTang().NewConfigurationBuilder();
cb.AddConfiguration(TaskConfiguration.ConfigurationModule
@@ -63,7 +64,7 @@ namespace Org.Apache.REEF.Evaluator.Tests
ITask task = null;
TaskConfiguration config = new TaskConfiguration(taskConfig);
- Assert.IsNotNull(config);
+ Assert.NotNull(config);
try
{
IInjector injector = TangFactory.GetTang().NewInjector(config.TangConfig);
@@ -78,18 +79,20 @@ namespace Org.Apache.REEF.Evaluator.Tests
string result = System.Text.Encoding.Default.GetString(bytes);
// a dir command is executed in the container directory, which includes the file "evaluator.conf"
- Assert.IsTrue(result.Contains("evaluator.conf"));
+ Assert.True(result.Contains("evaluator.conf"));
}
- [TestMethod, Priority(0), TestCategory("Unit")]
- [Description("Test driver information extracted from Http server")]
+ [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.IsTrue(info.remoteId.Equals("socket://10.121.136.231:14272"));
- Assert.IsTrue(info.startTime.Equals("2014 08 28 10:50:32"));
- Assert.IsTrue(new DriverInformation(info.remoteId, info.startTime, info.services).NameServerId.Equals("10.121.136.231:16663"));
+ 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