Projects >> SOCIETIES-Platform >>250b65e3e7b5c90903d123e63b12169d266c51bd

Chunk
Conflicting content
		RequestPolicy expectedPrivacyPolicy = null;
		RequestPolicy privacyPolicy = null;
		try {
<<<<<<< HEAD:integration-tests/BIT/privacy-trust-test-suite/policy-management-1873/src/main/java/org/societies/integration/test/bit/privacypolicymanagement/PrivacyPolicyManagerTest.java
			privacyPolicy = TestCase.privacyPolicyManager.getPrivacyPolicy(requestorService);
=======
			TestCase1244.privacyPolicyManager.deletePrivacyPolicy(requestorService);
			privacyPolicy = TestCase1244.privacyPolicyManager.getPrivacyPolicy(requestorService);
>>>>>>> 8cc085788961ecaf3ff76ea3eb29b9b908e69a5e:integration-tests/BIT/privacy-trust-test-suite/policy-management-1244/src/main/java/org/societies/integration/test/bit/privacypolicymanagement/PrivacyPolicyManagerTest.java
		} catch (PrivacyException e) {
			LOG.error("[#"+testCaseNumber+"] [Test PrivacyException] "+testTitle, e);
			fail("Privacy error: "+e.getMessage());
Solution content
		RequestPolicy expectedPrivacyPolicy = null;
		RequestPolicy privacyPolicy = null;
		try {
			TestCase1244.privacyPolicyManager.deletePrivacyPolicy(requestorService);
			privacyPolicy = TestCase1244.privacyPolicyManager.getPrivacyPolicy(requestorService);
		} catch (PrivacyException e) {
			LOG.error("[#"+testCaseNumber+"] [Test PrivacyException] "+testTitle, e);
			fail("Privacy error: "+e.getMessage());
File
PrivacyPolicyManagerTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable