adjavaherian
diff --git a/‎sample-code/examples/dotnet/AppiumDotNetSample/Android/AndroidActivityTest.cs‎
Lines changed: 121 additions & 0 deletions b/‎sample-code/examples/dotnet/AppiumDotNetSample/Android/AndroidActivityTest.cs‎
Lines changed: 121 additions & 0 deletions
diff --git a/‎…iumDotNetSample/AndroidConnectionTest.cs‎ ‎…tSample/Android/AndroidConnectionTest.cs‎sample-code/examples/dotnet/AppiumDotNetSample/AndroidConnectionTest.cs renamed to sample-code/examples/dotnet/AppiumDotNetSample/Android/AndroidConnectionTest.cs
Lines changed: 9 additions & 17 deletions b/‎…iumDotNetSample/AndroidConnectionTest.cs‎ ‎…tSample/Android/AndroidConnectionTest.cs‎sample-code/examples/dotnet/AppiumDotNetSample/AndroidConnectionTest.cs renamed to sample-code/examples/dotnet/AppiumDotNetSample/Android/AndroidConnectionTest.cs
Lines changed: 9 additions & 17 deletions
diff --git a/‎sample-code/examples/dotnet/AppiumDotNetSample/Android/AndroidElementTest.cs‎
Lines changed: 101 additions & 0 deletions b/‎sample-code/examples/dotnet/AppiumDotNetSample/Android/AndroidElementTest.cs‎
Lines changed: 101 additions & 0 deletions
@@ -0,0 +1,121 @@
+using Appium.Samples.Helpers;
+using NUnit.Framework;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Appium.Android;
+using OpenQA.Selenium.Remote;
+using System;
+using System.Diagnostics;
+using System.Diagnostics.Contracts;
+
+namespace Appium.Samples.Android
+{
+    [TestFixture]
+    public class AndroidActivityTest
+    {
+        private AndroidDriver<AppiumWebElement> driver;
+
+        [TestFixtureSetUp]
+        public void BeforeAll()
+        {
+            DesiredCapabilities capabilities = Env.isSauce() ?
+                Caps.getAndroid501Caps(Apps.get("androidApiDemos")) :
+                Caps.getAndroid19Caps(Apps.get("androidApiDemos"));
+            if (Env.isSauce())
+            {
+                capabilities.SetCapability("username", Env.getEnvVar("SAUCE_USERNAME"));
+                capabilities.SetCapability("accessKey", Env.getEnvVar("SAUCE_ACCESS_KEY"));
+                capabilities.SetCapability("name", "android - complex");
+                capabilities.SetCapability("tags", new string[] { "sample" });
+            }
+            Uri serverUri = Env.isSauce() ? AppiumServers.sauceURI : AppiumServers.LocalServiceURIAndroid;
+            driver = new AndroidDriver<AppiumWebElement>(serverUri, capabilities, Env.INIT_TIMEOUT_SEC);
+            driver.Manage().Timeouts().ImplicitlyWait(Env.IMPLICIT_TIMEOUT_SEC);
+            driver.CloseApp();
+        }
+
+        [SetUp]
+        public void SetUp()
+        {
+            if (driver != null)
+            {
+                driver.LaunchApp();
+            }
+        }
+
+        [TearDown]
+        public void TearDowwn()
+        {
+            if (driver != null)
+            {
+                driver.CloseApp();
+            }
+        }
+
+        [Test]
+        public void StartActivityInThisAppTestCase()
+        {
+            driver.StartActivity("io.appium.android.apis", ".ApiDemos");
+
+            Assert.AreEqual(driver.CurrentActivity, ".ApiDemos");
+
+            driver.StartActivity("io.appium.android.apis", ".accessibility.AccessibilityNodeProviderActivity");
+
+            Assert.AreEqual(driver.CurrentActivity, ".accessibility.AccessibilityNodeProviderActivity");
+        }
+
+        [Test]
+        public void StartActivityWithWaitingAppTestCase()
+        {
+            driver.StartActivity("io.appium.android.apis", ".ApiDemos", "io.appium.android.apis", ".ApiDemos");
+
+            Assert.AreEqual(driver.CurrentActivity, ".ApiDemos");
+
+            driver.StartActivity("io.appium.android.apis", ".accessibility.AccessibilityNodeProviderActivity", 
+                "io.appium.android.apis", ".accessibility.AccessibilityNodeProviderActivity");
+
+            Assert.AreEqual(driver.CurrentActivity, ".accessibility.AccessibilityNodeProviderActivity");
+        }
+
+        [Test]
+        public void StartActivityInNewAppTestCase()
+        {
+            driver.StartActivity("io.appium.android.apis", ".ApiDemos");
+
+            Assert.AreEqual(driver.CurrentActivity, ".ApiDemos");
+
+            driver.StartActivity("com.android.contacts", ".ContactsListActivity");
+
+            Assert.AreEqual(driver.CurrentActivity, ".ContactsListActivity");
+            driver.KeyEvent(AndroidKeyCode.Back);
+            Assert.AreEqual(driver.CurrentActivity, ".ContactsListActivity");
+        }
+
+        [Test]
+        public void StartActivityInNewAppTestCaseWithoutClosingApp()
+        {
+            driver.StartActivity("io.appium.android.apis", ".accessibility.AccessibilityNodeProviderActivity");
+
+            Assert.AreEqual(driver.CurrentActivity, ".accessibility.AccessibilityNodeProviderActivity");
+
+            driver.StartActivity("com.android.contacts", ".ContactsListActivity", "com.android.contacts", ".ContactsListActivity", false);
+
+            Assert.AreEqual(driver.CurrentActivity, ".ContactsListActivity");
+            driver.KeyEvent(AndroidKeyCode.Back);
+            Assert.AreEqual(driver.CurrentActivity, ".accessibility.AccessibilityNodeProviderActivity");
+
+        }
+
+        [TestFixtureTearDown]
+        public void AfterAll()
+        {
+            if (driver != null)
+            {
+                driver.Quit();
+            }
+            if (!Env.isSauce())
+            {
+                AppiumServers.StopLocalService();
+            }
+        }
+    }
+}
@@ -6,19 +6,18 @@
 using OpenQA.Selenium.Remote;
 using System;
 
-namespace Appium.Samples
+namespace Appium.Samples.Android
 {
     [TestFixture()]
     class AndroidConnectionTest
     {
         private AppiumDriver<IWebElement> driver;
-        private bool allPassed = true;
 
         [TestFixtureSetUp]
         public void BeforeAll()
         {
             DesiredCapabilities capabilities = Env.isSauce() ?
-                Caps.getAndroid18Caps(Apps.get("androidApiDemos")) :
+                Caps.getAndroid501Caps(Apps.get("androidApiDemos")) :
                 Caps.getAndroid19Caps(Apps.get("androidApiDemos"));
             if (Env.isSauce())
             {
@@ -27,39 +26,32 @@ public void BeforeAll()
                 capabilities.SetCapability("name", "android - complex");
                 capabilities.SetCapability("tags", new string[] { "sample" });
             }
-            Uri serverUri = Env.isSauce() ? AppiumServers.sauceURI : AppiumServers.localURI;
+            Uri serverUri = Env.isSauce() ? AppiumServers.sauceURI : AppiumServers.LocalServiceURIAndroid;
             driver = new AndroidDriver<IWebElement>(serverUri, capabilities, Env.INIT_TIMEOUT_SEC);
             driver.Manage().Timeouts().ImplicitlyWait(Env.IMPLICIT_TIMEOUT_SEC);
         }
 
         [TestFixtureTearDown]
         public void AfterAll()
         {
-            try
+            if (driver != null)
             {
-                if (Env.isSauce())
-                    ((IJavaScriptExecutor)driver).ExecuteScript("sauce:job-result=" + (allPassed ? "passed" : "failed"));
+                driver.Quit();
             }
-            finally
+            if (!Env.isSauce())
             {
-                driver.Quit();
+                AppiumServers.StopLocalService();
             }
         }
 
-        [TearDown]
-        public void AfterEach()
-        {
-            allPassed = allPassed && (TestContext.CurrentContext.Result.State == TestState.Success);
-        }
-
         [Test]
         public void ConnectionTest()
         {
             ((AndroidDriver<IWebElement>)driver).ConnectionType = ConnectionType.AirplaneMode;
             Assert.AreEqual(ConnectionType.AirplaneMode, ((AndroidDriver<IWebElement>)driver).ConnectionType);
 
-            ((AndroidDriver<IWebElement>)driver).ConnectionType = ConnectionType.WifiOnly;
-            Assert.AreEqual(ConnectionType.WifiOnly, ((AndroidDriver<IWebElement>)driver).ConnectionType);
+            ((AndroidDriver<IWebElement>)driver).ConnectionType = ConnectionType.AllNetworkOn;
+            Assert.AreEqual(ConnectionType.AllNetworkOn, ((AndroidDriver<IWebElement>)driver).ConnectionType);
         }
     }
 }
@@ -0,0 +1,101 @@
+using Appium.Samples.Helpers;
+using NUnit.Framework;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Appium.Android;
+using OpenQA.Selenium.Remote;
+using System;
+
+namespace Appium.Samples.Android
+{
+    public class AndroidElementTest
+    {
+        private AndroidDriver<AndroidElement> driver;
+
+        [TestFixtureSetUp]
+        public void BeforeAll()
+        {
+            DesiredCapabilities capabilities = Env.isSauce() ?
+                Caps.getAndroid501Caps(Apps.get("androidApiDemos")) :
+                Caps.getAndroid19Caps(Apps.get("androidApiDemos"));
+            if (Env.isSauce())
+            {
+                capabilities.SetCapability("username", Env.getEnvVar("SAUCE_USERNAME"));
+                capabilities.SetCapability("accessKey", Env.getEnvVar("SAUCE_ACCESS_KEY"));
+                capabilities.SetCapability("name", "android - simple");
+                capabilities.SetCapability("tags", new string[] { "sample" });
+            }
+            Uri serverUri = Env.isSauce() ? AppiumServers.sauceURI : AppiumServers.LocalServiceURIAndroid;
+            driver = new AndroidDriver<AndroidElement>(serverUri, capabilities, Env.INIT_TIMEOUT_SEC);
+            driver.Manage().Timeouts().ImplicitlyWait(Env.IMPLICIT_TIMEOUT_SEC);
+            driver.CloseApp();
+        }
+
+        [SetUp]
+        public void SetUp()
+        {
+            if (driver != null)
+            {
+                driver.LaunchApp();
+            }
+        }
+
+        [TearDown]
+        public void TearDowwn()
+        {
+            if (driver != null)
+            {
+                driver.CloseApp();
+            }
+        }
+
+        [Test()]
+        public void FindByAccessibilityIdTest()
+        {
+            By byAccessibilityId = new ByAccessibilityId("Graphics");
+            Assert.AreNotEqual(driver.FindElementById("android:id/content").FindElement(byAccessibilityId).Text, null);
+            Assert.GreaterOrEqual(driver.FindElementById("android:id/content").FindElements(byAccessibilityId).Count, 1);
+        }
+
+        [Test()]
+        public void FindByAndroidUIAutomatorTest()
+        {
+            By byAndroidUIAutomator = new ByAndroidUIAutomator("new UiSelector().clickable(true)");
+            Assert.IsNotNull(driver.FindElementById("android:id/content").FindElement(byAndroidUIAutomator).Text);
+            Assert.GreaterOrEqual(driver.FindElementById("android:id/content").FindElements(byAndroidUIAutomator).Count, 1);
+        }
+
+        [Test]
+        public void ReplaceValueTest()
+        {
+            String originalValue = "original value";
+            String replacedValue = "replaced value";
+
+            driver.StartActivity("io.appium.android.apis", ".view.Controls1");
+
+            AndroidElement editElement = driver.FindElementByAndroidUIAutomator("resourceId(\"io.appium.android.apis:id/edit\")");
+
+            editElement.SendKeys(originalValue);
+
+            Assert.AreEqual(originalValue, editElement.Text);
+
+            editElement.ReplaceValue(replacedValue);
+
+            Assert.AreEqual(replacedValue, editElement.Text);
+        }
+
+        [TestFixtureTearDown]
+        public void AfterAll()
+        {
+            if (driver != null)
+            {
+                driver.Quit();
+            }
+            if (!Env.isSauce())
+            {
+                AppiumServers.StopLocalService();
+            }
+        }
+
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,18 @@`
`6`	`6`	`using OpenQA.Selenium.Remote;`
`7`	`7`	`using System;`
`8`	`8`
`9`		`-namespace Appium.Samples`
	`9`	`+namespace Appium.Samples.Android`
`10`	`10`	`{`
`11`	`11`	`[TestFixture()]`
`12`	`12`	`class AndroidConnectionTest`
`13`	`13`	`{`
`14`	`14`	`private AppiumDriver<IWebElement> driver;`
`15`		`- private bool allPassed = true;`
`16`	`15`
`17`	`16`	`[TestFixtureSetUp]`
`18`	`17`	`public void BeforeAll()`
`19`	`18`	`{`
`20`	`19`	`DesiredCapabilities capabilities = Env.isSauce() ?`
`21`		`- Caps.getAndroid18Caps(Apps.get("androidApiDemos")) :`
	`20`	`+ Caps.getAndroid501Caps(Apps.get("androidApiDemos")) :`
`22`	`21`	`Caps.getAndroid19Caps(Apps.get("androidApiDemos"));`
`23`	`22`	`if (Env.isSauce())`
`24`	`23`	`{`
`@@ -27,39 +26,32 @@ public void BeforeAll()`
`27`	`26`	`capabilities.SetCapability("name", "android - complex");`
`28`	`27`	`capabilities.SetCapability("tags", new string[] { "sample" });`
`29`	`28`	`}`
`30`		`- Uri serverUri = Env.isSauce() ? AppiumServers.sauceURI : AppiumServers.localURI;`
	`29`	`+ Uri serverUri = Env.isSauce() ? AppiumServers.sauceURI : AppiumServers.LocalServiceURIAndroid;`
`31`	`30`	`driver = new AndroidDriver<IWebElement>(serverUri, capabilities, Env.INIT_TIMEOUT_SEC);`
`32`	`31`	`driver.Manage().Timeouts().ImplicitlyWait(Env.IMPLICIT_TIMEOUT_SEC);`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`[TestFixtureTearDown]`
`36`	`35`	`public void AfterAll()`
`37`	`36`	`{`
`38`		`- try`
	`37`	`+ if (driver != null)`
`39`	`38`	`{`
`40`		`- if (Env.isSauce())`
`41`		`- ((IJavaScriptExecutor)driver).ExecuteScript("sauce:job-result=" + (allPassed ? "passed" : "failed"));`
	`39`	`+ driver.Quit();`
`42`	`40`	`}`
`43`		`- finally`
	`41`	`+ if (!Env.isSauce())`
`44`	`42`	`{`
`45`		`- driver.Quit();`
	`43`	`+ AppiumServers.StopLocalService();`
`46`	`44`	`}`
`47`	`45`	`}`
`48`	`46`
`49`		`- [TearDown]`
`50`		`- public void AfterEach()`
`51`		`- {`
`52`		`- allPassed = allPassed && (TestContext.CurrentContext.Result.State == TestState.Success);`
`53`		`- }`
`54`		`-`
`55`	`47`	`[Test]`
`56`	`48`	`public void ConnectionTest()`
`57`	`49`	`{`
`58`	`50`	`((AndroidDriver<IWebElement>)driver).ConnectionType = ConnectionType.AirplaneMode;`
`59`	`51`	`Assert.AreEqual(ConnectionType.AirplaneMode, ((AndroidDriver<IWebElement>)driver).ConnectionType);`
`60`	`52`
`61`		`- ((AndroidDriver<IWebElement>)driver).ConnectionType = ConnectionType.WifiOnly;`
`62`		`- Assert.AreEqual(ConnectionType.WifiOnly, ((AndroidDriver<IWebElement>)driver).ConnectionType);`
	`53`	`+ ((AndroidDriver<IWebElement>)driver).ConnectionType = ConnectionType.AllNetworkOn;`
	`54`	`+ Assert.AreEqual(ConnectionType.AllNetworkOn, ((AndroidDriver<IWebElement>)driver).ConnectionType);`
`63`	`55`	`}`
`64`	`56`	`}`
`65`	`57`	`}`