프로젝트

일반

사용자정보

개정판 5d863c06

ID5d863c068ddf26c1360b5d2d66230b78ad6bd66c
상위 d1be84a0
하위 0f44f1c1

김태성이(가) 5년 이상 전에 추가함

convert service 테스트 수정

Change-Id: Ifa2d8b29887e52b4597c0fb912db96c87dd02b34

차이점 보기:

ConvertService/ServiceBase/ConvertMonitorSetup/ConvertMonitorSetup.wixproj
1
<?xml version="1.0" encoding="utf-8"?>
2
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
  <PropertyGroup>
4
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6
    <ProductVersion>3.10</ProductVersion>
7
    <ProjectGuid>ad7ee515-34e5-4123-a0cd-b2f6ecc48e56</ProjectGuid>
8
    <SchemaVersion>2.0</SchemaVersion>
9
    <OutputName>ConvertMonitorSetup</OutputName>
10
    <OutputType>Package</OutputType>
11
  </PropertyGroup>
12
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
13
    <OutputPath>bin\$(Configuration)\</OutputPath>
14
    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
15
    <DefineConstants>Debug</DefineConstants>
16
  </PropertyGroup>
17
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
18
    <OutputPath>bin\$(Configuration)\</OutputPath>
19
    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
20
  </PropertyGroup>
21
  <ItemGroup>
22
    <Compile Include="Product.wxs" />
23
  </ItemGroup>
24
  <ItemGroup>
25
    <Content Include="ConvertMonitorSetup.wax" />
26
  </ItemGroup>
27
  <ItemGroup>
28
    <ProjectReference Include="..\Markus.Service.Monitor\Markus.Service.MonitorService.csproj">
29
      <Name>Markus.Service.MonitorService</Name>
30
      <Project>{3f200e07-de20-41f5-984f-a8371fef17a4}</Project>
31
      <Private>True</Private>
32
      <DoNotHarvest>True</DoNotHarvest>
33
      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
34
      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
35
    </ProjectReference>
36
  </ItemGroup>
37
  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
38
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
39
  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
40
    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
41
  </Target>
42
  <!--
43
	To modify your build process, add your task inside one of the targets below and uncomment it.
44
	Other similar extension points exist, see Wix.targets.
45
	<Target Name="BeforeBuild">
46
	</Target>
47
	<Target Name="AfterBuild">
48
	</Target>
49
	-->
50
</Project>
ConvertService/ServiceBase/ConvertMonitorSetup/Product.wxs
1
<?xml version="1.0" encoding="UTF-8"?>
2
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"><?define Markus.Service.MonitorService_TargetDir=$(var.Markus.Service.MonitorService.TargetDir)?><?define Markus.Service.WcfClient_TargetDir=$(var.Markus.Service.WcfClient.TargetDir)?><?define Markus.Service.Extensions_TargetDir=$(var.Markus.Service.Extensions.TargetDir)?><?define Markus.Service.Interface_TargetDir=$(var.Markus.Service.Interface.TargetDir)?>
3
	<Product Id="*" Name="ConvertMonitorSetup" Language="1033" Version="1.0.0.0" Manufacturer="" UpgradeCode="5b113c28-01b6-4cb2-a723-c88ed1e2b93a">
4
		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
5

  
6
		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
7
		<MediaTemplate />
8

  
9
		<Feature Id="ProductFeature" Title="ConvertMonitorSetup" Level="1">
10
			<ComponentGroupRef Id="ProductComponents" />
11
		</Feature>
12
	</Product>
13

  
14
	<Fragment>
15
		<Directory Id="TARGETDIR" Name="SourceDir">
16
			<Directory Id="ProgramFilesFolder">
17
				<Directory Id="INSTALLFOLDER" Name="ConvertMonitorSetup" />
18
			</Directory>
19
		</Directory>
20
	</Fragment>
21

  
22
	<Fragment>
23
		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
24
			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
25
			<!-- <Component Id="ProductComponent"> -->
26
				<!-- TODO: Insert files, registry keys, and other resources here. -->
27
			<!-- </Component> -->
28
			<Component Id="Log.config" Guid="2109f413-8b65-42a6-a768-4bd75af0736a">
29
			  <File Id="Log.config" Name="Log.config" Source="$(var.Markus.Service.MonitorService_TargetDir)Log.config" />
30
			</Component>
31
			<Component Id="Markus.Service.MonitorService.exe" Guid="758f5d59-2318-4c86-a2e0-f065688f720f">
32
			  <File Id="Markus.Service.MonitorService.exe" Name="Markus.Service.MonitorService.exe" Source="$(var.Markus.Service.MonitorService_TargetDir)Markus.Service.MonitorService.exe" />
33
			</Component>
34
			<Component Id="Markus.Service.MonitorService.exe.config" Guid="4ed36875-8562-4e18-bb9c-5d07201f167f">
35
			  <File Id="Markus.Service.MonitorService.exe.config" Name="Markus.Service.MonitorService.exe.config" Source="$(var.Markus.Service.MonitorService_TargetDir)Markus.Service.MonitorService.exe.config" />
36
			</Component>
37
			<Component Id="log4net.dll" Guid="2dc76b99-a439-4ffb-86b4-8d2657badb08">
38
			  <File Id="log4net.dll" Name="log4net.dll" Source="$(var.Markus.Service.MonitorService_TargetDir)log4net.dll" />
39
			</Component>
40
			<Component Id="Markus.Service.WcfClient.dll" Guid="f7324b48-de59-4d2c-804a-166c89aff500">
41
			  <File Id="Markus.Service.WcfClient.dll" Name="Markus.Service.WcfClient.dll" Source="$(var.Markus.Service.WcfClient_TargetDir)Markus.Service.WcfClient.dll" />
42
			</Component>
43
			<Component Id="ConfigParser.dll" Guid="b80b36cb-1a1b-4c07-9aff-f4b648315f0c">
44
			  <File Id="ConfigParser.dll" Name="ConfigParser.dll" Source="$(var.Markus.Service.MonitorService_TargetDir)ConfigParser.dll" />
45
			</Component>
46
			<Component Id="Markus.Service.Extensions.dll" Guid="ce3c0eca-628f-4429-ac01-d1a25bc56528">
47
			  <File Id="Markus.Service.Extensions.dll" Name="Markus.Service.Extensions.dll" Source="$(var.Markus.Service.Extensions_TargetDir)Markus.Service.Extensions.dll" />
48
			</Component>
49
			<Component Id="Markus.Service.Interface.dll" Guid="c196ea04-f2d8-4174-8533-53a13fdc9d6c">
50
			  <File Id="Markus.Service.Interface.dll" Name="Markus.Service.Interface.dll" Source="$(var.Markus.Service.Interface_TargetDir)Markus.Service.Interface.dll" />
51
			</Component>
52
		</ComponentGroup>
53
	</Fragment>
54
</Wix>
ConvertService/ServiceBase/Markus.Service.DataBase/ConvertDatabase.cs
301 301
            return result;
302 302
        }
303 303

  
304

  
305
        /// <summary>
306
        /// Item 삭제
307
        /// </summary>
308
        /// <returns></returns>
309
        public int RemoveItem(string convertID)
310
        {
311
            int result = 0;
312

  
313
            var items = entities.CONVERTER_DOC.Where(x => x.ID == convertID);
314

  
315
            if (items.Count() > 0)
316
            {
317
                CONVERTER_DOC item = items.First();
318
                entities.CONVERTER_DOC.Remove(item);
319

  
320
                result = entities.SaveChanges();
321
            }
322

  
323
            return result;
324
        }
325

  
304 326
        /// <summary>
305 327
        /// 전체 컨버터를 가져온다. 비동기로 변경하여야 한다.
306 328
        /// </summary>
ConvertService/ServiceBase/Markus.Service.Monitor/Log.config
1
<?xml version="1.0" encoding="utf-8"?>
2
<configuration>
3
  <configSections>
4
    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
5
  </configSections>
6
  <log4net>
7
    <appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
8
      <applicationName value="Markus Monitor Service"/>
9
      <layout type="log4net.Layout.PatternLayout">
10
        <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
11
      </layout>
12
    </appender>
13
    <root>
14
      <level value="All" />
15
      <appender-ref ref="EventLogAppender" />
16
    </root>
17
  </log4net>
18
</configuration>
ConvertService/ServiceBase/Markus.Service.Monitor/ProjectInstaller.Designer.cs
33 33
            // 
34 34
            // serviceProcessInstaller1
35 35
            // 
36
            this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.LocalSystem;
36 37
            this.serviceProcessInstaller1.Password = null;
37 38
            this.serviceProcessInstaller1.Username = null;
38 39
            // 
ConvertService/ServiceBase/Markus.Service.Station/StationService/ServiceStationWCF.cs
63 63
            {
64 64
                using (Markus.Service.DataBase.ConvertDatabase database = new Markus.Service.DataBase.ConvertDatabase(MarkusDBConnectionString))
65 65
                {
66
                    var convertItem = database.GetConvertItembyDocumentID(ProjectNo, DocumentID);
67

  
68
                    if(convertItem != null)
69
                    {
70
                        var aliveItems = AliveConvertQueue.Where(x => x.ConvertID == convertItem.ConvertID);
71
                    }
72

  
66 73
                    if (!database.SetConvertDoc(ProjectNo, convertID, originfilePath, DocumentID))
67 74
                    {
68 75
                        logger.Error($"Set Convert Document Error - ProjectNo:{ProjectNo} UniqueID:{convertID} originfilePath:{originfilePath} DocumentID:{DocumentID}");
ConvertService/ServiceBase/PemssDocumentInfoTest/App.config
1
<?xml version="1.0" encoding="utf-8" ?>
2
<configuration>
3
    <startup> 
4
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
5
    </startup>
6
</configuration>
ConvertService/ServiceBase/PemssDocumentInfoTest/packages.config
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
  <package id="Microsoft.CSharp" version="4.5.0" targetFramework="net45" />
4
  <package id="Salaros.ConfigParser" version="0.3.3" targetFramework="net45" />
5
</packages>
ConvertService/ServiceBase/ServiceBase.sln
110 110
EndProject
111 111
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "ConvertServiceMonitor", "ConvertServiceMonitor\ConvertServiceMonitor.vdproj", "{4F13EC6E-6369-4BF4-AE9C-9F6B647D37C8}"
112 112
EndProject
113
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ConvertMonitorSetup", "ConvertMonitorSetup\ConvertMonitorSetup.wixproj", "{AD7EE515-34E5-4123-A0CD-B2F6ECC48E56}"
114
EndProject
115
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest.Markus.Service", "UnitTest.Markus.Service\UnitTest.Markus.Service.csproj", "{8555777D-922B-473F-9997-EBC63CA944C4}"
116
EndProject
113 117
Global
114 118
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
115 119
		Debug|Any CPU = Debug|Any CPU
......
366 370
		{4F13EC6E-6369-4BF4-AE9C-9F6B647D37C8}.Release|Any CPU.ActiveCfg = Release
367 371
		{4F13EC6E-6369-4BF4-AE9C-9F6B647D37C8}.Release|x64.ActiveCfg = Release
368 372
		{4F13EC6E-6369-4BF4-AE9C-9F6B647D37C8}.Release|x86.ActiveCfg = Release
373
		{AD7EE515-34E5-4123-A0CD-B2F6ECC48E56}.Debug|Any CPU.ActiveCfg = Debug|x86
374
		{AD7EE515-34E5-4123-A0CD-B2F6ECC48E56}.Debug|x64.ActiveCfg = Debug|x86
375
		{AD7EE515-34E5-4123-A0CD-B2F6ECC48E56}.Debug|x86.ActiveCfg = Debug|x86
376
		{AD7EE515-34E5-4123-A0CD-B2F6ECC48E56}.Debug|x86.Build.0 = Debug|x86
377
		{AD7EE515-34E5-4123-A0CD-B2F6ECC48E56}.Release|Any CPU.ActiveCfg = Release|x86
378
		{AD7EE515-34E5-4123-A0CD-B2F6ECC48E56}.Release|x64.ActiveCfg = Release|x86
379
		{AD7EE515-34E5-4123-A0CD-B2F6ECC48E56}.Release|x86.ActiveCfg = Release|x86
380
		{AD7EE515-34E5-4123-A0CD-B2F6ECC48E56}.Release|x86.Build.0 = Release|x86
381
		{8555777D-922B-473F-9997-EBC63CA944C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
382
		{8555777D-922B-473F-9997-EBC63CA944C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
383
		{8555777D-922B-473F-9997-EBC63CA944C4}.Debug|x64.ActiveCfg = Debug|Any CPU
384
		{8555777D-922B-473F-9997-EBC63CA944C4}.Debug|x64.Build.0 = Debug|Any CPU
385
		{8555777D-922B-473F-9997-EBC63CA944C4}.Debug|x86.ActiveCfg = Debug|Any CPU
386
		{8555777D-922B-473F-9997-EBC63CA944C4}.Debug|x86.Build.0 = Debug|Any CPU
387
		{8555777D-922B-473F-9997-EBC63CA944C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
388
		{8555777D-922B-473F-9997-EBC63CA944C4}.Release|Any CPU.Build.0 = Release|Any CPU
389
		{8555777D-922B-473F-9997-EBC63CA944C4}.Release|x64.ActiveCfg = Release|Any CPU
390
		{8555777D-922B-473F-9997-EBC63CA944C4}.Release|x64.Build.0 = Release|Any CPU
391
		{8555777D-922B-473F-9997-EBC63CA944C4}.Release|x86.ActiveCfg = Release|Any CPU
392
		{8555777D-922B-473F-9997-EBC63CA944C4}.Release|x86.Build.0 = Release|Any CPU
369 393
	EndGlobalSection
370 394
	GlobalSection(SolutionProperties) = preSolution
371 395
		HideSolutionNode = FALSE
ConvertService/ServiceBase/ServiceUnitTest/DataBaseTestBase.cs
1
using System;
2
using Microsoft.VisualStudio.TestTools.UnitTesting;
3

  
4
namespace ServiceUnitTest
5
{
6
    [TestClass]
7
    public class DataBaseTestBase
8
    {
9
        public Markus.Service.DataBase.ConvertDatabase database;
10

  
11
        public DataBaseTestBase()
12
        {
13
            string connection = @"data source=.\SQLEXPRESS;initial catalog=Markus;persist security info=True;user id=ConvertService;Password=ConvertService;MultipleActiveResultSets=True;";
14
            database = new Markus.Service.DataBase.ConvertDatabase(connection);
15
        }
16
    }
17
}
ConvertService/ServiceBase/ServiceUnitTest/DatabaseTest.cs
5 5
namespace ServiceUnitTest
6 6
{
7 7
    [TestClass]
8
    public class DatabaseTest
8
    public class DatabaseTest : DataBaseTestBase
9 9
    {
10 10
        [TestMethod]
11 11
        public void SetConvertDocTest()
12 12
        {
13
            //using (Markus.Service.DataBase.ConvertDatabase database = new Markus.Service.DataBase.ConvertDatabase("111111"))
14
            //{
15
            //    Assert.IsTrue(database.SetConvertDoc("111111", "1", "test.pdf"));
16
            //}
17 13
        }
18 14

  
19 15
        [TestMethod]
20 16
        public void GetConvertItemTest()
21 17
        {
22
            string connection = @"data source=.\SQLEXPRESS;initial catalog=Markus;persist security info=True;user id=ConvertService;Password=ConvertService;MultipleActiveResultSets=True;";
23

  
24
            using (Markus.Service.DataBase.ConvertDatabase database = new Markus.Service.DataBase.ConvertDatabase(connection))
25
            {
26
                var item = database.GetConvertItem("111111","1");
27

  
28
                Assert.IsNotNull(item);
29
            }
18
            var item = database.GetConvertItem("111111","1");
19
            Assert.IsNotNull(item);
30 20
        }
31 21
    }
32 22
}
ConvertService/ServiceBase/ServiceUnitTest/ServiceUnitTest.csproj
95 95
    <Compile Include="DatabaseTest.cs" />
96 96
    <Compile Include="InstallTest.cs" />
97 97
    <Compile Include="Properties\AssemblyInfo.cs" />
98
    <Compile Include="DataBaseTestBase.cs" />
98 99
  </ItemGroup>
99 100
  <ItemGroup>
100 101
    <None Include="app.config" />
ConvertService/ServiceBase/UnitTest.Markus.Service/DataBaseTest.cs
1
using System;
2
using Xunit;
3
using Markus.Service.DataBase;
4
using Xunit.Priority;
5
using Markus.Service.Extensions;
6

  
7
namespace UnitTest.Markus.Service
8
{
9
    public class DataBaseTest
10
    {
11
        private readonly ConvertDatabase Database;
12

  
13
        private readonly string ConnectionString = @"data source=.\SQLEXPRESS;initial catalog=Markus;persist security info=True;user id=ConvertService;Password=ConvertService;MultipleActiveResultSets=True;";
14
        private readonly string ProjectNo;
15
        private readonly string ConvertID;
16

  
17
        public DataBaseTest()
18
        {
19
            Database = new ConvertDatabase(ConnectionString);
20

  
21
            ProjectNo = "000000";
22
            ConvertID = new Guid().CreateUniqueGuid().ToString();
23
        }
24

  
25
        [Fact,Priority(0)]
26
        public void AddConvertItem()
27
        {
28
            bool result = Database.SetConvertDoc(ProjectNo, ConvertID, @"c:Test.pdf", "aaaaa");
29
            Assert.True(result);
30
        }
31

  
32
        [Fact, Priority(1)]
33
        public void GetConvertItem()
34
        {
35
            var result = Database.GetConvertItem(ProjectNo, ConvertID);
36
            Assert.NotNull(result);
37
        }
38

  
39
        [Fact, Priority(2)]
40
        public void ConvertItemChnageState()
41
        {
42
            string testServiceID = new Guid().ToString();
43

  
44
            var result = Database.SetConvertState(testServiceID,ConvertID,1,10,10,"test");
45
            Assert.True(result);
46
        }
47

  
48
        [Fact, Priority(3)]
49
        public void ClearConvertItem()
50
        {
51
            var result = Database.SetCleanUpItem(ConvertID,1);
52
            Assert.True(result == 1);
53
        }
54

  
55

  
56
        [Fact, Priority(4)]
57
        public void RemoveConvertItem()
58
        {
59
            var result = Database.RemoveItem(ConvertID);
60
            Assert.True(result == 1);
61
        }
62
    }
63
}
ConvertService/ServiceBase/UnitTest.Markus.Service/UnitTest.Markus.Service.csproj
1
<Project Sdk="Microsoft.NET.Sdk">
2

  
3
  <PropertyGroup>
4
    <!--<TargetFramework>netcoreapp2.2</TargetFramework>-->
5
    <TargetFramework>net472</TargetFramework>
6
    
7
    <IsPackable>false</IsPackable>
8
  </PropertyGroup>
9

  
10
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
11
    <PlatformTarget>AnyCPU</PlatformTarget>
12
  </PropertyGroup>
13

  
14
  <ItemGroup>
15
    <PackageReference Include="EntityFramework" Version="6.2.0" />
16
    <PackageReference Include="EntityFramework.ko" Version="6.2.0" />
17
    <PackageReference Include="MarkusDatabase" Version="1.7.2" />
18
    <PackageReference Include="xunit" Version="2.4.1" />
19
    <PackageReference Include="Xunit.Priority" Version="1.1.5" />
20
    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
21
      <PrivateAssets>all</PrivateAssets>
22
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
23
    </PackageReference>
24
  </ItemGroup>
25

  
26
  <ItemGroup>
27
    <ProjectReference Include="..\Markus.Service.DataBase\Markus.Service.DataBase.csproj" />
28
  </ItemGroup>
29

  
30
  <ItemGroup>
31
    <Reference Include="WindowsBase" />
32
  </ItemGroup>
33

  
34
</Project>
MarkusLogview/MarkusDataModel/Properties/Settings.Designer.cs
12 12
    
13 13
    
14 14
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
15
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
15
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
16 16
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
17 17
        
18 18
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
MarkusLogview/MarkusDataModel/Properties/Settings.settings
5 5
    <Setting Name="ProjectConnectionString" Type="System.String" Scope="Application">
6 6
      <Value Profile="(Default)">data source=172.21.101.29;database={0};user id=ProjectPortalDBConn;password=ProjectPortalDBConn</Value>
7 7
    </Setting>
8
    <Setting Name="aa" Type="System.String" Scope="User">
9
      <Value Profile="(Default)" />
10
    </Setting>
8 11
  </Settings>
9 12
</SettingsFile>

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)