Validate that communication tests run

MoeweX · MoeweX · commit 125ed143ce9d · 2018-03-14T15:31:38.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,20 @@
-.DS_Store
-.vagrant/
+# APP
 target/
+*.log
+local.properties
+
+# MAC
+.DS_Store
+
+# ECLIPSE
 .classpath
 .project
 .settings
-*.log
-local.properties
+
+# JETBRAINS
+.idea/*
+!.idea/dictionaries/
+*.iml
+
+# Others
+.vagrant/
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # FBase
 
-FBase can be build by running `mvn clean package`. Do not forget to run `mvn clean install` in the local FBaseCommons repository as it is one of the dependencies. In addition, the Naming Service should be up and running.
+FBase can be build by running `mvn clean package`. Do not forget to run `mvn clean install` in the local FBaseCommons repository as it is one of the dependencies. In addition, the Naming Service should be up and running (with the quickstart configuration).
 
-The easiest way to startup FBase is by just using the jar file (with dependencies) produced by maven. The only argument that needs to be provided is the path to the config file. For an example config file check out `src/main/resources/sample_config.properties.`, make sure that the initialNodeConfig of the naming service is compatible to the configuration of the first FBase node started (nodeID and encryption information), because otherwise it cannot communicate with the Naming Service.
+The easiest way to startup FBase is by just using the jar file (with dependencies) produced by maven. If no argument is provided, a quickstart configuration is used. Otherwise, the only argument that can be provided is the path to a config file (that is then used instead of the quickstart config). For an example config file check out `src/main/resources/sample_config.properties.`, make sure that the initialNodeConfig of the naming service is compatible to the configuration of the first FBase node started (nodeID and encryption information), because otherwise it cannot communicate with the Naming Service. The quickstart configurations are compatible.
 
 If you need to generate a private/public RSA key, use the `RSAHelper` class' main method.
 
diff --git a/src/main/java/communication/DirectMessageSender.java b/src/main/java/communication/DirectMessageSender.java
@@ -19,7 +19,6 @@
 import model.messages.Command;
 import model.messages.Envelope;
 import model.messages.Message;
-import tasks.AnnounceUpdateOfOwnNodeConfigurationTaskTest;
 
 /**
  * Sends requests to designated receivers.
@@ -136,7 +135,7 @@ public GetMissedMessageResponse sendGetDataRecord(MessageID messageID)
 	}
 
 	/**
-	 * Ask the target machine to run {@link AnnounceUpdateOfOwnNodeConfigurationTaskTest}.
+	 * Ask the target machine to run the test of {@link tasks.AnnounceUpdateOfOwnNodeConfigurationTask}.
 	 * This is necessary if a new machine was added to a node, because node configuration
 	 * updates are distributed via the publisher to other nodes (and other nodes have not
 	 * subscribed to the new machine yet).
diff --git a/src/main/java/control/FBase.java b/src/main/java/control/FBase.java
@@ -172,7 +172,7 @@ public void tearDown() {
 		} catch (InterruptedException e) {
 			e.printStackTrace();
 		}
-		System.exit(0);
+		// System.exit(0);
 	}
 
 	public void fillWithData() throws FBaseStorageConnectorException, InterruptedException,
diff --git a/src/main/resources/quickstart_local.properties b/src/main/resources/quickstart_local.properties
@@ -0,0 +1,18 @@
+! General
+nodeID: N1
+description: "Quickstart configuration, can communicate with the quickstart Naming Service (on the same machine)"
+databaseConnector: ON_HEAP
+
+! Communication
+restPort: 8081
+messagePort: 6001
+publisherPort: 7001
+
+! Security
+publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlVb/JwQO0ynWtTzGxgUL2Ia1zVnTNMGHZXYMTEFNfJkqd2tgKizuyHhL1PulAWFbhmMH+sRfZgbX1wW3Pk3GxyyhFo7asnWAuizLkEZW4mkRA2t2u7f2TGksmAP3rlALl6PCtKC020Owi9p9mqcAQq50/y+dITuhhUXUvRpQgRqYl8N5cFuLs/Mzx6pg+0prkq/K2tqGkWDMnB3UvdhlP3MoJjLgxyQah66uDYrkcgSVNFToGZdSLikM6gyuOvlcB3sz6VtSor4pnC3WGhwV7geIyaO/Du01L7UATY6vcrgi2AVWkzqzwYsJu0D1KPvpmTaIO/a5mvYrYSxxE5eyaQIDAQAB
+privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCVVv8nBA7TKda1PMbGBQvYhrXNWdM0wYdldgxMQU18mSp3a2AqLO7IeEvU+6UBYVuGYwf6xF9mBtfXBbc+TcbHLKEWjtqydYC6LMuQRlbiaREDa3a7t/ZMaSyYA/euUAuXo8K0oLTbQ7CL2n2apwBCrnT/L50hO6GFRdS9GlCBGpiXw3lwW4uz8zPHqmD7SmuSr8ra2oaRYMycHdS92GU/cygmMuDHJBqHrq4NiuRyBJU0VOgZl1IuKQzqDK46+VwHezPpW1KivimcLdYaHBXuB4jJo78O7TUvtQBNjq9yuCLYBVaTOrPBiwm7QPUo++mZNog79rma9ithLHETl7JpAgMBAAECggEBAJI/ZBgdTTdWHcHXBwIdJwCgy6GSedeMPsAJ3vk+ale+12ujZ8Vlw2HnDLxCw9CaOztb+BCIBrSvtugH3O/S0vtypT6mH13s3Gd2PtPHTobjRZoHv3sOKNGjndww5nl6Qh/6a07goryniVksWxz8trCWkFTnmAVXlFIjlLar8nK6yktn9W2XqqZmBB0/T8FHW/RrXpzs8j8XSmV9VaNaKQZgthCMStRJqrJsh29OORWWWJ37BHiPncRkAYrHr2Bp6hwOXjNySeoDHbQPmDI6MWuea4dTdgAjvNgHY1kRao6fu0uSjMfTcCahv6xKpQ9ZQxMZvgdzbQegB2wnXYZUWUECgYEA4MiJXTewV5KHG95LQ9FALb7x3FStR9hj+pf+mCSKdwZwTBY596/zFaImNwDJmSOsau97T41108QpD3cL1Bq7zTcc/+NQY2p2UzPasPMPxEAOj4BsqzkJTn1TRd1Hwx8zJyIZIvU8yvu0jlsWkFdldXeUI5K4ZTMbyTFpyCCVIE0CgYEAqhRNv2d6C4AlKbBFOw/QNTI/MCV5d0iLsU4TOdoRLAPHJ12Vp/m0VXg6QvT9wzWl6+5TqKXVjde3XtwwyeIbJgddB4yndvsWrlDJKgcMbqGDIfLapOavHiA3RjAN+xWm/e5haBWG2iplOSdbKcrw7O0bWDIFXjS2cMC7xs98iI0CgYAgF+Gs4n+V8UDDFNjwJNch8Oo9SAW5hUa5B6x88nKmjc/IvT+ngoKVayJDpiQibjp2xhx3/j19b7thDuEsdmir4xuL2Vun5hJgzL2DmCB/J5osmOxrAei3QSN7jR1q2XCHPNIT8KmuXYOo845kK2Y8AEexUIhtQn/MGPb+cNB53QKBgAzHUcAbyjOrAR/MuqbhXUdh6xV2+1VXAgfkUdV66OdhsUjn4yKnxEDXs6jsN1S/ZyP+2BJHw2/Q0VozOQcyEdAdpYO3sa1i2CVotHSP6wM052FZmcvh+S5ORVjkq2g+DDnv+ymS1Hr3zHsq1dKiCNAEUJWjzHtzgnGeSX16gWTRAoGAQ3zTg+V/V8wwnyWvyzER/OLRSTjkq3UXFTMqInZNf8yKzn9h8Xuiz5zxFMqJGOdwFwUDOllMhh6ACFprnI90ti2W8oCnxNm0Wv3p2JZ+Eh+BM5aGaNEclJVfJEzYI4A1tu0ECFWIA8DvML1H4cMbLKn6lJWSZsdOwOqAd9Evj34=
+
+! NamingService
+namingServiceAddress: tcp://localhost
+namingServicePort: 54321
+namingServicePublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlMw4S4WjXYogQ0lXPCxmwK/Yb2JCpBAl09NHsoTMNh+IapDgHz+xc25iN9F78MOZ3Fl3tB4g81D8xKKlkRyM7jr4Ar3cmPVZrY4vXPzZ/tZkp2avRQ58Qtrd5aPzv3uYO1NbCmJoHH85220EYa/nrHR0gYL8QClxbkkndHzwDE5XcXiXF22H2mFeYl3ZgW0sRL7XkxZ6Uk2Ppp52ZOcpVLDNmunp7FL69g1FCWyUBhyllROIby/jZnQ2hb+bs8feFBm/Qpjhp6AT2goXVbNck3DNsIlmUSx3S9NQwQp1/cVpnr6BNqeOD+1P6TK6dh3hC4jqGi2LcS13tiasEqabxwIDAQAB
diff --git a/src/test/java/communication/NamingServiceSenderTest.java b/src/test/java/communication/NamingServiceSenderTest.java
@@ -264,11 +264,12 @@ public void testSendNodeConfigUpdate() throws FBaseCommunicationException, FBase
 	@Test
 	public void testSendNodeConfigRead() throws FBaseCommunicationException, FBaseNamingServiceException {
 		logger.debug("-------Starting testSendNodeConfigRead-------");
+
 		readNodeConfig(fbase.configuration.getNodeID(), makeNodeConfig(ownNodeConfigJSONPath));
 		// not existent config
 		try {
 			nsSender.sendNodeConfigRead(new NodeID("asdlkfj"));
-			fail("Should have thrwon an exception");
+			fail("Should have thrown an exception");
 		} catch (Exception e) {
 			assertEquals(ResponseCode.ERROR_DOESNT_EXIST.toString(), e.getMessage());
 
diff --git a/src/test/java/tasks/PutAndDeleteDataRecordTaskTest.java b/src/test/java/tasks/PutAndDeleteDataRecordTaskTest.java
@@ -83,7 +83,6 @@ public void test() throws FBaseStorageConnectorException, InterruptedException,
 		assertEquals(record.getDataIdentifier(), fBase.connector.messageHistory_get(mID));
 		assertEquals(null,
 				fBase.connector.dataRecords_get(fBase.connector.messageHistory_get(mID)));
-
 	}
 
 }
diff --git a/src/test/resources/FBaseFactory_NamingService1.properties b/src/test/resources/FBaseFactory_NamingService1.properties
@@ -6,12 +6,14 @@ databaseConnector: ON_HEAP
 restPort: 8081
 messagePort: 6001
 publisherPort: 7001
+description: "Machine specified in JUnit tests (Node 1) of the FBase project"
+
 
 ! Security
 publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlVb/JwQO0ynWtTzGxgUL2Ia1zVnTNMGHZXYMTEFNfJkqd2tgKizuyHhL1PulAWFbhmMH+sRfZgbX1wW3Pk3GxyyhFo7asnWAuizLkEZW4mkRA2t2u7f2TGksmAP3rlALl6PCtKC020Owi9p9mqcAQq50/y+dITuhhUXUvRpQgRqYl8N5cFuLs/Mzx6pg+0prkq/K2tqGkWDMnB3UvdhlP3MoJjLgxyQah66uDYrkcgSVNFToGZdSLikM6gyuOvlcB3sz6VtSor4pnC3WGhwV7geIyaO/Du01L7UATY6vcrgi2AVWkzqzwYsJu0D1KPvpmTaIO/a5mvYrYSxxE5eyaQIDAQAB
 privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCVVv8nBA7TKda1PMbGBQvYhrXNWdM0wYdldgxMQU18mSp3a2AqLO7IeEvU+6UBYVuGYwf6xF9mBtfXBbc+TcbHLKEWjtqydYC6LMuQRlbiaREDa3a7t/ZMaSyYA/euUAuXo8K0oLTbQ7CL2n2apwBCrnT/L50hO6GFRdS9GlCBGpiXw3lwW4uz8zPHqmD7SmuSr8ra2oaRYMycHdS92GU/cygmMuDHJBqHrq4NiuRyBJU0VOgZl1IuKQzqDK46+VwHezPpW1KivimcLdYaHBXuB4jJo78O7TUvtQBNjq9yuCLYBVaTOrPBiwm7QPUo++mZNog79rma9ithLHETl7JpAgMBAAECggEBAJI/ZBgdTTdWHcHXBwIdJwCgy6GSedeMPsAJ3vk+ale+12ujZ8Vlw2HnDLxCw9CaOztb+BCIBrSvtugH3O/S0vtypT6mH13s3Gd2PtPHTobjRZoHv3sOKNGjndww5nl6Qh/6a07goryniVksWxz8trCWkFTnmAVXlFIjlLar8nK6yktn9W2XqqZmBB0/T8FHW/RrXpzs8j8XSmV9VaNaKQZgthCMStRJqrJsh29OORWWWJ37BHiPncRkAYrHr2Bp6hwOXjNySeoDHbQPmDI6MWuea4dTdgAjvNgHY1kRao6fu0uSjMfTcCahv6xKpQ9ZQxMZvgdzbQegB2wnXYZUWUECgYEA4MiJXTewV5KHG95LQ9FALb7x3FStR9hj+pf+mCSKdwZwTBY596/zFaImNwDJmSOsau97T41108QpD3cL1Bq7zTcc/+NQY2p2UzPasPMPxEAOj4BsqzkJTn1TRd1Hwx8zJyIZIvU8yvu0jlsWkFdldXeUI5K4ZTMbyTFpyCCVIE0CgYEAqhRNv2d6C4AlKbBFOw/QNTI/MCV5d0iLsU4TOdoRLAPHJ12Vp/m0VXg6QvT9wzWl6+5TqKXVjde3XtwwyeIbJgddB4yndvsWrlDJKgcMbqGDIfLapOavHiA3RjAN+xWm/e5haBWG2iplOSdbKcrw7O0bWDIFXjS2cMC7xs98iI0CgYAgF+Gs4n+V8UDDFNjwJNch8Oo9SAW5hUa5B6x88nKmjc/IvT+ngoKVayJDpiQibjp2xhx3/j19b7thDuEsdmir4xuL2Vun5hJgzL2DmCB/J5osmOxrAei3QSN7jR1q2XCHPNIT8KmuXYOo845kK2Y8AEexUIhtQn/MGPb+cNB53QKBgAzHUcAbyjOrAR/MuqbhXUdh6xV2+1VXAgfkUdV66OdhsUjn4yKnxEDXs6jsN1S/ZyP+2BJHw2/Q0VozOQcyEdAdpYO3sa1i2CVotHSP6wM052FZmcvh+S5ORVjkq2g+DDnv+ymS1Hr3zHsq1dKiCNAEUJWjzHtzgnGeSX16gWTRAoGAQ3zTg+V/V8wwnyWvyzER/OLRSTjkq3UXFTMqInZNf8yKzn9h8Xuiz5zxFMqJGOdwFwUDOllMhh6ACFprnI90ti2W8oCnxNm0Wv3p2JZ+Eh+BM5aGaNEclJVfJEzYI4A1tu0ECFWIA8DvML1H4cMbLKn6lJWSZsdOwOqAd9Evj34=
 
-! NamingService
+! NamingService (expects a running naming service on the same machine with the quickstart configuration)
 namingServiceAddress: tcp://localhost
 namingServicePort: 54321
-namingServicePublicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANBGzyjlTQfrxBC6EA5yrjqJraPo8AyYyjATHKkfyjb64DT2U4fTRpe/6dOHbZHgjSJ8RWJXUg5Ac62qDn+RLEcCAwEAAQ==
+namingServicePublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlMw4S4WjXYogQ0lXPCxmwK/Yb2JCpBAl09NHsoTMNh+IapDgHz+xc25iN9F78MOZ3Fl3tB4g81D8xKKlkRyM7jr4Ar3cmPVZrY4vXPzZ/tZkp2avRQ58Qtrd5aPzv3uYO1NbCmJoHH85220EYa/nrHR0gYL8QClxbkkndHzwDE5XcXiXF22H2mFeYl3ZgW0sRL7XkxZ6Uk2Ppp52ZOcpVLDNmunp7FL69g1FCWyUBhyllROIby/jZnQ2hb+bs8feFBm/Qpjhp6AT2goXVbNck3DNsIlmUSx3S9NQwQp1/cVpnr6BNqeOD+1P6TK6dh3hC4jqGi2LcS13tiasEqabxwIDAQAB
diff --git a/src/test/resources/FBaseFactory_NamingService2.properties b/src/test/resources/FBaseFactory_NamingService2.properties
@@ -6,12 +6,13 @@ databaseConnector: ON_HEAP
 restPort: 8082
 messagePort: 6002
 publisherPort: 7002
+description: "Machine specified in JUnit tests (Node 2) of the FBase project"
 
 ! Security
 publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqMCldz9e44B0I6V916WUX5tHlw0S4M+zUniAxeRq3rHFOtlKA+ARI8MW85sDz8MAMT51HxhcXOc09L76s0Nh2eWYdvFkaTH66BH2/d6QBIjmPOj8ZWM3t+U6CzqhN9wXqNKLj19Aop+cy4KqhfstiQpAb33803Wto/Zm+Gt3XQEpH/IRs5fgrnp73I4LDenosz5t/Xjo3DMG1+w9fx9ccB+BUikgFPHVDM5bHVT3KZG/9F3Qh4sYNXKWgNuLGpn2v6dVEAFZO/QM4UzJES7O0vHt9Dis4XQloCXqQaZ3FpCd8fQV7xnNO33gdyIJZyjEv8O5ucSuVbddsr+63cQ76QIDAQAB
 privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCowKV3P17jgHQjpX3XpZRfm0eXDRLgz7NSeIDF5GrescU62UoD4BEjwxbzmwPPwwAxPnUfGFxc5zT0vvqzQ2HZ5Zh28WRpMfroEfb93pAEiOY86PxlYze35ToLOqE33Beo0ouPX0Cin5zLgqqF+y2JCkBvffzTda2j9mb4a3ddASkf8hGzl+CuenvcjgsN6eizPm39eOjcMwbX7D1/H1xwH4FSKSAU8dUMzlsdVPcpkb/0XdCHixg1cpaA24samfa/p1UQAVk79AzhTMkRLs7S8e30OKzhdCWgJepBpncWkJ3x9BXvGc07feB3IglnKMS/w7m5xK5Vt12yv7rdxDvpAgMBAAECggEASqw0i/f2vSTyP3PTo8EZTtUfcK/QUrqV10CLewYAZFq1s7zDC8Py0ahaV6GYpi7bvu6sVP4qoNGOlV6NARYoDouSU8+tZv8+z8JjUSNTBy6s8vcF+LdWyIEelilzfYxey82fA+paZ5vJfiRr4K2tEJ8AtFVDsy63j35RQkwLnZNVcOuo8lvX0IOzHEQsXGCNT/46Il7iLtEwYflnrbw9AElMgMYDdXBOVJTGdF+C6myHX0ZaOhqAxQxvDr/veXGI4MjLnoY+4C0zQ+hWA2dkTBy+iHxRYY1TsnY2XMPfz1zV6TGQ8ZFRywKaVUAvIYQthaO7Y+24rdi2qYiqOGtxIQKBgQDf/83OIVUYSWEzfZz2egQ/BgdPz40bepi6P4BjFBFZI4WEdZsbJocC6aChv/0l5MekIciMy15SqYYufb9s17zn8iLObrRy1WKa88meVDdtnvQdwyCyIJt6JTmW/4CVn44FKqvigAiYZKZ2d0GWB3DACanahqOn43yc2CjSza4dewKBgQDA3FYI+UERlxEzL1mF2TQJbveccaMp/Dt2cg747xSynEbTLVKXA9pMMovnwJVDhBIOKMKpElxqTwCjYER1UwbYQ15sJ0BaO4YvmuzMbTAXO3fSi/UTj1pIeMmkqGMRh2x7NK2X5kFE+R/S3154TWYbXVHdb+xxVZ2nMt8MNgfE6wKBgFb9NYSGh1BuNtRTROCnU/zRr4c8GBWCz8sMnCReB7qxQ8nEDl9F4AquhhYqw/myViGUiRi8Zb3+XcCyTuPLCG6fJws6DNPHsIpygGr/U6M7ppvkSk9CwH539FyCjwIMO5AgGS5WAICGHetFtu+3pf6+Aft+bBHoE12pyHjNLX//AoGBAL3XZf0ZVfq5qJ2oy0edAcMTbzuZBJKsjd/O8HwL42TZvkHbiEPM8BI3Y04yXPuDwr4bU1pYD445zBgGB/0xSDiTQBvYG1l25GRx7QxhoogL6qvfRtQFNUrHUz343uP/WUKCHSq75Z2+WJwbcgObtJnVJ2OA6864ByLxSWvct5MXAoGAMk1ka9opOJF4VnLIUp+o02ukqRMp48LNScF/1dFXSnPft7cjGLDhLv712SHjpOaMMiHxe+NsZQgSlhywzih2TpHkoCZ+uuwo2bics8N+//Q2jj/0Q5BCxamJNWmbMZNnLTvfhO1v9yXzNQZcvjpTp4CVW7qPgvOSdE9jA0t7g7g=
 
-! NamingService
+! NamingService (expects a running naming service on the same machine with the quickstart configuration)
 namingServiceAddress: tcp://localhost
 namingServicePort: 54321
-namingServicePublicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANBGzyjlTQfrxBC6EA5yrjqJraPo8AyYyjATHKkfyjb64DT2U4fTRpe/6dOHbZHgjSJ8RWJXUg5Ac62qDn+RLEcCAwEAAQ==
+namingServicePublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlMw4S4WjXYogQ0lXPCxmwK/Yb2JCpBAl09NHsoTMNh+IapDgHz+xc25iN9F78MOZ3Fl3tB4g81D8xKKlkRyM7jr4Ar3cmPVZrY4vXPzZ/tZkp2avRQ58Qtrd5aPzv3uYO1NbCmJoHH85220EYa/nrHR0gYL8QClxbkkndHzwDE5XcXiXF22H2mFeYl3ZgW0sRL7XkxZ6Uk2Ppp52ZOcpVLDNmunp7FL69g1FCWyUBhyllROIby/jZnQ2hb+bs8feFBm/Qpjhp6AT2goXVbNck3DNsIlmUSx3S9NQwQp1/cVpnr6BNqeOD+1P6TK6dh3hC4jqGi2LcS13tiasEqabxwIDAQAB
diff --git a/src/test/resources/NamingServiceSenderTest_NodeConfig1.json b/src/test/resources/NamingServiceSenderTest_NodeConfig1.json
@@ -12,5 +12,5 @@
     "messagePort": 6001,
     "restPort": 8081,
     "location": "Everywhere",
-    "description": "Machine specified in JUnit tests (Node 1)"
+    "description": "Machine specified in JUnit tests (Node 1) of the FBase project"
 }
diff --git a/src/test/resources/NamingServiceSenderTest_NodeConfig2.json b/src/test/resources/NamingServiceSenderTest_NodeConfig2.json
@@ -12,5 +12,5 @@
     "messagePort": 6002,
     "restPort": 8082,
     "location": "Everywhere",
-    "description": "Configuration fitting for Node 2"
+    "description": "Machine specified in JUnit tests (Node 2) of the FBase project"
 }

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public void tearDown() {`
`172`	`172`	`} catch (InterruptedException e) {`
`173`	`173`	`e.printStackTrace();`
`174`	`174`	`}`
`175`		`- System.exit(0);`
	`175`	`+ // System.exit(0);`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`public void fillWithData() throws FBaseStorageConnectorException, InterruptedException,`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ public void test() throws FBaseStorageConnectorException, InterruptedException,`
`83`	`83`	`assertEquals(record.getDataIdentifier(), fBase.connector.messageHistory_get(mID));`
`84`	`84`	`assertEquals(null,`
`85`	`85`	`fBase.connector.dataRecords_get(fBase.connector.messageHistory_get(mID)));`
`86`		`-`
`87`	`86`	`}`
`88`	`87`
`89`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@`
`12`	`12`	`"messagePort": 6001,`
`13`	`13`	`"restPort": 8081,`
`14`	`14`	`"location": "Everywhere",`
`15`		`- "description": "Machine specified in JUnit tests (Node 1)"`
	`15`	`+ "description": "Machine specified in JUnit tests (Node 1) of the FBase project"`
`16`	`16`	`}`