-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fixed issue introduced in commit 4141d69 (wrong variable test in constructor) * implemented fix for #37 * added test for GetCustomVariable()
- Loading branch information
Showing
6 changed files
with
201 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{A6F87572-AB3D-477E-A97E-300DFED8CB5C}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>Piwik.Tracker.Tests</RootNamespace> | ||
| <AssemblyName>Piwik.Tracker.Tests</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| </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="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> | ||
| <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath> | ||
| <Private>True</Private> | ||
| </Reference> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="System.Data.DataSetExtensions" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.Net.Http" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="PiwikTrackerTests.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="packages.config" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\Piwik.Tracker\Piwik.Tracker.csproj"> | ||
| <Project>{c3bb0e94-f45c-4691-81ff-061fc20e3209}</Project> | ||
| <Name>Piwik.Tracker</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildToolsPath)\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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| using System; | ||
| using NUnit.Framework; | ||
|
|
||
| namespace Piwik.Tracker.Tests | ||
| { | ||
| [TestFixture] | ||
| public class PiwikTrackerTests | ||
| { | ||
| private const string UA = "Firefox"; | ||
| private static readonly string PiwikBaseUrl = "http://piwik.local"; | ||
| private static readonly int SiteId = 1; | ||
|
|
||
| [Test] | ||
| [TestCase(Scopes.Page, null, null, null)] | ||
| [TestCase(Scopes.Page, 2, null, null)] | ||
| [TestCase(Scopes.Page, 2, "myPageVar", "myPageVarValue")] | ||
| [TestCase(Scopes.Event, null, null, null)] | ||
| [TestCase(Scopes.Event, 3, null, null)] | ||
| [TestCase(Scopes.Event, 3, "myEventVar", "myEventVarValue")] | ||
| [TestCase(Scopes.Visit, null, null, null)] | ||
| [TestCase(Scopes.Visit, 4, null, null)] | ||
| [TestCase(Scopes.Visit, 4, "myVisitVar", "myVisitVarValue")] | ||
| public void GetCustomVariable_Test(Scopes variableScope, int? variableId, string variableName, string variableValue) | ||
| { | ||
| //Arrange | ||
| var sut = new PiwikTracker(SiteId, PiwikBaseUrl); | ||
| if (variableId != null) | ||
| { | ||
| sut.SetCustomVariable(variableId.Value, variableName, variableValue, variableScope); | ||
| } | ||
| //Act | ||
|
|
||
| var actual = sut.GetCustomVariable(variableId ?? 99, variableScope); | ||
| //Assert | ||
| if (variableId != null) | ||
| { | ||
| Assert.That(actual.Name, Is.EqualTo(variableName)); | ||
| Assert.That(actual.Value, Is.EqualTo(variableValue)); | ||
| } | ||
| else | ||
| { | ||
| Assert.That(actual, Is.Null); | ||
| } | ||
| } | ||
|
|
||
| [Test] | ||
| public void GetCustomVariable_WhenScopeIsVisit_ReturnsVariableFromCookie() | ||
| { | ||
| Assert.That(false, Is.True, "Todo: Provide abillity to mock cookie!"); | ||
| } | ||
|
|
||
| [Test] | ||
| public void GetCustomVariable_WhenInvalidScopeArgument_Throws() | ||
| { | ||
| //Arrange | ||
| var sut = new PiwikTracker(SiteId, PiwikBaseUrl); | ||
|
|
||
| //Act & Assert | ||
| Assert.Throws<ArgumentException>(() => sut.GetCustomVariable(1, (Scopes)1234)); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| 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("Piwik.Tracker.Tests")] | ||
| [assembly: AssemblyDescription("")] | ||
| [assembly: AssemblyConfiguration("")] | ||
| [assembly: AssemblyCompany("")] | ||
| [assembly: AssemblyProduct("Piwik.Tracker.Tests")] | ||
| [assembly: AssemblyCopyright("Copyright © 2017")] | ||
| [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("a6f87572-ab3d-477e-a97e-300dfed8cb5c")] | ||
|
|
||
| // 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.*")] | ||
| [assembly: AssemblyVersion("1.0.0.0")] | ||
| [assembly: AssemblyFileVersion("1.0.0.0")] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="NUnit" version="3.6.0" targetFramework="net45" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters