Projects >> routerkeygenAndroid >>fe452818d52d79388763fd462f59fb808fac9564

Chunk
Conflicting content
		if (ssid.matches("(WLAN|WiFi|YaCom)[0-9a-zA-Z]{6}"))
			return new Wlan6Keygen(ssid, mac, level, enc);

<<<<<<< HEAD
		if (ssid.matches("OTE[0-9a-fA-F]{4}") && mac.startsWith("00:13:33"))
			return new OteBAUDKeygen(ssid, mac, level, enc);

		if (ssid.matches("OTE[0-9a-fA-F]{6}")
				&& ((mac.startsWith("C8:7B:5B"))
						|| (mac.startsWith("FC:C8:97"))
						|| (mac.startsWith("68:1A:B2"))
						|| (mac.startsWith("B0:75:D5")) || (mac
							.startsWith("38:46:08"))))
=======
		if (ssid.matches("OTE[0-9a-fA-F]{4}") && (mac.startsWith("00:13:33")))
			return new OteBAUDKeygen(ssid, mac, level, enc);

		if (ssid.matches("OTE[0-9a-fA-F]{6}"))
			/*
			 * && ((mac.startsWith("C8:7B:5B")) || (mac.startsWith("FC:C8:97"))
			 * || (mac.startsWith("68:1A:B2")) || (mac.startsWith("B0:75:D5"))
			 * || (mac .startsWith("38:46:08"))))
			 */
