懒得勤快 6 年之前
父节点
当前提交
9584a14940

+ 0 - 10
Masuit.LuceneEFCore.SearchEngine.Test/Helpers/MockNonIndexableContext.cs

@@ -1,10 +0,0 @@
-using Masuit.LuceneEFCore.SearchEngine.Test.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Masuit.LuceneEFCore.SearchEngine.Test.Helpers
-{
-    public class MockNonIndexableContext : DbContext
-    {
-        public virtual DbSet<NonIndexable> NonIndexables { get; set; }
-    }
-}

+ 1 - 1
Masuit.LuceneEFCore.SearchEngine.Test/Helpers/TestDataGenerator.cs

@@ -15,7 +15,7 @@ namespace Masuit.LuceneEFCore.SearchEngine.Test.Helpers
             if (allTestUsers == null)
             {
                 allTestUsers = new List<User>();
-                TextReader reader = new StreamReader("Helpers\\TestData\\MOCK_USERS.csv");
+                TextReader reader = new StreamReader("Helpers\\TestData\\MOCK_USERS.csv");//网上下载的用户模拟数据
 
                 string data = reader.ReadLine();
 

+ 2 - 2
Masuit.LuceneEFCore.SearchEngine.Test/Helpers/TestDbContext.cs

@@ -23,7 +23,7 @@ namespace Masuit.LuceneEFCore.SearchEngine.Test.Helpers
         {
             if (!Users.Any())
             {
-                TextReader reader = new StreamReader("Helpers\\TestData\\MOCK_USERS.csv");
+                TextReader reader = new StreamReader("Helpers\\TestData\\MOCK_USERS.csv");//网上下载的用户模拟数据
 
                 string data = reader.ReadLine();
 
@@ -44,7 +44,7 @@ namespace Masuit.LuceneEFCore.SearchEngine.Test.Helpers
 
             if (!Cities.Any())
             {
-                TextReader reader = new StreamReader("Helpers\\TestData\\MOCK_CITIES.csv");
+                TextReader reader = new StreamReader("Helpers\\TestData\\MOCK_CITIES.csv");//网上下载的城市模拟数据
 
                 string data = reader.ReadLine();
                 while ((data = reader.ReadLine()) != null)

+ 1 - 7
Masuit.LuceneEFCore.SearchEngine.Test/LuceneIndexerTests.cs

@@ -5,15 +5,13 @@ using Lucene.Net.Store;
 using Masuit.LuceneEFCore.SearchEngine.Test.Helpers;
 using Masuit.LuceneEFCore.SearchEngine.Test.Models;
 using Microsoft.Extensions.Caching.Memory;
-using System;
 using System.Linq;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Masuit.LuceneEFCore.SearchEngine.Test
 {
-    [Trait("Category", "LuceneIndexer")]
-    public class LuceneIndexerTests : IDisposable
+    public class LuceneIndexerTests
     {
         private readonly ITestOutputHelper _output;
         private LuceneIndexer _indexer;
@@ -23,10 +21,6 @@ namespace Masuit.LuceneEFCore.SearchEngine.Test
             _output = output;
         }
 
-        public void Dispose()
-        {
-        }
-
         [Fact]
         public void AnIndexCanBeCreated()
         {

+ 0 - 8
Masuit.LuceneEFCore.SearchEngine.Test/Models/NonIndexable.cs

@@ -1,8 +0,0 @@
-namespace Masuit.LuceneEFCore.SearchEngine.Test.Models
-{
-    public class NonIndexable
-    {
-        public int Id { get; set; }
-        public string Name { get; set; }
-    }
-}

+ 0 - 1
Masuit.LuceneEFCore.SearchEngine.Test/SearchEngineTests.cs

@@ -12,7 +12,6 @@ using Xunit.Abstractions;
 
 namespace Masuit.LuceneEFCore.SearchEngine.Test
 {
-    [Trait("Category", "SearchContext")]
     public class SearchEngineTests
     {
         private TestDbContext _context;

+ 2 - 4
WebSearchDemo/Controllers/HomeController.cs

@@ -10,11 +10,10 @@ namespace WebSearchDemo.Controllers
     public class HomeController : Controller
     {
         private readonly ISearchEngine<DataContext> _searchEngine;
-        private readonly ILuceneIndexer _luceneIndexer;
-        public HomeController(ISearchEngine<DataContext> searchEngine, ILuceneIndexer luceneIndexer)
+
+        public HomeController(ISearchEngine<DataContext> searchEngine)
         {
             _searchEngine = searchEngine;
-            _luceneIndexer = luceneIndexer;
         }
         /// <summary>
         /// 搜索
@@ -26,7 +25,6 @@ namespace WebSearchDemo.Controllers
         [HttpGet]
         public IActionResult Index(string s, int page, int size)
         {
-            //var result = _searchEngine.ScoredSearch<Post>(new SearchOptions(s, page, size, "Title,Content,Email,Author"));
             var result = _searchEngine.ScoredSearch<Post>(new SearchOptions(s, page, size, typeof(Post)));
             return Ok(result);
         }

+ 0 - 72
WebSearchDemo/Startups.cs

@@ -1,72 +0,0 @@
-using Masuit.LuceneEFCore.SearchEngine;
-using Masuit.LuceneEFCore.SearchEngine.Extensions;
-using Masuit.LuceneEFCore.SearchEngine.Interfaces;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
-using Swashbuckle.AspNetCore.Swagger;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using WebSearchDemo.Database;
-
-namespace WebSearchDemo
-{
-    public class Startups
-    {
-        public Startups(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDbContext<DataContext>(db =>
-            {
-                db.UseInMemoryDatabase("test");
-                //db.UseSqlServer("Data Source=.;Initial Catalog=MyBlogs;Integrated Security=True");
-            });
-            services.AddSearchEngine<DataContext>(new LuceneIndexerOptions()
-            {
-                Path = "lucene"
-            });
-            services.AddSwaggerGen(c =>
-            {
-                c.SwaggerDoc("v1", new Info
-                {
-                    Title = "API文档",
-                    Version = "v1"
-                });
-                c.DescribeAllEnumsAsStrings();
-                c.IncludeXmlComments(AppContext.BaseDirectory + "WebSearchDemo.xml");
-            }); //配置swagger
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, DataContext db, ISearchEngine<DataContext> searchEngine)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-            db.Post.AddRange(JsonConvert.DeserializeObject<List<Post>>(File.ReadAllText(AppContext.BaseDirectory + "Posts.json")));
-            searchEngine.CreateIndex(new List<string>()
-            {
-                nameof(Post)
-            });
-            app.UseSwagger().UseSwaggerUI(c =>
-            {
-                c.SwaggerEndpoint($"/swagger/v1/swagger.json", "懒得勤快的博客,搜索引擎测试");
-            }); //配置swagger
-            app.UseMvcWithDefaultRoute();
-        }
-    }
-}