Commit 32d1305a authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Fixed iOS tests + Added icons.

parent 3be6d9c8
...@@ -5,7 +5,7 @@ TOUCH_SERVER=./Touch.Server/bin/Debug/Touch.Server.exe ...@@ -5,7 +5,7 @@ TOUCH_SERVER=./Touch.Server/bin/Debug/Touch.Server.exe
all: build-simulator build-device all: build-simulator build-device
run run-test: run-device run run-test: run-simulator run-device
touch-server: touch-server:
cd Touch.Server && xbuild cd Touch.Server && xbuild
......
using System;
using NUnit.Framework;
namespace LuaInterfaceTest
{
[TestFixture]
public class Core
{
[Test]
public void Pass ()
{
Assert.True (true);
}
[Test]
public void Fail ()
{
//Assert.False (true);
}
[Test]
[Ignore ("another time")]
public void Ignore ()
{
//Assert.True (false);
}
}
}
...@@ -28,5 +28,18 @@ ...@@ -28,5 +28,18 @@
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0</string> <string>1.0</string>
<key>CFBundleIconFiles</key>
<array>
<string>Icons/Icon</string>
<string>Icons/Icon@2x</string>
<string>Icons/Icon-72</string>
<string>Icons/Icon-72@2x</string>
<string>Icons/Icon-Small</string>
<string>Icons/Icon-Small@2x</string>
<string>Icons/Icon-Small-50</string>
<string>Icons/Icon-Small-50@2x</string>
</array>
<key>UIPrerenderedIcon</key>
<true/>
</dict> </dict>
</plist> </plist>
...@@ -17,12 +17,11 @@ ...@@ -17,12 +17,11 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>False</Optimize> <Optimize>False</Optimize>
<OutputPath>bin\iPhoneSimulator\Debug</OutputPath> <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants> <DefineConstants>DEBUG;MONOTOUCH</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause> <ConsolePause>False</ConsolePause>
<MtouchDebug>True</MtouchDebug> <MtouchDebug>True</MtouchDebug>
<MtouchProfiling>True</MtouchProfiling>
<MtouchLink>None</MtouchLink> <MtouchLink>None</MtouchLink>
<MtouchI18n /> <MtouchI18n />
<MtouchArch>ARMv7</MtouchArch> <MtouchArch>ARMv7</MtouchArch>
...@@ -34,24 +33,27 @@ ...@@ -34,24 +33,27 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause> <ConsolePause>False</ConsolePause>
<MtouchLink>None</MtouchLink>
<MtouchI18n /> <MtouchI18n />
<MtouchArch>ARMv7</MtouchArch> <MtouchArch>ARMv7</MtouchArch>
<MtouchUseLlvm>True</MtouchUseLlvm>
<MtouchUseSGen>True</MtouchUseSGen>
<MtouchUseRefCounting>True</MtouchUseRefCounting>
<DefineConstants>MONOTOUCH</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>False</Optimize> <Optimize>False</Optimize>
<OutputPath>bin\iPhone\Debug</OutputPath> <OutputPath>bin\iPhone\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants> <DefineConstants>DEBUG;MONOTOUCH</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause> <ConsolePause>False</ConsolePause>
<CodesignKey>iPhone Developer</CodesignKey> <CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>True</MtouchDebug> <MtouchDebug>True</MtouchDebug>
<MtouchProfiling>True</MtouchProfiling>
<MtouchI18n /> <MtouchI18n />
<MtouchArch>ARMv7</MtouchArch> <MtouchArch>ARMv7</MtouchArch>
<MtouchLink>None</MtouchLink>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType> <DebugType>none</DebugType>
...@@ -64,9 +66,11 @@ ...@@ -64,9 +66,11 @@
<IpaPackageName /> <IpaPackageName />
<MtouchI18n /> <MtouchI18n />
<MtouchArch>ARMv7</MtouchArch> <MtouchArch>ARMv7</MtouchArch>
<MtouchLink>None</MtouchLink> <BuildIpa>True</BuildIpa>
<MtouchUseLlvm>true</MtouchUseLlvm> <DefineConstants>MONOTOUCH</DefineConstants>
<BuildIpa>true</BuildIpa> <MtouchUseLlvm>True</MtouchUseLlvm>
<MtouchUseSGen>True</MtouchUseSGen>
<MtouchUseRefCounting>True</MtouchUseRefCounting>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
<DebugType>none</DebugType> <DebugType>none</DebugType>
...@@ -101,6 +105,7 @@ ...@@ -101,6 +105,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Resources\" /> <Folder Include="Resources\" />
<Folder Include="Icons\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Info.plist" /> <None Include="Info.plist" />
...@@ -117,6 +122,7 @@ ...@@ -117,6 +122,7 @@
<Compile Include="..\..\tests\TestLua.cs"> <Compile Include="..\..\tests\TestLua.cs">
<Link>TestLua.cs</Link> <Link>TestLua.cs</Link>
</Compile> </Compile>
<Compile Include="Core.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup> <ItemGroup>
...@@ -129,5 +135,13 @@ ...@@ -129,5 +135,13 @@
<BundleResource Include="..\..\tests\test.lua"> <BundleResource Include="..\..\tests\test.lua">
<Link>test.lua</Link> <Link>test.lua</Link>
</BundleResource> </BundleResource>
<BundleResource Include="Icons\Icon-72.png" />
<BundleResource Include="Icons\Icon-72%402x.png" />
<BundleResource Include="Icons\Icon-Small-50.png" />
<BundleResource Include="Icons\Icon-Small-50%402x.png" />
<BundleResource Include="Icons\Icon-Small.png" />
<BundleResource Include="Icons\Icon-Small%402x.png" />
<BundleResource Include="Icons\Icon.png" />
<BundleResource Include="Icons\Icon%402x.png" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -6,4 +6,4 @@ cd ../../ ...@@ -6,4 +6,4 @@ cd ../../
cp Core/KeraLua/external/lua/osx/lib/liblua51.dylib tests/liblua51.dylib cp Core/KeraLua/external/lua/osx/lib/liblua51.dylib tests/liblua51.dylib
xbuild LuaInterface.sln /p:Configuration=Release xbuild LuaInterface.sln /p:Configuration=Release
cd tests/ cd tests/
nunit-console LuaInterfaceTest.dll nunit-console LuaInterfaceTest.dll /xml=$1
...@@ -7,10 +7,16 @@ using System.Reflection; ...@@ -7,10 +7,16 @@ using System.Reflection;
using System.Threading; using System.Threading;
using LuaInterface; using LuaInterface;
using LuaInterface.Exceptions; using LuaInterface.Exceptions;
#if MONOTOUCH
using MonoTouch.Foundation;
#endif
namespace LuaInterfaceTest namespace LuaInterfaceTest
{ {
[TestFixture] [TestFixture]
#if MONOTOUCH
[Preserve (AllMembers = true)]
#endif
public class LuaTests public class LuaTests
{ {
/* /*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment