Projects information

Chunk

Conflicting content
@RunWith(Arquillian.class) public class ConfigurationDefaultValueTest { <<<<<<< HEAD ======= private static final String PATH = "src/test/resources/configuration/field/default"; >>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25 @Inject private FilledDefaultValueConfig filledFieldConfig;

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationDefaultValueTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/field/default";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private FilledDefaultValueConfig filledFieldConfig;

Solution content
@RunWith(Arquillian.class) public class ConfigurationDefaultValueTest { private static final String PATH = "src/test/resources/configuration/field/default"; @Inject private FilledDefaultValueConfig filledFieldConfig;

Solution content

@RunWith(Arquillian.class)
public class ConfigurationDefaultValueTest {

	private static final String PATH = "src/test/resources/configuration/field/default";

	@Inject
	private FilledDefaultValueConfig filledFieldConfig;

File
ConfigurationDefaultValueTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content
@Deployment public static JavaArchive createDeployment() { <<<<<<< HEAD JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationDefaultValueTest.class); deployment.addAsResource( new FileAsset(new File("src/test/resources/configuration/field/default/demoiselle.properties")), "demoiselle.properties").addAsResource( new FileAsset(new File("src/test/resources/configuration/field/default/demoiselle.xml")), "demoiselle.xml"); ======= JavaArchive deployment = Tests.createDeployment(ConfigurationDefaultValueTest.class); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml"); >>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25 return deployment; }

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationDefaultValueTest.class);

		deployment.addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/default/demoiselle.properties")),
				"demoiselle.properties").addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/default/demoiselle.xml")),
				"demoiselle.xml");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationDefaultValueTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content
@Deployment public static JavaArchive createDeployment() { JavaArchive deployment = Tests.createDeployment(ConfigurationDefaultValueTest.class); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml"); return deployment; }

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationDefaultValueTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		return deployment;
	}

File
ConfigurationDefaultValueTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
@RunWith(Arquillian.class) public class ConfigurationArrayFieldTest { <<<<<<< HEAD ======= private static final String PATH = "src/test/resources/configuration/field/array"; >>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25 @Inject private PropertiesArrayFieldConfig propertiesConfig;

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationArrayFieldTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/field/array";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private PropertiesArrayFieldConfig propertiesConfig;

Solution content
@RunWith(Arquillian.class) public class ConfigurationArrayFieldTest { private static final String PATH = "src/test/resources/configuration/field/array"; @Inject private PropertiesArrayFieldConfig propertiesConfig;

Solution content

@RunWith(Arquillian.class)
public class ConfigurationArrayFieldTest {

	private static final String PATH = "src/test/resources/configuration/field/array";

	@Inject
	private PropertiesArrayFieldConfig propertiesConfig;

File
ConfigurationArrayFieldTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content
@Deployment public static JavaArchive createDeployment() { <<<<<<< HEAD JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationArrayFieldTest.class); deployment.addAsResource( new FileAsset(new File("src/test/resources/configuration/field/array/demoiselle.properties")), "demoiselle.properties").addAsResource( new FileAsset(new File("src/test/resources/configuration/field/array/demoiselle.xml")), "demoiselle.xml"); ======= JavaArchive deployment = Tests.createDeployment(ConfigurationArrayFieldTest.class); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml"); >>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25 return deployment; }

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationArrayFieldTest.class);
		deployment.addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/array/demoiselle.properties")),
				"demoiselle.properties").addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/array/demoiselle.xml")),
				"demoiselle.xml");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationArrayFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content
@Deployment public static JavaArchive createDeployment() { JavaArchive deployment = Tests.createDeployment(ConfigurationArrayFieldTest.class); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml"); return deployment; }

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationArrayFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		return deployment;
	}

