resolved merge conflicts
43a77cff3c23
Actions

Description

resolved merge conflicts

Details

Provenance

kahl	Authored on Jan 17 2020, 10:07 AM
kahl	Pushed on Jan 17 2020, 10:08 AM

Parents

rMITK31796e4f314d: Merge branch 'T26992-FixRenderingTestHelper'
rMITK42af4c54aea2: Merge branch 'T24271-port-more-tests' into T24271-port-more-tests-2

Branches

Unknown

Tags

Unknown

References

T24271-port-more-tests-2-integration

Event Timeline

kahl committed rMITK43a77cff3c23: resolved merge conflicts (authored by kahl).Jan 17 2020, 10:07 AM

Merged Changes

42af4c54aea2 Merge branch 'T24271-port-more-tests' into T24271-port-more-tests-2
Author
kahl
Browse Repository
No Builds
No Audits
848f02b8c09d Change mitkDispatcherTest to CPPUnit
Author
kahl
Browse Repository
No Builds
No Audits
032285e968f1 Deleted some comments from old test
Author
kahl
Browse Repository
No Builds
No Audits
1b2104cad24b Change mitkImageGeneratorTest to CPPUnit
Author
kahl
Browse Repository
No Builds
No Audits
8c05c55a526e Change mitkInteractionEventTest to CPP Unit
Author
kahl
Browse Repository
No Builds
No Audits
f3ad1c0869ab Merge branch 'T24271-port-more-tests' into T24271-port-more-tests-2
Author
kahl
Browse Repository
No Builds
No Audits
8c7d917d8b63 Change mitkPropertyTests (Aliases,Description,Extension, Filters)
Author
kahl
Browse Repository
No Builds
No Audits
39e94cfca906 Change mitkPropertyTest to CPPUNIT
Author
kahl
Browse Repository
No Builds
No Audits
0f38f7eb1d5a Change mitkUIDGeneratorTest to CPPUNIT
Author
kahl
Browse Repository
No Builds
No Audits
149a3bdf1176 change PixelTypeTest to new test system
Author
kahl
Browse Repository
No Builds
No Audits
1203412d7fe9 Merge remote-tracking branch 'origin/T24271-port-tests' into T24271-port-more…
Author
kahl
Browse Repository
No Builds
No Audits
fbad7058fe08 Port mitk weak pointer test, add setUp and tearDown
Author
• huberma
Browse Repository
No Builds
No Audits
63c015d2d575 Port mitk Surface test, add setUp and tearDown
Author
• huberma
Browse Repository
No Builds
No Audits
a2a106763ba8 Port mitk exception test
Author
• huberma
Browse Repository
No Builds
No Audits
de46d55d91a4 Port mitk vector test, add setUp and tearDown
Author
• huberma
Browse Repository
No Builds
No Audits
91867c5c1a96 Port mitk tiny XML test, add setUp and tearDown
Author
• huberma
Browse Repository
No Builds
No Audits
7b77acb84abe Port mitk point set locale test, add setUp and tearDown
Author
• huberma
Browse Repository
No Builds
No Audits
7425815ffafb Port mitk exception test, add setUp and tearDown
Author
• huberma
Browse Repository
No Builds
No Audits
33204e98cea5 Port mitk base data test, add setUp and tearDown
Author
• huberma
Browse Repository
No Builds
No Audits
d0b581b0deac Port mitk Point Set Locale test, add setUp and tearDown
Author
• huberma
Browse Repository
No Builds
No Audits
738746cee02e Port mitk Tiny XML test, add setUp and tearDown
Author
• huberma
Browse Repository
No Builds
No Audits
1913d90dafe1 Port mitk Vector test, add setUp and tearDown
Author
• huberma
Browse Repository
No Builds
No Audits
ca956f894d6a Port mitk Base Data test, add setUp and tearDown
Author
• huberma
Browse Repository
No Builds
No Audits
52a58d3eb9e1 Port test mitkVectorTest
Author
• huberma
Browse Repository
No Builds
No Audits
43ff353dae12 Port test mitkTinyXMLTest
Author
• huberma
Browse Repository
No Builds
No Audits
0abcee2f8bd4 Port test BaseDataTest
Author
• huberma
Browse Repository
No Builds
No Audits
a1e9c32f9192 Port mitk exception test
Author
• huberma
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

Packages

Modules/

Core/

test/

mitkBaseDataTest.cpp

O1: MITK Reviewer Group I

mitkDispatcherTest.cpp

O1: MITK Reviewer Group I

mitkImageGeneratorTest.cpp

O1: MITK Reviewer Group I

mitkInteractionEventTest.cpp

O1: MITK Reviewer Group I

mitkPixelTypeTest.cpp

O1: MITK Reviewer Group I

mitkPropertyAliasesTest.cpp

O1: MITK Reviewer Group I

mitkPropertyDescriptionsTest.cpp

O1: MITK Reviewer Group I

mitkPropertyExtensionsTest.cpp

O1: MITK Reviewer Group I

mitkPropertyFiltersTest.cpp

O1: MITK Reviewer Group I

mitkPropertyTest.cpp

O1: MITK Reviewer Group I

mitkTinyXMLTest.cpp

O1: MITK Reviewer Group I

mitkUIDGeneratorTest.cpp

O1: MITK Reviewer Group I

rMITK43a77cff3c23

View Options

Modules/Core/test/mitkBaseDataTest.cpp

View Options

Modules/Core/test/mitkDispatcherTest.cpp

View Options

Modules/Core/test/mitkImageGeneratorTest.cpp

View Options

Modules/Core/test/mitkInteractionEventTest.cpp

View Options

Modules/Core/test/mitkPixelTypeTest.cpp

View Options

Modules/Core/test/mitkPropertyAliasesTest.cpp

View Options

Modules/Core/test/mitkPropertyDescriptionsTest.cpp

View Options

Modules/Core/test/mitkPropertyExtensionsTest.cpp

View Options

Modules/Core/test/mitkPropertyFiltersTest.cpp

View Options

Modules/Core/test/mitkPropertyTest.cpp

View Options

Modules/Core/test/mitkTinyXMLTest.cpp

View Options

Modules/Core/test/mitkUIDGeneratorTest.cpp

resolved merge conflicts43a77cff3c23Actions

Description

Details

Event Timeline

Merged Changes

Changes (12)

rMITK43a77cff3c23

Modules/Core/test/mitkBaseDataTest.cpp

Modules/Core/test/mitkDispatcherTest.cpp

Modules/Core/test/mitkImageGeneratorTest.cpp

Modules/Core/test/mitkInteractionEventTest.cpp

Modules/Core/test/mitkPixelTypeTest.cpp

Modules/Core/test/mitkPropertyAliasesTest.cpp

Modules/Core/test/mitkPropertyDescriptionsTest.cpp

Modules/Core/test/mitkPropertyExtensionsTest.cpp

Modules/Core/test/mitkPropertyFiltersTest.cpp

Modules/Core/test/mitkPropertyTest.cpp

Modules/Core/test/mitkTinyXMLTest.cpp

Modules/Core/test/mitkUIDGeneratorTest.cpp

resolved merge conflicts
43a77cff3c23
Actions