Skip to content

Commit

Permalink
Diverse changes to ICTKeysight3070Importer and bugfixes. New prefix l…
Browse files Browse the repository at this point in the history
…ogic in UnitMapper.
  • Loading branch information
Jon Grendstad committed Dec 22, 2023
1 parent 3f64829 commit 4489693
Show file tree
Hide file tree
Showing 6 changed files with 223 additions and 93 deletions.
26 changes: 13 additions & 13 deletions ConverterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ public void SetupClient()
InitializeAPI(true);
}

[TestMethod]
public void ICTKeysight3070Importer()
{
InitializeAPI(true);
string fn = "";
Dictionary<string, string> arguments = new ICTKeysight3070Importer().ConverterParameters;
ICTKeysight3070Importer converter = new ICTKeysight3070Importer(arguments);
using (FileStream file = new FileStream(fn, FileMode.Open))
{
SetConversionSource(new FileInfo(fn), converter.ConverterParameters, null);
Report uut = converter.ImportReport(this, file);
}
}
//[TestMethod]
//public void ICTKeysight3070Importer()
//{
// InitializeAPI(true);
// string fn = "";
// Dictionary<string, string> arguments = new ICTKeysight3070Importer().ConverterParameters;
// ICTKeysight3070Importer converter = new ICTKeysight3070Importer(arguments);
// using (FileStream file = new FileStream(fn, FileMode.Open))
// {
// SetConversionSource(new FileInfo(fn), converter.ConverterParameters, null);
// Report uut = converter.ImportReport(this, file);
// }
//}

[TestMethod]
public void ICTKeysight3070ImporterFolder()
Expand Down
22 changes: 11 additions & 11 deletions ICTKeysight3070Converter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,22 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Virinco.Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=dbc0e1bf149d1e88, processorArchitecture=MSIL">
<HintPath>packages\WATS.Client.6.1.91\lib\net472\Virinco.Newtonsoft.Json.dll</HintPath>
<HintPath>packages\WATS.Client.6.1.101\lib\net472\Virinco.Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Virinco.WATS.Converters.Standard, Version=6.1.0.91, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\WATS.Client.6.1.91\lib\net472\Virinco.WATS.Converters.Standard.dll</HintPath>
<Reference Include="Virinco.WATS.Converters.Standard, Version=6.1.0.101, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\WATS.Client.6.1.101\lib\net472\Virinco.WATS.Converters.Standard.dll</HintPath>
</Reference>
<Reference Include="Virinco.WATS.Interface.MES, Version=6.1.0.91, Culture=neutral, PublicKeyToken=25abfe255fd31fdf, processorArchitecture=MSIL">
<HintPath>packages\WATS.Client.6.1.91\lib\net472\Virinco.WATS.Interface.MES.dll</HintPath>
<Reference Include="Virinco.WATS.Interface.MES, Version=6.1.0.101, Culture=neutral, PublicKeyToken=25abfe255fd31fdf, processorArchitecture=MSIL">
<HintPath>packages\WATS.Client.6.1.101\lib\net472\Virinco.WATS.Interface.MES.dll</HintPath>
</Reference>
<Reference Include="Virinco.WATS.Interface.TDM, Version=6.1.0.91, Culture=neutral, PublicKeyToken=25abfe255fd31fdf, processorArchitecture=MSIL">
<HintPath>packages\WATS.Client.6.1.91\lib\net472\Virinco.WATS.Interface.TDM.dll</HintPath>
<Reference Include="Virinco.WATS.Interface.TDM, Version=6.1.0.101, Culture=neutral, PublicKeyToken=25abfe255fd31fdf, processorArchitecture=MSIL">
<HintPath>packages\WATS.Client.6.1.101\lib\net472\Virinco.WATS.Interface.TDM.dll</HintPath>
</Reference>
<Reference Include="Virinco.WATS.Service.MES.Contract, Version=6.1.0.91, Culture=neutral, PublicKeyToken=3e36107bb2aa2c24, processorArchitecture=MSIL">
<HintPath>packages\WATS.Client.6.1.91\lib\net472\Virinco.WATS.Service.MES.Contract.dll</HintPath>
<Reference Include="Virinco.WATS.Service.MES.Contract, Version=6.1.0.101, Culture=neutral, PublicKeyToken=3e36107bb2aa2c24, processorArchitecture=MSIL">
<HintPath>packages\WATS.Client.6.1.101\lib\net472\Virinco.WATS.Service.MES.Contract.dll</HintPath>
</Reference>
<Reference Include="Virinco.WATS.WATS-Core, Version=6.1.0.91, Culture=neutral, PublicKeyToken=40e2cae0ae7be54b, processorArchitecture=MSIL">
<HintPath>packages\WATS.Client.6.1.91\lib\net472\Virinco.WATS.WATS-Core.dll</HintPath>
<Reference Include="Virinco.WATS.WATS-Core, Version=6.1.0.101, Culture=neutral, PublicKeyToken=40e2cae0ae7be54b, processorArchitecture=MSIL">
<HintPath>packages\WATS.Client.6.1.101\lib\net472\Virinco.WATS.WATS-Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
Loading

0 comments on commit 4489693

Please sign in to comment.