Cleaning up of PR #151

* Adding content/source to all platform test projects
mono · Mar 3, 2015 · 87b24db · 87b24db
1 parent 2826162
commit 87b24db
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 11 deletions.
diff --git a/tests/tests/Assets/Content/TileMaps/fixed-ortho-bgtiles.xnb b/tests/tests/Assets/Content/TileMaps/fixed-ortho-bgtiles.xnb
diff --git a/...t/TileMaps/orthogonal-test-multilayer.tmx → ...t/TileMaps/orthogonal-test-multilayer.xnb b/...t/TileMaps/orthogonal-test-multilayer.tmx → ...t/TileMaps/orthogonal-test-multilayer.xnb
diff --git a/...nt/TileMaps/orthogonal-test-polylines.tmx → ...nt/TileMaps/orthogonal-test-polylines.xnb b/...nt/TileMaps/orthogonal-test-polylines.tmx → ...nt/TileMaps/orthogonal-test-polylines.xnb
diff --git a/tests/tests/Content/TileMaps/fixed-ortho-bgtiles.png b/tests/tests/Content/TileMaps/fixed-ortho-bgtiles.png
diff --git a/tests/tests/Content/TileMaps/fixed-ortho-bgtiles.xnb b/tests/tests/Content/TileMaps/fixed-ortho-bgtiles.xnb
diff --git a/tests/tests/Content/TileMaps/orthogonal-test-multilayer.xnb b/tests/tests/Content/TileMaps/orthogonal-test-multilayer.xnb
diff --git a/tests/tests/Content/TileMaps/orthogonal-test-polylines.xnb b/tests/tests/Content/TileMaps/orthogonal-test-polylines.xnb
diff --git a/tests/tests/classes/tests/TileMapTest/TileMapTest.cs b/tests/tests/classes/tests/TileMapTest/TileMapTest.cs
@@ -1345,7 +1345,7 @@ public override string Title
 
     public class TMXPolylineTest : TileDemo
     {
-        public TMXPolylineTest() : base("TileMaps/orthogonal-test-polylines.tmx")
+        public TMXPolylineTest() : base("TileMaps/orthogonal-test-polylines")
         {
 			// Polylines render purple
 			// Polygons render yellow
@@ -1456,7 +1456,7 @@ public override string Title
 
     public class TMXMultiLayerTest : TileDemo
     {
-        public TMXMultiLayerTest() : base("TileMaps/orthogonal-test-multilayer.tmx")
+        public TMXMultiLayerTest() : base("TileMaps/orthogonal-test-multilayer")
         {
 			// Background layer should display red circles
         }

diff --git a/tests/tests/tests.Android.csproj b/tests/tests/tests.Android.csproj
@@ -560,6 +560,7 @@
     <Compile Include="..\..\Extensions\GUI\CCScrollView\CCTableViewCell.cs">
       <Link>Extensions\GUI\CCScrollView\CCTableViewCell.cs</Link>
     </Compile>
+    <Compile Include="classes\tests\TileMapTest\Shapes.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\Content\animations\animations-2.plist.xnb">
@@ -2046,6 +2047,9 @@
       <Link>Assets\Content\TileMaps\iso-test-zorder1.tmx</Link>
     </AndroidAsset>
     <AndroidAsset Include="Assets\Content\TileMaps\tilemap_no_encoding.xnb" />
+    <AndroidAsset Include="Assets\Content\TileMaps\fixed-ortho-bgtiles.xnb" />
+    <AndroidAsset Include="Assets\Content\TileMaps\orthogonal-test-multilayer.xnb" />
+    <AndroidAsset Include="Assets\Content\TileMaps\orthogonal-test-polylines.xnb" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\Layout\Main.axml" />

diff --git a/tests/tests/tests.MacOS.csproj b/tests/tests/tests.MacOS.csproj
@@ -1149,6 +1149,7 @@
     </Compile>
     <Compile Include="classes\TestNavigationLayer.cs" />
     <Compile Include="classes\tests\Physics\PhysicsTest.cs" />
+    <Compile Include="classes\tests\TileMapTest\Shapes.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="PhoneGameThumb_iPad.png" />
@@ -2509,6 +2510,9 @@
       <Link>Content\TileMaps\iso-test-zorder1.tmx</Link>
     </Content>
     <Content Include="Content\TileMaps\tilemap_no_encoding.xnb" />
+    <Content Include="Content\TileMaps\fixed-ortho-bgtiles.xnb" />
+    <Content Include="Content\TileMaps\orthogonal-test-multilayer.xnb" />
+    <Content Include="Content\TileMaps\orthogonal-test-polylines.xnb" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="classes\tests\ExtensionsTest\ControlExtensionTest\CCControlButtonTest\CCControlButtonTest.cs" />

diff --git a/tests/tests/tests.Ouya.csproj b/tests/tests/tests.Ouya.csproj
@@ -340,6 +340,7 @@
     <Compile Include="Classes\tests\TextInputTest\TextInputTestScene.cs" />
     <Compile Include="Classes\tests\Texture2dTest\Texture2dTest.cs" />
     <Compile Include="Classes\tests\TileMapTest\TileMapTest.cs" />
+    <Compile Include="classes\tests\TileMapTest\Shape.cs" />
     <Compile Include="Classes\tests\TouchesTest\Ball.cs" />
     <Compile Include="Classes\tests\TouchesTest\Paddle.cs" />
     <Compile Include="Classes\tests\TouchesTest\PongLayer.cs" />

diff --git a/tests/tests/tests.PSM.csproj b/tests/tests/tests.PSM.csproj
@@ -1975,6 +1975,7 @@
     <Compile Include="classes\tests\TextInputTest\TextInputTestScene.cs" />
     <Compile Include="classes\tests\Texture2dTest\Texture2dTest.cs" />
     <Compile Include="classes\tests\TileMapTest\TileMapTest.cs" />
+    <Compile Include="classes\tests\TileMapTest\Shape.cs" />
     <Compile Include="classes\tests\TouchesTest\Ball.cs" />
     <Compile Include="classes\tests\TouchesTest\Paddle.cs" />
     <Compile Include="classes\tests\TouchesTest\PongLayer.cs" />

diff --git a/tests/tests/tests.Phone.csproj b/tests/tests/tests.Phone.csproj
@@ -877,6 +877,10 @@
     <Compile Include="classes\tests\TileMapTest\TileMapTest.cs">
       <SubType>Code</SubType>
     </Compile>
+    </Compile>
+    <Compile Include="classes\tests\TileMapTest\Shape.cs" />
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="classes\tests\TouchesTest\Ball.cs">
       <SubType>Code</SubType>
     </Compile>

diff --git a/tests/tests/tests.Windows.csproj b/tests/tests/tests.Windows.csproj
@@ -418,6 +418,7 @@
     <Compile Include="classes\tests\TextInputTest\TextInputTestScene.cs" />
     <Compile Include="classes\tests\Texture2dTest\Texture2dTest.cs" />
     <Compile Include="classes\tests\TileMapTest\TileMapTest.cs" />
+    <Compile Include="classes\tests\TileMapTest\Shape.cs" />
     <Compile Include="classes\tests\TouchesTest\Ball.cs" />
     <Compile Include="classes\tests\TouchesTest\Paddle.cs" />
     <Compile Include="classes\tests\TouchesTest\PongLayer.cs" />

diff --git a/tests/tests/tests.WindowsDX.csproj b/tests/tests/tests.WindowsDX.csproj
@@ -395,6 +395,7 @@
     <Compile Include="classes\tests\TextInputTest\TextInputTestScene.cs" />
     <Compile Include="classes\tests\Texture2dTest\Texture2dTest.cs" />
     <Compile Include="classes\tests\TileMapTest\TileMapTest.cs" />
+    <Compile Include="classes\tests\TileMapTest\Shape.cs" />
     <Compile Include="classes\tests\TouchesTest\Ball.cs" />
     <Compile Include="classes\tests\TouchesTest\Paddle.cs" />
     <Compile Include="classes\tests\TouchesTest\PongLayer.cs" />

diff --git a/tests/tests/tests.WindowsGL.csproj b/tests/tests/tests.WindowsGL.csproj
@@ -426,9 +426,6 @@
       <Link>Content\%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\TileMaps\fixed-ortho-bgtiles.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Game.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -456,12 +453,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="app.config" />
-    <Content Include="Content\TileMaps\orthogonal-test-polylines.tmx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\TileMaps\orthogonal-test-multilayer.tmx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Content\animations\" />

diff --git a/tests/tests/tests.XBox360.csproj b/tests/tests/tests.XBox360.csproj
@@ -348,6 +348,7 @@
     <Compile Include="classes\tests\TextInputTest\TextInputTestScene.cs" />
     <Compile Include="classes\tests\Texture2dTest\Texture2dTest.cs" />
     <Compile Include="classes\tests\TileMapTest\TileMapTest.cs" />
+    <Compile Include="classes\tests\TileMapTest\Shape.cs" />
     <Compile Include="classes\tests\TouchesTest\Ball.cs" />
     <Compile Include="classes\tests\TouchesTest\Paddle.cs" />
     <Compile Include="classes\tests\TouchesTest\PongLayer.cs" />

diff --git a/tests/tests/tests.iOS.csproj b/tests/tests/tests.iOS.csproj
@@ -1130,6 +1130,7 @@
     <Compile Include="..\..\Extensions\GUI\CCScrollView\CCTableViewCell.cs">
       <Link>Extensions\GUI\CCScrollView\CCTableViewCell.cs</Link>
     </Compile>
+    <Compile Include="classes\tests\TileMapTest\Shapes.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.iOS.plist">
@@ -1230,6 +1231,9 @@
       <Link>Content\TileMaps\iso-test-zorder1.tmx</Link>
     </Content>
     <Content Include="Content\TileMaps\tilemap_no_encoding.xnb" />
+    <Content Include="Content\TileMaps\fixed-ortho-bgtiles.xnb" />
+    <Content Include="Content\TileMaps\orthogonal-test-multilayer.xnb" />
+    <Content Include="Content\TileMaps\orthogonal-test-polylines.xnb" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\animations\animations-2.plist.xnb" />

diff --git a/tests/testsContent/testsContent.contentproj b/tests/testsContent/testsContent.contentproj
@@ -544,6 +544,27 @@
       <Processor>TMXProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TileMaps\fixed-ortho-bgtiles.png">
+      <Name>fixed-ortho-bgtiles</Name>
+      <Importer>TextImporter</Importer>
+      <Processor>TextProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TileMaps\orthogonal-test-multilayer.tmx">
+      <Name>orthogonal-test-multilayer</Name>
+      <Importer>TMXImporter</Importer>
+      <Processor>TMXProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TileMaps\orthogonal-test-polylines.tmx">
+      <Name>orthogonal-test-polylines</Name>
+      <Importer>TMXImporter</Importer>
+      <Processor>TMXProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="TileMaps\orthogonal-test-zorder.tmx">
       <Name>orthogonal-test-zorder</Name>

diff --git a/tests/testsContent/testsContent.iOS.contentproj b/tests/testsContent/testsContent.iOS.contentproj
@@ -861,6 +861,27 @@
       <Processor>TMXProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TileMaps\fixed-ortho-bgtiles.png">
+      <Name>fixed-ortho-bgtiles</Name>
+      <Importer>TextImporter</Importer>
+      <Processor>TextProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TileMaps\orthogonal-test-multilayer.tmx">
+      <Name>orthogonal-test-multilayer</Name>
+      <Importer>TMXImporter</Importer>
+      <Processor>TMXProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TileMaps\orthogonal-test-polylines.tmx">
+      <Name>orthogonal-test-polylines</Name>
+      <Importer>TMXImporter</Importer>
+      <Processor>TMXProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="TileMaps\orthogonal-test-zorder.tmx">
       <Name>orthogonal-test-zorder</Name>