Merge branch 'master' into font-roles

SIL.Archiving.Tests/IMDIArchivingDlgViewModelTests.cs

@@ -132,27 +132,9 @@ public void IsPathWritable_IllegalCharacterInPath_False()
 
 		#region GetNameOfProgramToLaunch tests
 
-		/// ------------------------------------------------------------------------------------
-		[Test]
-		[Category("SkipOnTeamCity")]
-		public void GetNameOfProgramToLaunch_ShortExeName_ReturnsExeNameWithoutExtension()
-		{
-			// fails on TeamCity because Arbil is not installed
-
-			_model.ProgramPreset = "Arbil";
-
-			// AT THIS TIME WE ARE NOT SHOWING THE LAUNCH OPTION
-			//Assert.AreEqual("Arbil", _model.NameOfProgramToLaunch);
-			Assert.IsNull(_model.NameOfProgramToLaunch);
-		}
-
-		/// ------------------------------------------------------------------------------------
 		[Test]
-		[Category("SkipOnTeamCity")]
-		public void GetNameOfProgramToLaunch_ExeNameContainsFolderName_ReturnsFolderName()
+		public void GetNameOfProgramToLaunch_IsNull()
 		{
-			// fails on TeamCity because Arbil is not installed
-
 			_model.ProgramPreset = "Arbil";
 
 			// AT THIS TIME WE ARE NOT SHOWING THE LAUNCH OPTION
@@ -252,17 +234,6 @@ public void SetAbstract_MultipleLanguages_AddsDescriptionToCorpusImdiFile()
 			Assert.AreEqual(0, descriptions.Count);
 		}
 
-		// We now accept languages not in the Arbil list
-		//[Test]
-		//public void SetAbstract_BogusLanguage_ThrowsException()
-		//{
-		//    _model.Initialize();
-		//    Dictionary<string, string> descriptions = new Dictionary<string, string>();
-		//    descriptions["eng"] = "Story about a frog";
-		//    descriptions["frn"] = "L'histoire d'une grenouille";
-		//    Assert.Throws(typeof (ArgumentException), () => _model.SetAbstract(descriptions));
-		//}
-
 		#endregion
 	}