File
ConfigurationArrayFieldTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
@RunWith(Arquillian.class) public class ConfigurationClassFieldTest { <<<<<<< HEAD ======= private static final String PATH = "src/test/resources/configuration/field/class"; >>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25 @Inject private PropertiesExistentClassFieldConfig propertiesExistentConfig;

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationClassFieldTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/field/class";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private PropertiesExistentClassFieldConfig propertiesExistentConfig;

Solution content
@RunWith(Arquillian.class) public class ConfigurationClassFieldTest { private static final String PATH = "src/test/resources/configuration/field/class"; @Inject private PropertiesExistentClassFieldConfig propertiesExistentConfig;

Solution content

@RunWith(Arquillian.class)
public class ConfigurationClassFieldTest {

	private static final String PATH = "src/test/resources/configuration/field/class";

	@Inject
	private PropertiesExistentClassFieldConfig propertiesExistentConfig;

File
ConfigurationClassFieldTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content
@Deployment public static JavaArchive createDeployment() { <<<<<<< HEAD JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationClassFieldTest.class); deployment.addAsResource(new FileAsset(new File( "src/test/resources/configuration/field/class/demoiselle.properties")), "demoiselle.properties"); ======= JavaArchive deployment = Tests.createDeployment(ConfigurationClassFieldTest.class); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); >>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25 return deployment; }

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationClassFieldTest.class);
		deployment.addAsResource(new FileAsset(new File(
				"src/test/resources/configuration/field/class/demoiselle.properties")), "demoiselle.properties");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationClassFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content
@Deployment public static JavaArchive createDeployment() { JavaArchive deployment = Tests.createDeployment(ConfigurationClassFieldTest.class); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); return deployment; }

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationClassFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		return deployment;
	}

File
ConfigurationClassFieldTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
@RunWith(Arquillian.class) public class ConfigurationCustomFieldTest { <<<<<<< HEAD ======= private static final String PATH = "src/test/resources/configuration/field/custom"; >>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25 @Inject private CustomMappedFieldConfig mappedField;

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationCustomFieldTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/field/custom";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private CustomMappedFieldConfig mappedField;

Solution content
@RunWith(Arquillian.class) public class ConfigurationCustomFieldTest { private static final String PATH = "src/test/resources/configuration/field/custom"; @Inject private CustomMappedFieldConfig mappedField;

Solution content

@RunWith(Arquillian.class)
public class ConfigurationCustomFieldTest {

	private static final String PATH = "src/test/resources/configuration/field/custom";

	@Inject
	private CustomMappedFieldConfig mappedField;

File
ConfigurationCustomFieldTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content
@Deployment public static JavaArchive createDeployment() { <<<<<<< HEAD JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationCustomFieldTest.class); deployment.addAsResource(new FileAsset(new File( "src/test/resources/configuration/field/custom/demoiselle.properties")), "demoiselle.properties"); ======= JavaArchive deployment = Tests.createDeployment(ConfigurationCustomFieldTest.class); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); >>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25 return deployment; }

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationCustomFieldTest.class);
		deployment.addAsResource(new FileAsset(new File(
				"src/test/resources/configuration/field/custom/demoiselle.properties")), "demoiselle.properties");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationCustomFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content
@Deployment public static JavaArchive createDeployment() { JavaArchive deployment = Tests.createDeployment(ConfigurationCustomFieldTest.class); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); return deployment; }

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationCustomFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		return deployment;
	}

File
ConfigurationCustomFieldTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
@RunWith(Arquillian.class) public class ConfigurationIgnoredFieldTest { <<<<<<< HEAD ======= private static final String PATH = "src/test/resources/configuration/field/ignored"; >>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25 @Inject private FilledIgnoredFieldConfig filledFieldConfig;

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationIgnoredFieldTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/field/ignored";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private FilledIgnoredFieldConfig filledFieldConfig;

Solution content

@RunWith(Arquillian.class)
public class ConfigurationIgnoredFieldTest {

	private static final String PATH = "src/test/resources/configuration/field/ignored";

	@Inject
	private FilledIgnoredFieldConfig filledFieldConfig;

File
ConfigurationIgnoredFieldTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationIgnoredFieldTest.class);
		deployment.addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/ignored/demoiselle.properties")),
				"demoiselle.properties").addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/ignored/demoiselle.xml")),
				"demoiselle.xml");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationIgnoredFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationIgnoredFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		return deployment;
	}

