Skip to content
Snippets Groups Projects
Commit ed4a487e authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rm copy c'tor and pointless tests

parent 14b6e63f
No related branches found
No related tags found
1 merge request!221libParam: start active reading ...
...@@ -17,25 +17,6 @@ ...@@ -17,25 +17,6 @@
SampleProvider::SampleProvider() = default; SampleProvider::SampleProvider() = default;
SampleProvider::SampleProvider(const SampleProvider& other) : INode()
{
if (other.m_multilayer)
setSample(*other.m_multilayer);
if (other.m_sample_builder)
setBuilder(other.m_sample_builder.builder());
}
SampleProvider& SampleProvider::operator=(const SampleProvider& other)
{
if (this != &other) {
SampleProvider tmp(other);
std::swap(m_multilayer, tmp.m_multilayer);
std::swap(m_sample_builder, tmp.m_sample_builder);
}
return *this;
}
SampleProvider::~SampleProvider() = default; SampleProvider::~SampleProvider() = default;
void SampleProvider::setSample(const MultiLayer& multilayer) void SampleProvider::setSample(const MultiLayer& multilayer)
......
...@@ -30,8 +30,7 @@ class MultiLayer; ...@@ -30,8 +30,7 @@ class MultiLayer;
class SampleProvider : public INode { class SampleProvider : public INode {
public: public:
SampleProvider(); SampleProvider();
SampleProvider(const SampleProvider& other); // TODO ASAP can't we clone? SampleProvider(const SampleProvider& other) = delete;
SampleProvider& operator=(const SampleProvider& other);
~SampleProvider(); ~SampleProvider();
void setSample(const MultiLayer& multilayer); void setSample(const MultiLayer& multilayer);
......
...@@ -23,17 +23,10 @@ public: ...@@ -23,17 +23,10 @@ public:
registerChild(&m_provider); registerChild(&m_provider);
} }
TestSimulation(const TestSimulation& other) : INode(), m_provider(other.m_provider)
{
setName("TestSimulation");
registerChild(&m_provider);
}
void accept(INodeVisitor* visitor) const override { visitor->visit(this); } void accept(INodeVisitor* visitor) const override { visitor->visit(this); }
std::vector<const INode*> getChildren() const override { return m_provider.getChildren(); } std::vector<const INode*> getChildren() const override { return m_provider.getChildren(); }
void setContainer(const SampleProvider& provider) { m_provider = provider; }
SampleProvider m_provider; SampleProvider m_provider;
}; };
...@@ -59,12 +52,6 @@ TEST_F(SampleProviderTest, initialState) ...@@ -59,12 +52,6 @@ TEST_F(SampleProviderTest, initialState)
provider.setSample(*SampleProviderTest::testMultiLayer(42.0)); provider.setSample(*SampleProviderTest::testMultiLayer(42.0));
EXPECT_EQ(provider.sample()->crossCorrLength(), 42.0); EXPECT_EQ(provider.sample()->crossCorrLength(), 42.0);
EXPECT_EQ(provider.sample()->parent(), nullptr); EXPECT_EQ(provider.sample()->parent(), nullptr);
// checking assignment operator
SampleProvider provider2;
provider2 = provider;
EXPECT_EQ(provider2.sample()->crossCorrLength(), 42.0);
EXPECT_EQ(provider2.sample()->parent(), nullptr);
} }
//! Testing sample builder assignment. //! Testing sample builder assignment.
...@@ -85,21 +72,6 @@ TEST_F(SampleProviderTest, sampleBuilder) ...@@ -85,21 +72,6 @@ TEST_F(SampleProviderTest, sampleBuilder)
// Updating sample and checking if it is generated by sample builder // Updating sample and checking if it is generated by sample builder
provider.updateSample(); provider.updateSample();
EXPECT_EQ(provider.sample()->crossCorrLength(), 33.0); EXPECT_EQ(provider.sample()->crossCorrLength(), 33.0);
// Copying container, sample_builder should be copied, but not the sample
SampleProvider provider2;
provider2 = provider;
EXPECT_EQ(provider2.sample(), nullptr);
EXPECT_EQ(builder.use_count(), 3);
// updating sample in second container
provider2.updateSample();
EXPECT_EQ(provider2.sample()->crossCorrLength(), 33.0);
// setting new sample, builder should go
provider2.setSample(*SampleProviderTest::testMultiLayer(42.0));
EXPECT_EQ(builder.use_count(), 2);
EXPECT_EQ(provider2.sample()->crossCorrLength(), 42.0);
} }
//! Test parentship of container and sample in simulation context. //! Test parentship of container and sample in simulation context.
...@@ -117,15 +89,6 @@ TEST_F(SampleProviderTest, sampleInSimulationContext) ...@@ -117,15 +89,6 @@ TEST_F(SampleProviderTest, sampleInSimulationContext)
// children of container // children of container
ASSERT_EQ(provider.getChildren().size(), 1u); ASSERT_EQ(provider.getChildren().size(), 1u);
EXPECT_EQ(provider.getChildren()[0], provider.sample()); EXPECT_EQ(provider.getChildren()[0], provider.sample());
// creating second simulation via copy-construction
SampleProviderTest::TestSimulation sim2(sim);
SampleProvider& provider2 = sim2.m_provider;
// check that parent has changed for new container and its sample
EXPECT_EQ(provider2.parent(), &sim2);
EXPECT_EQ(provider2.sample()->parent(), &sim2);
EXPECT_EQ(provider2.sample()->crossCorrLength(), 42.0);
} }
//! Test parentship of container and builder in simulation context. //! Test parentship of container and builder in simulation context.
......
...@@ -6031,7 +6031,7 @@ C++ includes: SampleProvider.h ...@@ -6031,7 +6031,7 @@ C++ includes: SampleProvider.h
%feature("docstring") SampleProvider::SampleProvider "SampleProvider::SampleProvider() %feature("docstring") SampleProvider::SampleProvider "SampleProvider::SampleProvider()
"; ";
%feature("docstring") SampleProvider::SampleProvider "SampleProvider::SampleProvider(const SampleProvider &other) %feature("docstring") SampleProvider::SampleProvider "SampleProvider::SampleProvider(const SampleProvider &other)=delete
"; ";
%feature("docstring") SampleProvider::~SampleProvider "SampleProvider::~SampleProvider() %feature("docstring") SampleProvider::~SampleProvider "SampleProvider::~SampleProvider()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment