Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Commit

Permalink
Merge pull request #39 from xamarin/v25.1.1
Browse files Browse the repository at this point in the history 
V25.1.1
  • Loading branch information
@Redth
Redth authored Feb 13, 2017
2 parents 95d680f + a381302 commit b652773
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 233 deletions.
28 changes: 19 additions & 9 deletions build.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#addin nuget:?package=Cake.Json
#addin nuget:?package=Cake.XCode
#addin nuget:?package=Cake.Xamarin
#addin nuget:?package=Cake.Xamarin.Build&version=1.1.8
#addin nuget:?package=Cake.Xamarin.Build&version=1.1.13
#addin nuget:?package=Cake.FileHelpers
#addin nuget:?package=Cake.MonoApiTools

Expand All @@ -15,14 +15,14 @@ LogSystemInfo ();

var TARGET = Argument ("t", Argument ("target", "Default"));

var NUGET_VERSION = "25.1.0";
var COMPONENT_VERSION = "25.1.0.0";
var AAR_VERSION = "25.1.0";
var NUGET_VERSION = "25.1.1";
var COMPONENT_VERSION = "25.1.1.0";
var AAR_VERSION = "25.1.1";

// FROM: https://dl.google.com/android/repository/addon.xml
// FROM: https://dl.google.com/android/repository/addon2-1.xml
var M2_REPOSITORY_URL = "https://dl-ssl.google.com/android/repository/android_m2repository_r41.zip";
var M2_REPOSITORY_SHA1 = "782e7233f18c890463e8602571d304e680ce354c";
var M2_REPOSITORY_URL = "https://dl-ssl.google.com/android/repository/android_m2repository_r42.zip";
var M2_REPOSITORY_SHA1 = "175c56e2e2aa6fec560430318f56ed98eaeaea04";
var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r25-macosx.zip";
//var DOCS_URL = "https://dl-ssl.google.com/android/repository/docs-23_r01.zip";
var ANDROID_SDK_VERSION = IsRunningOnWindows () ? "v7.0" : "android-24";
Expand Down Expand Up @@ -329,14 +329,24 @@ Task ("component-setup").Does (() =>
}
});