>>>>>>> 206cd420db1ba8d3cedc2ef6428b2f5199fca629
			return new OteKeygen(ssid, mac, level, enc);
		if (ssid.toUpperCase(Locale.getDefault()).startsWith("OTE")
				&& (mac.startsWith("E8:39:DF:F5")
Solution content
		if (ssid.matches("(WLAN|WiFi|YaCom)[0-9a-zA-Z]{6}"))
			return new Wlan6Keygen(ssid, mac, level, enc);

		if (ssid.matches("OTE[0-9a-fA-F]{4}") && (mac.startsWith("00:13:33")))
			return new OteBAUDKeygen(ssid, mac, level, enc);

		if (ssid.matches("OTE[0-9a-fA-F]{6}"))
			/*
			 * && ((mac.startsWith("C8:7B:5B")) || (mac.startsWith("FC:C8:97"))
			 * || (mac.startsWith("68:1A:B2")) || (mac.startsWith("B0:75:D5"))
			 * || (mac .startsWith("38:46:08"))))
			 */
			return new OteKeygen(ssid, mac, level, enc);

		if (ssid.toUpperCase(Locale.getDefault()).startsWith("OTE")
				&& (mac.startsWith("E8:39:DF:F5")
File
WirelessMatcher.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Chunk
Conflicting content
	static WirelessMatcher matcher;

	@BeforeClass
<<<<<<< HEAD
	public static void initMatcher() throws IOException {
		matcher = new WirelessMatcher(new ZipInputStream(new FileInputStream(
				"../res/raw/magic_info.zip")));
	}

	@Test
	public void testDiscus() {
		Keygen keygen = matcher.getKeygen("Discus--DA1CC5",
				"00:1C:A2:DA:1C:C5", 0, "");
		assertTrue("Keygen should be Discus", keygen instanceof DiscusKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be YW0150565", "YW0150565",
				results.get(0));
	}

	@Test
	public void testHuawei() {
		Keygen keygen = matcher.getKeygen("INFINITUM1be2", "64:16:F0:35:1C:FD",
				0, "");
		assertTrue("Keygen should be Huawei", keygen instanceof HuaweiKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 3432333133", "3432333133",
=======
	public static void initMatcher() throws FileNotFoundException {
		matcher = new WirelessMatcher(new FileInputStream(
				"../res/raw/alice.txt"), new FileInputStream(
				"../res/raw/tele2.txt"));
	}

	@Test
	public void testAlice() {
		Keygen keygen = matcher.getKeygen("Alice-37588990",
				"00:23:8e:48:e7:d4", 0, "");
		assertTrue("Keygen should be Alice", keygen instanceof AliceKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only 4 result", 4, results.size());
		assertEquals("The password should be djfveeeqyasxhhcqar8ypkcv",
				"djfveeeqyasxhhcqar8ypkcv", results.get(0));
		assertEquals("The password should be fsvcl1ujd3coikm49qowthn8",
				"fsvcl1ujd3coikm49qowthn8", results.get(1));
		assertEquals("The password should be y7xysqmqs9jooa7rersi7ayi",
				"y7xysqmqs9jooa7rersi7ayi", results.get(2));
		assertEquals("The password should be 9j4hm3ojq4brfdy6wcsuglwu",
				"9j4hm3ojq4brfdy6wcsuglwu", results.get(3));
	}

	@Test
	public void testCONN() {
		Keygen keygen = matcher.getKeygen("CONN-X", "", 0, "");
		assertTrue("Keygen should be Conn", keygen instanceof ConnKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 1234567890123", "1234567890123",
>>>>>>> 206cd420db1ba8d3cedc2ef6428b2f5199fca629
				results.get(0));
	}
Solution content
	static WirelessMatcher matcher;

	@BeforeClass
	public static void initMatcher() throws IOException {
		matcher = new WirelessMatcher(new ZipInputStream(new FileInputStream(
				"../res/raw/magic_info.zip")));
	}

	@Test
	public void testAlice() {
		Keygen keygen = matcher.getKeygen("Alice-37588990",
				"00:23:8e:48:e7:d4", 0, "");
		assertTrue("Keygen should be Alice", keygen instanceof AliceKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only 4 result", 4, results.size());
		assertEquals("The password should be djfveeeqyasxhhcqar8ypkcv",
				"djfveeeqyasxhhcqar8ypkcv", results.get(0));
		assertEquals("The password should be fsvcl1ujd3coikm49qowthn8",
				"fsvcl1ujd3coikm49qowthn8", results.get(1));
		assertEquals("The password should be y7xysqmqs9jooa7rersi7ayi",
				"y7xysqmqs9jooa7rersi7ayi", results.get(2));
		assertEquals("The password should be 9j4hm3ojq4brfdy6wcsuglwu",
				"9j4hm3ojq4brfdy6wcsuglwu", results.get(3));
	}

	@Test
	public void testCONN() {
		Keygen keygen = matcher.getKeygen("CONN-X", "", 0, "");
		assertTrue("Keygen should be Conn", keygen instanceof ConnKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 1234567890123", "1234567890123",results.get(0));
	}

	@Test
	public void testDiscus() {
		Keygen keygen = matcher.getKeygen("Discus--DA1CC5",
				"00:1C:A2:DA:1C:C5", 0, "");
		assertTrue("Keygen should be Discus", keygen instanceof DiscusKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be YW0150565", "YW0150565",
				results.get(0));
	}

	@Test
	public void testDlink() {
		Keygen keygen = matcher.getKeygen("DLink-123456", "12:34:56:78:9a:bc",
				0, "");
		assertTrue("Keygen should be Dlink", keygen instanceof DlinkKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 6r8qwaYHSNdpqdYw6aN8",
				"6r8qwaYHSNdpqdYw6aN8", results.get(0));
	}

	@Test
	public void testEasyBox() {
		Keygen keygen = new EasyBoxKeygen("Arcor-910B02", "00:12:BF:91:0B:EC",
				0, "");
		assertTrue("Keygen should be Easybox", keygen instanceof EasyBoxKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be F9C8C9DEF", "F9C8C9DEF",
				results.get(0));
	}

	@Test
	public void testEircom() {
		Keygen keygen = matcher.getKeygen("eircom2633 7520",
				"00:0f:cc:59:b0:9c", 0, "");
		assertTrue("Keygen should be Eircom", keygen instanceof EircomKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 29b2e9560b3a83a187ec5f2057",
				"29b2e9560b3a83a187ec5f2057", results.get(0));
	}

	@Test
	public void testHuawei() {
		Keygen keygen = matcher.getKeygen("INFINITUM1be2", "64:16:F0:35:1C:FD",
				0, "");
		assertTrue("Keygen should be Huawei", keygen instanceof HuaweiKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 3432333133", "3432333133",results.get(0));
	}

	@Test
	public void testMegared() {
		Keygen keygen = matcher.getKeygen("Megared60EC", "FC:75:16:9F:60:EC",
				0, "");
		assertTrue("Keygen should be Megared", keygen instanceof MegaredKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 75169F60EC", "75169F60EC",
				results.get(0));
		assertFalse(
				"Keygen should not be Megared",
				matcher.getKeygen("Megared60EC", "FC:75:16:9F:60:EB", 0, "") instanceof MegaredKeygen);
	}

	@Test
	public void testOTE() {
		Keygen keygen = matcher.getKeygen("OTE37cb4c", "B0:75:D5:37:CB:4C", 0,
				"");
		assertTrue("Keygen should be OTE", keygen instanceof OteKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be b075d537cb4c", "b075d537cb4c",results.get(0));
	}

	@Test
	public void testOTEBAUD() {
		Keygen keygen = matcher
				.getKeygen("OTEcb4c", "00:13:33:37:CB:4C", 0, "");
		assertTrue("Keygen should be OTEBaud", keygen instanceof OteBAUDKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be b075d537cb4c", "000133337cb4c",
				results.get(0));
	}

	@Test
	public void testPBS() {
		Keygen keygen = matcher.getKeygen("PBS-11222E", "38:22:9D:11:22:2E", 0,
				"");
		assertTrue("Keygen should be PBS", keygen instanceof PBSKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be PcL2PgUcX0VhV", "PcL2PgUcX0VhV",
				results.get(0));

	}

	@Test
	public void testTeletu() {
		Keygen keygen = matcher.getKeygen("TeleTu_00238EE528C7", "00:23:8E:E5:28:C7", 0, "");
		assertTrue("Keygen should be TeleTu", keygen instanceof TeleTuKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals(
				"The password should be 15301Y0013305, not " + results.get(0),
				"15301Y0013305", results.get(0));
	}

	@Test
	public void testWifimediaR() {
		Keygen keygen = matcher.getKeygen("wifimedia_R-1234",
				"00:26:5B:1E:28:A5", 0, "");
		assertTrue("Keygen should be WifimediaR",
				keygen instanceof WifimediaRKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be two results", 2, results.size());
		assertEquals("The password should be 00265b1e28a0", "00265b1e28a0",
				results.get(0));
		assertEquals("The password should be 00265B1E28A0", "00265B1E28A0",
				results.get(1));
	}

	@Test
	public void testWAN6X() {
		Keygen keygen = matcher.getKeygen("WLAN123456", "11:22:33:44:55:66", 0,
				"");
		assertTrue("Keygen should be Wlan6", keygen instanceof Wlan6Keygen);
		List results = keygen.getKeys();
		assertTrue("Error should  happen", keygen.getErrorCode() != 0);
		assertEquals("There should be only one result", 10, results.size());
		assertEquals("The password should be 5630556304607", "5630556304607",
				results.get(0));
		assertEquals("The password should be 5730446305616", "5730446305616",
				results.get(1));
		assertEquals("The password should be 5430776306625", "5430776306625",
				results.get(2));
		assertEquals("The password should be 5530666307634", "5530666307634",
				results.get(3));
		assertEquals("The password should be 5230116300643", "5230116300643",
				results.get(4));
		assertEquals("The password should be 5330006301652", "5330006301652",
				results.get(5));
		assertEquals("The password should be 5030336302661", "5030336302661",
				results.get(6));
		assertEquals("The password should be 5130226303670", "5130226303670",
				results.get(7));
		assertEquals("The password should be 5E30DD630C68F", "5E30DD630C68F",
				results.get(8));
		assertEquals("The password should be 5F30CC630D69E", "5F30CC630D69E",
				results.get(9));
	}

}
File
KeygenTest.java
Developer's decision
Manual
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content
	}

	@Test
<<<<<<< HEAD
	public void testDlink() {
		Keygen keygen = matcher.getKeygen("DLink-123456", "12:34:56:78:9a:bc",
				0, "");
		assertTrue("Keygen should be Dlink", keygen instanceof DlinkKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 6r8qwaYHSNdpqdYw6aN8",
				"6r8qwaYHSNdpqdYw6aN8", results.get(0));
	}

	@Test
	public void testEircom() {
		Keygen keygen = matcher.getKeygen("eircom2633 7520",
				"00:0f:cc:59:b0:9c", 0, "");
		assertTrue("Keygen should be Eircom", keygen instanceof EircomKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 29b2e9560b3a83a187ec5f2057",
				"29b2e9560b3a83a187ec5f2057", results.get(0));
	}

	@Test
	public void testAlice() {
		Keygen keygen = matcher.getKeygen("Alice-37588990",
				"00:23:8e:48:e7:d4", 0, "");
		assertTrue("Keygen should be Alice", keygen instanceof AliceKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only 4 result", 4, results.size());
		assertEquals("The password should be djfveeeqyasxhhcqar8ypkcv",
				"djfveeeqyasxhhcqar8ypkcv", results.get(0));
		assertEquals("The password should be fsvcl1ujd3coikm49qowthn8",
				"fsvcl1ujd3coikm49qowthn8", results.get(1));
		assertEquals("The password should be y7xysqmqs9jooa7rersi7ayi",
				"y7xysqmqs9jooa7rersi7ayi", results.get(2));
		assertEquals("The password should be 9j4hm3ojq4brfdy6wcsuglwu",
				"9j4hm3ojq4brfdy6wcsuglwu", results.get(3));
=======
	public void testDiscus() {
		Keygen keygen = matcher.getKeygen("Discus--DA1CC5",
				"00:1C:A2:DA:1C:C5", 0, "");
		assertTrue("Keygen should be Discus", keygen instanceof DiscusKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be YW0150565", "YW0150565",
				results.get(0));
	}

	@Test
	public void testDlink() {
		Keygen keygen = matcher.getKeygen("DLink-123456", "12:34:56:78:9a:bc",
				0, "");
		assertTrue("Keygen should be Dlink", keygen instanceof DlinkKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 6r8qwaYHSNdpqdYw6aN8",
				"6r8qwaYHSNdpqdYw6aN8", results.get(0));
>>>>>>> 206cd420db1ba8d3cedc2ef6428b2f5199fca629
	}

	@Test
Solution content
	}

	@Test
	public void testDiscus() {
		Keygen keygen = matcher.getKeygen("Discus--DA1CC5",
				"00:1C:A2:DA:1C:C5", 0, "");
		assertTrue("Keygen should be Discus", keygen instanceof DiscusKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be YW0150565", "YW0150565",
				results.get(0));
	}

	@Test
	public void testDlink() {
		Keygen keygen = matcher.getKeygen("DLink-123456", "12:34:56:78:9a:bc",
				0, "");
		assertTrue("Keygen should be Dlink", keygen instanceof DlinkKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 6r8qwaYHSNdpqdYw6aN8",
				"6r8qwaYHSNdpqdYw6aN8", results.get(0));
	}

	@Test
File
KeygenTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content
	}

	@Test
<<<<<<< HEAD
	public void testOTE() {
		Keygen keygen = matcher.getKeygen("OTE37cb4c", "B0:75:D5:37:CB:4C", 0,
				"");
		assertTrue("Keygen should be OTE", keygen instanceof OteKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be b075d537cb4c", "b075d537cb4c",
				results.get(0));
	}

	@Test
	public void testOTEBAUD() {
		Keygen keygen = matcher
				.getKeygen("OTEcb4c", "00:13:33:37:CB:4C", 0, "");
		assertTrue("Keygen should be OTEBaud", keygen instanceof OteBAUDKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be b075d537cb4c", "000133337cb4c",
=======
	public void testEircom() {
		Keygen keygen = matcher.getKeygen("eircom2633 7520",
				"00:0f:cc:59:b0:9c", 0, "");
		assertTrue("Keygen should be Eircom", keygen instanceof EircomKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 29b2e9560b3a83a187ec5f2057",
				"29b2e9560b3a83a187ec5f2057", results.get(0));
	}

	@Test
	public void testHuawei() {
		Keygen keygen = matcher.getKeygen("INFINITUM1be2", "64:16:F0:35:1C:FD",
				0, "");
		assertTrue("Keygen should be Huawei", keygen instanceof HuaweiKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 3432333133", "3432333133",
>>>>>>> 206cd420db1ba8d3cedc2ef6428b2f5199fca629
				results.get(0));
	}
Solution content
	}

	@Test
	public void testEircom() {
		Keygen keygen = matcher.getKeygen("eircom2633 7520",
				"00:0f:cc:59:b0:9c", 0, "");
		assertTrue("Keygen should be Eircom", keygen instanceof EircomKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 29b2e9560b3a83a187ec5f2057",
				"29b2e9560b3a83a187ec5f2057", results.get(0));
	}

	@Test
	public void testHuawei() {
		Keygen keygen = matcher.getKeygen("INFINITUM1be2", "64:16:F0:35:1C:FD",
				0, "");
		assertTrue("Keygen should be Huawei", keygen instanceof HuaweiKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 3432333133", "3432333133",results.get(0));
	}

	@Test
	public void testMegared() {
		Keygen keygen = matcher.getKeygen("Megared60EC", "FC:75:16:9F:60:EC",
				0, "");
		assertTrue("Keygen should be Megared", keygen instanceof MegaredKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 75169F60EC", "75169F60EC",
				results.get(0));
		assertFalse(
				"Keygen should not be Megared",
				matcher.getKeygen("Megared60EC", "FC:75:16:9F:60:EB", 0, "") instanceof MegaredKeygen);
	}

	@Test
	public void testOTE() {
		Keygen keygen = matcher.getKeygen("OTE37cb4c", "B0:75:D5:37:CB:4C", 0,
				"");
		assertTrue("Keygen should be OTE", keygen instanceof OteKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be b075d537cb4c", "b075d537cb4c",results.get(0));
	}

	@Test
	public void testOTEBAUD() {
		Keygen keygen = matcher
				.getKeygen("OTEcb4c", "00:13:33:37:CB:4C", 0, "");
		assertTrue("Keygen should be OTEBaud", keygen instanceof OteBAUDKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be b075d537cb4c", "000133337cb4c",
				results.get(0));
	}

	@Test
	public void testPBS() {
		Keygen keygen = matcher.getKeygen("PBS-11222E", "38:22:9D:11:22:2E", 0,
				"");
		assertTrue("Keygen should be PBS", keygen instanceof PBSKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be PcL2PgUcX0VhV", "PcL2PgUcX0VhV",
				results.get(0));

	}

	@Test
	public void testTeletu() {
		Keygen keygen = matcher.getKeygen("TeleTu_00238EE528C7", "00:23:8E:E5:28:C7", 0, "");
		assertTrue("Keygen should be TeleTu", keygen instanceof TeleTuKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals(
				"The password should be 15301Y0013305, not " + results.get(0),
				"15301Y0013305", results.get(0));
	}

	@Test
	public void testWifimediaR() {
		Keygen keygen = matcher.getKeygen("wifimedia_R-1234",
				"00:26:5B:1E:28:A5", 0, "");
		assertTrue("Keygen should be WifimediaR",
				keygen instanceof WifimediaRKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be two results", 2, results.size());
		assertEquals("The password should be 00265b1e28a0", "00265b1e28a0",
				results.get(0));
		assertEquals("The password should be 00265B1E28A0", "00265B1E28A0",
				results.get(1));
	}

	@Test
	public void testWAN6X() {
		Keygen keygen = matcher.getKeygen("WLAN123456", "11:22:33:44:55:66", 0,
				"");
		assertTrue("Keygen should be Wlan6", keygen instanceof Wlan6Keygen);
		List results = keygen.getKeys();
		assertTrue("Error should  happen", keygen.getErrorCode() != 0);
		assertEquals("There should be only one result", 10, results.size());
		assertEquals("The password should be 5630556304607", "5630556304607",
				results.get(0));
		assertEquals("The password should be 5730446305616", "5730446305616",
				results.get(1));
		assertEquals("The password should be 5430776306625", "5430776306625",
				results.get(2));
		assertEquals("The password should be 5530666307634", "5530666307634",
				results.get(3));
		assertEquals("The password should be 5230116300643", "5230116300643",
				results.get(4));
		assertEquals("The password should be 5330006301652", "5330006301652",
				results.get(5));
		assertEquals("The password should be 5030336302661", "5030336302661",
				results.get(6));
		assertEquals("The password should be 5130226303670", "5130226303670",
				results.get(7));
		assertEquals("The password should be 5E30DD630C68F", "5E30DD630C68F",
				results.get(8));
		assertEquals("The password should be 5F30CC630D69E", "5F30CC630D69E",
				results.get(9));
	}

}
File
KeygenTest.java
Developer's decision
Manual
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content
	}
				results.get(0));
	}

	@Test
<<<<<<< HEAD
	public void testCONN() {
		Keygen keygen = matcher.getKeygen("CONN-X", "", 0, "");
		assertTrue("Keygen should be Conn", keygen instanceof ConnKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 1234567890123", "1234567890123",

	@Test
	public void testPBS() {
		Keygen keygen = matcher.getKeygen("PBS-11222E", "38:22:9D:11:22:2E", 0,
				"");
		assertTrue("Keygen should be PBS", keygen instanceof PBSKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be PcL2PgUcX0VhV", "PcL2PgUcX0VhV",
=======
	public void testMegared() {
		Keygen keygen = matcher.getKeygen("Megared60EC", "FC:75:16:9F:60:EC",
				0, "");
		assertTrue("Keygen should be Megared", keygen instanceof MegaredKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 75169F60EC", "75169F60EC",
				results.get(0));
		assertFalse(
				"Keygen should not be Megared",
				matcher.getKeygen("Megared60EC", "FC:75:16:9F:60:EB", 0, "") instanceof MegaredKeygen);
	}

	@Test
	public void testOTE() {
		Keygen keygen = matcher.getKeygen("OTE37cb4c", "B0:75:D5:37:CB:4C", 0,
				"");
		assertTrue("Keygen should be OTE", keygen instanceof OteKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be b075d537cb4c", "b075d537cb4c",
>>>>>>> 206cd420db1ba8d3cedc2ef6428b2f5199fca629
				results.get(0));
	}
Solution content
	}

	@Test
	public void testMegared() {
		Keygen keygen = matcher.getKeygen("Megared60EC", "FC:75:16:9F:60:EC",
				0, "");
		assertTrue("Keygen should be Megared", keygen instanceof MegaredKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 75169F60EC", "75169F60EC",
				results.get(0));
		assertFalse(
				"Keygen should not be Megared",
				matcher.getKeygen("Megared60EC", "FC:75:16:9F:60:EB", 0, "") instanceof MegaredKeygen);
	}

	@Test
	public void testOTE() {
		Keygen keygen = matcher.getKeygen("OTE37cb4c", "B0:75:D5:37:CB:4C", 0,
				"");
		assertTrue("Keygen should be OTE", keygen instanceof OteKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be b075d537cb4c", "b075d537cb4c",results.get(0));
	}
File
KeygenTest.java
Developer's decision
Manual
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content
	}

	@Test
<<<<<<< HEAD
	public void testMegared() {
		Keygen keygen = matcher.getKeygen("Megared60EC", "FC:75:16:9F:60:EC",
				0, "");
		assertTrue("Keygen should be Megared", keygen instanceof MegaredKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be 75169F60EC", "75169F60EC",
				results.get(0));
		assertFalse(
				"Keygen should not be Megared",
				matcher.getKeygen("Megared60EC", "FC:75:16:9F:60:EB", 0, "") instanceof MegaredKeygen);
	}

	@Test
	public void testLWAN6X() {
		Keygen keygen = matcher.getKeygen("WLAN123456", "11:22:33:44:55:66", 0,
				"");
		assertTrue("Keygen should be Wlan6", keygen instanceof Wlan6Keygen);
		List results = keygen.getKeys();
		assertTrue("Error should  happen", keygen.getErrorCode() != 0);
		assertEquals("There should be only one result", 10, results.size());
		assertEquals("The password should be 5630556304607", "5630556304607",
				results.get(0));
		assertEquals("The password should be 5730446305616", "5730446305616",
				results.get(1));
		assertEquals("The password should be 5430776306625", "5430776306625",
				results.get(2));
		assertEquals("The password should be 5530666307634", "5530666307634",
				results.get(3));
		assertEquals("The password should be 5230116300643", "5230116300643",
				results.get(4));
		assertEquals("The password should be 5330006301652", "5330006301652",
				results.get(5));
		assertEquals("The password should be 5030336302661", "5030336302661",
				results.get(6));
		assertEquals("The password should be 5130226303670", "5130226303670",
				results.get(7));
		assertEquals("The password should be 5E30DD630C68F", "5E30DD630C68F",
				results.get(8));
		assertEquals("The password should be 5F30CC630D69E", "5F30CC630D69E",
				results.get(9));
=======
	public void testOTEBAUD() {
		Keygen keygen = matcher
				.getKeygen("OTEcb4c", "00:13:33:37:CB:4C", 0, "");
		assertTrue("Keygen should be OTEBaud", keygen instanceof OteBAUDKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be b075d537cb4c", "000133337cb4c",
				results.get(0));
	}

	@Test
	public void testPBS() {
		Keygen keygen = matcher.getKeygen("PBS-11222E", "38:22:9D:11:22:2E", 0,
				"");
		assertTrue("Keygen should be PBS", keygen instanceof PBSKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be PcL2PgUcX0VhV", "PcL2PgUcX0VhV",
				results.get(0));
>>>>>>> 206cd420db1ba8d3cedc2ef6428b2f5199fca629
	}

	@Test
Solution content
	}

	@Test
	public void testOTEBAUD() {
		Keygen keygen = matcher
				.getKeygen("OTEcb4c", "00:13:33:37:CB:4C", 0, "");
		assertTrue("Keygen should be OTEBaud", keygen instanceof OteBAUDKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be b075d537cb4c", "000133337cb4c",
				results.get(0));
	}

	@Test
	public void testPBS() {
		Keygen keygen = matcher.getKeygen("PBS-11222E", "38:22:9D:11:22:2E", 0,
				"");
		assertTrue("Keygen should be PBS", keygen instanceof PBSKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
		assertEquals("The password should be PcL2PgUcX0VhV", "PcL2PgUcX0VhV",
				results.get(0));

	}

	@Test
File
KeygenTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content
	@Test
	public void testTeletu() {
<<<<<<< HEAD
		Keygen keygen = matcher.getKeygen("teletu", "00:23:8E:E5:28:C7", 0, "");
		assertTrue("Keygen should be TeleTu", keygen instanceof TeletuKeygen);
=======
		Keygen keygen = matcher.getKeygen("TeleTu_00238EE528C7", "00:23:8E:E5:28:C7", 0, "");
		assertTrue("Keygen should be TeleTu", keygen instanceof TeleTuKeygen);
>>>>>>> 206cd420db1ba8d3cedc2ef6428b2f5199fca629
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
Solution content
	@Test
	public void testTeletu() {
		Keygen keygen = matcher.getKeygen("TeleTu_00238EE528C7", "00:23:8E:E5:28:C7", 0, "");
		assertTrue("Keygen should be TeleTu", keygen instanceof TeleTuKeygen);
		List results = keygen.getKeys();
		assertEquals("Errors should not happen", 0, keygen.getErrorCode());
		assertEquals("There should be only one result", 1, results.size());
File
KeygenTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content
				results.get(0));
		assertEquals("The password should be 00265B1E28A0", "00265B1E28A0",
				results.get(1));
<<<<<<< HEAD
=======
	}

	@Test
	public void testWAN6X() {
		Keygen keygen = matcher.getKeygen("WLAN123456", "11:22:33:44:55:66", 0,
				"");
		assertTrue("Keygen should be Wlan6", keygen instanceof Wlan6Keygen);
		List results = keygen.getKeys();
		assertTrue("Error should  happen", keygen.getErrorCode() != 0);
		assertEquals("There should be only one result", 10, results.size());
		assertEquals("The password should be 5630556304607", "5630556304607",
				results.get(0));
		assertEquals("The password should be 5730446305616", "5730446305616",
				results.get(1));
		assertEquals("The password should be 5430776306625", "5430776306625",
				results.get(2));
		assertEquals("The password should be 5530666307634", "5530666307634",
				results.get(3));
		assertEquals("The password should be 5230116300643", "5230116300643",
				results.get(4));
		assertEquals("The password should be 5330006301652", "5330006301652",
				results.get(5));
		assertEquals("The password should be 5030336302661", "5030336302661",
				results.get(6));
		assertEquals("The password should be 5130226303670", "5130226303670",
				results.get(7));
		assertEquals("The password should be 5E30DD630C68F", "5E30DD630C68F",
				results.get(8));
		assertEquals("The password should be 5F30CC630D69E", "5F30CC630D69E",
				results.get(9));
>>>>>>> 206cd420db1ba8d3cedc2ef6428b2f5199fca629
	}

}
Solution content
				results.get(0));
		assertEquals("The password should be 00265B1E28A0", "00265B1E28A0",
				results.get(1));
	}

	@Test
	public void testWAN6X() {
		Keygen keygen = matcher.getKeygen("WLAN123456", "11:22:33:44:55:66", 0,
				"");
		assertTrue("Keygen should be Wlan6", keygen instanceof Wlan6Keygen);
		List results = keygen.getKeys();
		assertTrue("Error should  happen", keygen.getErrorCode() != 0);
		assertEquals("There should be only one result", 10, results.size());
		assertEquals("The password should be 5630556304607", "5630556304607",
				results.get(0));
		assertEquals("The password should be 5730446305616", "5730446305616",
				results.get(1));
		assertEquals("The password should be 5430776306625", "5430776306625",
				results.get(2));
		assertEquals("The password should be 5530666307634", "5530666307634",
				results.get(3));
		assertEquals("The password should be 5230116300643", "5230116300643",
				results.get(4));
		assertEquals("The password should be 5330006301652", "5330006301652",
				results.get(5));
		assertEquals("The password should be 5030336302661", "5030336302661",
				results.get(6));
		assertEquals("The password should be 5130226303670", "5130226303670",
				results.get(7));
		assertEquals("The password should be 5E30DD630C68F", "5E30DD630C68F",
				results.get(8));
		assertEquals("The password should be 5F30CC630D69E", "5F30CC630D69E",
				results.get(9));
	}

}
File
KeygenTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method invocation
Method signature
Variable