From d6a45694adaf85e396a61b5098db4e0764bc0ca0 Mon Sep 17 00:00:00 2001
From: ItsAdityaKSingh <adityakksingh23@gmail.com>
Date: Fri, 4 Feb 2022 23:49:41 +0530
Subject: [PATCH 1/2] added_location_model_test

---
 test/model_tests/location_test.dart | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 test/model_tests/location_test.dart

diff --git a/test/model_tests/location_test.dart b/test/model_tests/location_test.dart
new file mode 100644
index 00000000..12b12819
--- /dev/null
+++ b/test/model_tests/location_test.dart
@@ -0,0 +1,15 @@
+import 'package:beacon/models/location/location.dart';
+import 'package:test/test.dart';
+
+void main() {
+  Map<String, dynamic> dummyJson = {"lat": "100.1", "lon": "200.1"};
+
+  test('Checking if location fetch from Json is working: ', () {
+    Location location = Location.fromJson(dummyJson);
+
+    //location latitude
+    expect("100.1", location.lat);
+    //location longitude
+    expect("200.1", location.lon);
+  });
+}

From 2197a7fc1157b3ecd11639990974af97cd29e4dd Mon Sep 17 00:00:00 2001
From: ItsAdityaKSingh <adityakksingh23@gmail.com>
Date: Sat, 5 Feb 2022 00:43:35 +0530
Subject: [PATCH 2/2] conflicts

---
 pubspec.lock | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 pubspec.yaml |  2 +-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/pubspec.lock b/pubspec.lock
index 74c0d6a4..bb37c270 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -197,6 +197,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.0"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
   crypto:
     dependency: transitive
     description:
@@ -632,6 +639,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.2"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
   normalize:
     dependency: transitive
     description:
@@ -870,6 +884,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.4"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.0"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -917,6 +945,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  source_map_stack_trace:
+    dependency: transitive
+    description:
+      name: source_map_stack_trace
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.10.10"
   source_span:
     dependency: transitive
     description:
@@ -959,6 +1001,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
+  test:
+    dependency: "direct dev"
+    description:
+      name: test
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.17.12"
   test_api:
     dependency: transitive
     description:
@@ -966,6 +1015,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.3"
+  test_core:
+    dependency: transitive
+    description:
+      name: test_core
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.2"
   timezone:
     dependency: transitive
     description:
@@ -1085,6 +1141,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "7.5.0"
   watcher:
     dependency: transitive
     description:
@@ -1099,6 +1162,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   win32:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index c55ce9c9..e6ea437f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -46,7 +46,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   hive_generator: ^1.1.0
-
+  test: ^1.14.4
 flutter_icons:
   android: "launcher_icon"
   ios: true