File
ConfigurationIgnoredFieldTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationMapFieldTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/field/map";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private PropertiesMapFieldConfig propertiesConfig;

Solution content

@RunWith(Arquillian.class)
public class ConfigurationMapFieldTest {

	private static final String PATH = "src/test/resources/configuration/field/map";

	@Inject
	private PropertiesMapFieldConfig propertiesConfig;

File
ConfigurationMapFieldTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationMapFieldTest.class);
		deployment.addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/map/demoiselle.properties")),
				"demoiselle.properties").addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/map/demoiselle.xml")), "demoiselle.xml");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationMapFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationMapFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		return deployment;
	}

File
ConfigurationMapFieldTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationNamedFieldTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/field/named";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private PropertyNamed propertyNamed;

Solution content
@RunWith(Arquillian.class) public class ConfigurationNamedFieldTest { private static final String PATH = "src/test/resources/configuration/field/named"; @Inject private PropertyNamed propertyNamed;

File
ConfigurationNamedFieldTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationNamedFieldTest.class);
		deployment.addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/named/demoiselle.properties")),
				"demoiselle.properties").addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/named/demoiselle.xml")),
				"demoiselle.xml");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationNamedFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationNamedFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		return deployment;
	}

File
ConfigurationNamedFieldTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationNotNullFieldTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/field/notnull";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private PropertyWithFilledFieldConfig propertyFilledFieldConfig;

Solution content

@RunWith(Arquillian.class)
public class ConfigurationNotNullFieldTest {

	private static final String PATH = "src/test/resources/configuration/field/notnull";

	@Inject
	private PropertyWithFilledFieldConfig propertyFilledFieldConfig;

File
ConfigurationNotNullFieldTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationNotNullFieldTest.class);
		deployment
				.addAsResource(
						new FileAsset(new File("src/test/resources/configuration/field/notnull/demoiselle.properties")),
						"demoiselle.properties")
				.addAsResource(
						new FileAsset(new File("src/test/resources/configuration/field/notnull/empty-field.properties")),
						"empty-field.properties")
				.addAsResource(
						new FileAsset(new File(
								"src/test/resources/configuration/field/notnull/without-field.properties")),
						"without-field.properties")
				.addAsResource(
						new FileAsset(new File("src/test/resources/configuration/field/notnull/demoiselle.xml")),
						"demoiselle.xml")
				.addAsResource(
						new FileAsset(new File("src/test/resources/configuration/field/notnull/empty-field.xml")),
						"empty-field.xml")
				.addAsResource(
						new FileAsset(new File("src/test/resources/configuration/field/notnull/without-field.xml")),
						"without-field.xml");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationNotNullFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/empty-field.properties"), "empty-field.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/without-field.properties"), "without-field.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/empty-field.xml"), "empty-field.xml");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/without-field.xml"), "without-field.xml");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationNotNullFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/empty-field.properties"), "empty-field.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/without-field.properties"), "without-field.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/empty-field.xml"), "empty-field.xml");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/without-field.xml"), "without-field.xml");
		return deployment;
	}

File
ConfigurationNotNullFieldTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationPrimitiveOrWrapperFieldTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/field/primitiveorwrapper";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private PropertiesPrimitiveOrWrapperFieldConfig propertiesConfig;

Solution content

@RunWith(Arquillian.class)
public class ConfigurationPrimitiveOrWrapperFieldTest {

	private static final String PATH = "src/test/resources/configuration/field/primitiveorwrapper";

	@Inject
	private PropertiesPrimitiveOrWrapperFieldConfig propertiesConfig;

File
ConfigurationPrimitiveOrWrapperFieldTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationPrimitiveOrWrapperFieldTest.class);
		deployment.addAsResource(
				new FileAsset(new File(
						"src/test/resources/configuration/field/primitiveorwrapper/demoiselle.properties")),
				"demoiselle.properties").addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/primitiveorwrapper/demoiselle.xml")),
				"demoiselle.xml");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationPrimitiveOrWrapperFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationPrimitiveOrWrapperFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		return deployment;
	}