Task ("nuget-setup").IsDependentOn ("buildtasks").Does (() => {
Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals")
.WithCriteria (!FileExists ("./generated.targets")).Does (() => {
var templateText = FileReadText ("./template.targets");
if (FileExists ("./generated.targets"))
DeleteFile ("./generated.targets");
var downloadParts = DeserializeJsonFromFile<List<PartialZipInfo>> ("./partial-download-info.json");
// Get the zip file offsets for the relevant aar's
var downloadParts = FindZipEntries ("./externals/m2repository.zip")
.Where (e => e.EntryName.Contains (AAR_VERSION)
&& (e.EntryName.Contains (".aar") || e.EntryName.Contains (".jar")))
.Select (e => new PartialZipInfo {
RangeStart = e.RangeStart,
RangeEnd = e.RangeEnd,
Url = M2_REPOSITORY_URL,
LocalPath = e.EntryName,
Md5 = ReadZipEntryText ("./externals/m2repository.zip", e.EntryName + ".md5", readBinaryAsHex: false)
}).ToList ();
foreach (var aar in AAR_INFOS) {
Expand Down
4 changes: 1 addition & 3 deletions design/samples/Cheesesquare.UITests/Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void BeforeEachTest ()
public void ClickingHamburgerShouldRevealDrawer ()
{
app.Screenshot ("Launch");
app.Tap(t => t.Class("ImageButton"));
app.Tap(t => t.Marked("Navigate up"));
app.WaitForElement(t => t.Text("Discussion"));
app.Screenshot ("Tap Hamburger");
}
Expand All @@ -36,8 +36,6 @@ public void ClickingFloatingActionButtonShouldDisplaySnackbar ()
{
app.Screenshot ("Launch");
app.Tap (q => q.Id ("fab"));
app.Screenshot ("Tap Button");
app.WaitForElement (q => q.Id ("snackbar_text"));
app.Screenshot ("Snackbar");
}

Expand Down
202 changes: 0 additions & 202 deletions partial-download-info.json
View file

This file was deleted.

20 changes: 8 additions & 12 deletions v7-appcompat/samples/AndroidSupportSample.UITests/Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,24 +91,20 @@ public void ActionBarTabs ()
public void DisplayOptions ()
{
app.Screenshot ("Launch");
app.Tap(q => q.Text("Display Options"));
app.WaitForElement (q => q.Class ("Toolbar"));
app.Tap(q => q.Marked("Display Options"));
app.WaitForElement (q => q.Marked ("toggle_navigation"));
app.Screenshot ("Display Options");

app.Tap (q => q.Id ("toggle_home_as_up"));
app.WaitForElement (q => q.Class ("ImageButton"));
app.Tap (q => q.Marked ("toggle_home_as_up"));
app.WaitForElement (q => q.Marked ("Navigate up"));
app.Screenshot ("Toggle Home as Up");

app.Tap (q => q.Id ("toggle_show_title"));
app.WaitForNoElement (q => q.Text ("Display Options"));
app.Tap (q => q.Marked ("toggle_show_title"));
app.WaitForNoElement (q => q.Marked ("Display Options"));
app.Screenshot ("Hide Title");
app.Tap (q => q.Id ("toggle_show_title"));
app.WaitForElement (q => q.Text ("Display Options"));
app.Tap (q => q.Marked ("toggle_show_title"));
app.WaitForElement (q => q.Marked ("Display Options"));
app.Screenshot ("Show Title");

app.Tap (q => q.Id ("toggle_visibility"));
app.WaitForNoElement (q => q.Class ("Toolbar"));
app.Screenshot ("Hide Toolbar");
}

[Test]
Expand Down
10 changes: 5 additions & 5 deletions v7-gridlayout/samples/AndroidSupportSample.UITests/Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public void BeforeEachTest ()
.StartApp ();
}

// [Test]
[Test]
public void Repl ()
{
app.Repl ();
Expand Down Expand Up @@ -55,13 +55,13 @@ public void FormXml ()
}

[Test]
public void FormJava ()
public void FormCSharp ()
{
app.Screenshot ("Launch");
app.Tap (q => q.Text ("3. Form (Java)"));
app.Screenshot ("Tap 3. Form (Java)");
app.Tap (q => q.Text ("3. Form (C#)"));
app.Screenshot ("Tap 3. Form (C#)");
app.WaitForElement (q => q.Class ("GridLayout"));
app.Screenshot ("Form Java");
app.Screenshot ("Form C#");
}
}
}
Expand Down
24 changes: 22 additions & 2 deletions v7-preference/samples/AndroidSupportSample.UITests/Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public void BeforeEachTest ()
.StartApp ();
}

//[Test]
[Test]
public void Repl ()
{
app.Repl ();
Expand All @@ -32,8 +32,28 @@ public void Repl ()
public void AppLaunches ()
{
app.Screenshot ("Launch");
app.WaitForElement (q => q.Class ("PercentFrameLayout"));
app.WaitForElement (q => q.Marked ("List Preference"));
}

[Test]
public void ListPreference()
{
app.Screenshot("Launch");
app.WaitForElement(q => q.Marked("List Preference"));
app.Tap(q => q.Marked("List Preference"));
app.WaitForElement(q => q.Marked("Three"));
app.Screenshot("List Preference");
}

[Test]
public void EditTextPreference()
{
app.Screenshot("Launch");
app.WaitForElement(q => q.Marked("Edit Text Preference"));
app.Tap(q => q.Marked("Edit Text Preference"));
app.WaitForElement(q => q.Marked("Dialog Title Edit Text Preference"));
app.Screenshot("Edit Text Preference");
}
}
}

0 comments on commit b652773

Please sign in to comment.