Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: 345708b4fc
...
compare: 1547f4b240
  • 4 commits
  • 8 files changed
  • 0 commit comments
  • 2 contributors
View
19 src/SWTOR.Parser.sln
@@ -7,7 +7,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWTOR.Parser.Tests", "SWTOR
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWTOR.Web", "SWTOR.Web\SWTOR.Web.csproj", "{F217B7A9-EEF9-48AF-944E-15D915A8CDF4}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3FCDD13C-714A-48E1-B97A-CFE0AD74F8C0}"
+ ProjectSection(SolutionItems) = preProject
+ Local.testsettings = Local.testsettings
+ ..\README.markdown = ..\README.markdown
+ SWTOR.Parser.vsmdi = SWTOR.Parser.vsmdi
+ TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWTOR.Web.Tests", "SWTOR.Web.Tests\SWTOR.Web.Tests.csproj", "{0F4623EF-6ECB-488A-AB8D-369A131C4044}"
+EndProject
Global
+ GlobalSection(TestCaseManagementSettings) = postSolution
+ CategoryFile = SWTOR.Parser.vsmdi
+ EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Default|Any CPU = Default|Any CPU
@@ -31,6 +44,12 @@ Global
{F217B7A9-EEF9-48AF-944E-15D915A8CDF4}.Default|Any CPU.Build.0 = Debug|Any CPU
{F217B7A9-EEF9-48AF-944E-15D915A8CDF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F217B7A9-EEF9-48AF-944E-15D915A8CDF4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0F4623EF-6ECB-488A-AB8D-369A131C4044}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0F4623EF-6ECB-488A-AB8D-369A131C4044}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0F4623EF-6ECB-488A-AB8D-369A131C4044}.Default|Any CPU.ActiveCfg = Debug|Any CPU
+ {0F4623EF-6ECB-488A-AB8D-369A131C4044}.Default|Any CPU.Build.0 = Debug|Any CPU
+ {0F4623EF-6ECB-488A-AB8D-369A131C4044}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0F4623EF-6ECB-488A-AB8D-369A131C4044}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
6 src/SWTOR.Parser.vsmdi
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+ <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
+ <RunConfiguration id="ade35769-d649-47e5-b80a-ba1f2051bf17" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ </TestList>
+</TestLists>
View
2  src/SWTOR.Parser/Analyzer.cs
@@ -41,7 +41,7 @@ private List<DpsPerCharacter> FillEmptyDataPoints(List<DpsPerCharacter> list)
var allIntervals = list.Select(m => m.interval).Distinct().OrderBy(m => m).ToList();
// Fill in missing intervals
- var lastInterval = allIntervals.First();
+ var lastInterval = allIntervals.FirstOrDefault();
foreach (var interval in allIntervals.OrderBy(m => m))
{
int diff = interval - lastInterval;
View
27 src/SWTOR.Web.Tests/Controllers/APIControllerTest.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.Mvc;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SWTOR.Web.Controllers;
+
+namespace SWTOR.Web.Controllers.Tests
+{
+ [TestClass]
+ public class APIControllerTest
+ {
+ [TestMethod]
+ public void Parse()
+ {
+ // Arrange
+ var controller = new APIController();
+
+ // Act
+ ContentResult result = controller.ParseText(@"[03/17/2012 19:30:34] [@Argorash] [@Argorash] [Personal Vehicle {2176247043981312}] [RemoveEffect {836045448945478}: Personal Vehicle {2176247043981312}] ()") as ContentResult;
+
+ // Assert
+ Assert.AreEqual("[{\"timestamp\":\"\\/Date(1332037834000)\\/\",\"source\":{\"isPlayer\":true,\"name\":\"Argorash\",\"number\":0},\"target\":{\"isPlayer\":true,\"name\":\"Argorash\",\"number\":0},\"ability\":{\"name\":\"Personal Vehicle\",\"number\":2176247043981312},\"event\":{\"name\":\"RemoveEffect\",\"number\":836045448945478},\"effect\":{\"subtype\":\"\",\"name\":\"Personal Vehicle\",\"number\":2176247043981312},\"result\":{\"amount\":0,\"isCritical\":false,\"name\":\"\",\"number\":0},\"defense\":{\"name\":\"\",\"number\":0},\"mitigation\":{\"amount\":0,\"isCritical\":false,\"name\":\"\",\"number\":0},\"threat\":0}]", result.Content.ToString());
+ }
+ }
+}
View
28 src/SWTOR.Web.Tests/Controllers/HomeControllerTest.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.Mvc;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SWTOR.Web.Controllers;
+
+namespace SWTOR.Web.Controllers.Tests
+{
+ [TestClass]
+ public class HomeControllerTest
+ {
+ [TestMethod]
+ public void Index()
+ {
+ // Arrange
+ HomeController controller = new HomeController();
+
+ // Act
+ ViewResult result = controller.Index() as ViewResult;
+
+ // Assert
+ Assert.IsNotNull(result);
+
+ }
+ }
+}
View
35 src/SWTOR.Web.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SWTOR.Web.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SWTOR.Web.Tests")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("66340a94-86a7-47bb-ad19-c7e02f1cfe77")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
View
67 src/SWTOR.Web.Tests/SWTOR.Web.Tests.csproj
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>
+ </ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{0F4623EF-6ECB-488A-AB8D-369A131C4044}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>SWTOR.Web.Tests</RootNamespace>
+ <AssemblyName>SWTOR.Web.Tests</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ <Reference Include="System" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ </ItemGroup>
+ <ItemGroup>
+ <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+ <Visible>False</Visible>
+ </CodeAnalysisDependentAssemblyPaths>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Controllers\APIControllerTest.cs" />
+ <Compile Include="Controllers\HomeControllerTest.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\SWTOR.Web\SWTOR.Web.csproj">
+ <Project>{F217B7A9-EEF9-48AF-944E-15D915A8CDF4}</Project>
+ <Name>SWTOR.Web</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
View
21 src/TraceAndTestImpact.testsettings
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestSettings name="Trace and Test Impact" id="7ada7d7e-59ee-4976-951f-a476fec12cb0" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+ <Description>These are test settings for Trace and Test Impact.</Description>
+ <Execution>
+ <TestTypeSpecific />
+ <AgentRule name="Execution Agents">
+ <DataCollectors>
+ <DataCollector uri="datacollector://microsoft/SystemInfo/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.SystemInfoDataCollector, Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="System Information">
+ </DataCollector>
+ <DataCollector uri="datacollector://microsoft/ActionLog/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.ManualTest.ActionLog.ActionLogPlugin, Microsoft.VisualStudio.TestTools.ManualTest.ActionLog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Actions">
+ </DataCollector>
+ <DataCollector uri="datacollector://microsoft/HttpProxy/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.HttpProxyCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="ASP.NET Client Proxy for IntelliTrace and Test Impact">
+ </DataCollector>
+ <DataCollector uri="datacollector://microsoft/TestImpact/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TestImpactDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Test Impact">
+ </DataCollector>
+ <DataCollector uri="datacollector://microsoft/TraceDebugger/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TraceDebuggerDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="IntelliTrace">
+ </DataCollector>
+ </DataCollectors>
+ </AgentRule>
+ </Execution>
+</TestSettings>

No commit comments for this range

Something went wrong with that request. Please try again.