File
ConfigurationPrimitiveOrWrapperFieldTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationStringFieldTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/field/string";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private PropertiesStringFieldConfig propertiesConfig;

Solution content

@RunWith(Arquillian.class)
public class ConfigurationStringFieldTest {

	private static final String PATH = "src/test/resources/configuration/field/string";

	@Inject
	private PropertiesStringFieldConfig propertiesConfig;

File
ConfigurationStringFieldTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationStringFieldTest.class);
		deployment.addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/string/demoiselle.properties")),
				"demoiselle.properties").addAsResource(
				new FileAsset(new File("src/test/resources/configuration/field/string/demoiselle.xml")),
				"demoiselle.xml");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationStringFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationStringFieldTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		return deployment;
	}

File
ConfigurationStringFieldTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationPrefixTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/prefix";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private PropertyPrefixEndingWithoutDot propertyEndingWithoutDotPrefix;

Solution content

@RunWith(Arquillian.class)
public class ConfigurationPrefixTest {

	private static final String PATH = "src/test/resources/configuration/prefix";

	@Inject
	private PropertyPrefixEndingWithoutDot propertyEndingWithoutDotPrefix;

File
ConfigurationPrefixTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationPrefixTest.class);
		deployment.addAsResource(
				new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.properties")),
				"demoiselle.properties").addAsResource(
				new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.xml")), "demoiselle.xml");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationPrefixTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationPrefixTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		return deployment;
	}

File
ConfigurationPrefixTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

@RunWith(Arquillian.class)
public class ConfigurationResourceTest {
<<<<<<< HEAD
=======

	private static final String PATH = "src/test/resources/configuration/resource";
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25

	@Inject
	private PropertiesDefaultFileConfig propDefault;

Solution content

@RunWith(Arquillian.class)
public class ConfigurationResourceTest {

	private static final String PATH = "src/test/resources/configuration/resource";

	@Inject
	private PropertiesDefaultFileConfig propDefault;

File
ConfigurationResourceTest.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationResourceTest.class);
		deployment
				.addAsResource(
						new FileAsset(new File("src/test/resources/configuration/resource/demoiselle.properties")),
						"demoiselle.properties")
				.addAsResource(new FileAsset(new File("src/test/resources/configuration/resource/demoiselle.xml")),
						"demoiselle.xml")
				.addAsResource(
						new FileAsset(new File("src/test/resources/configuration/resource/resource.properties")),
						"resource.properties")
				.addAsResource(new FileAsset(new File("src/test/resources/configuration/resource/resource.xml")),
						"resource.xml");

=======
		JavaArchive deployment = Tests.createDeployment(ConfigurationResourceTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/resource.properties"), "resource.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/resource.xml"), "resource.xml");
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
		return deployment;
	}

Solution content

	@Deployment
	public static JavaArchive createDeployment() {
		JavaArchive deployment = Tests.createDeployment(ConfigurationResourceTest.class);
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/resource.properties"), "resource.properties");
		deployment.addAsResource(Tests.createFileAsset(PATH + "/resource.xml"), "resource.xml");
		return deployment;
	}

File
ConfigurationResourceTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

	@Deployment
	public static JavaArchive createDeployment() {
<<<<<<< HEAD
		JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationScopeTest.class);
		return deployment;
=======
		return Tests.createDeployment(ConfigurationScopeTest.class);
>>>>>>> fa101f764087eb45c5ac3d57d7259d8acfda8f25
	}

	@Test

Solution content
@Deployment public static JavaArchive createDeployment() { return Tests.createDeployment(ConfigurationScopeTest.class); } @Test

File
ConfigurationScopeTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Return statement
Variable

Projects >> framework >>a21ee331cf01aa04f368590870f73bc9ab8fe06b