Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Unified Diff: base/system_info_unittest.cc

Issue 624713003: Keep only base/extractor.[cc|h]. (Closed) Base URL: https://chromium.googlesource.com/external/omaha.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/system_info.cc ('k') | base/system_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/system_info_unittest.cc
diff --git a/base/system_info_unittest.cc b/base/system_info_unittest.cc
deleted file mode 100644
index 77ef45f3627b3ee8b8010dee4b284c5a4a5893a7..0000000000000000000000000000000000000000
--- a/base/system_info_unittest.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2003-2009 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// ========================================================================
-
-#include <atlstr.h>
-#include "omaha/base/system_info.h"
-#include "omaha/testing/unit_test.h"
-
-namespace omaha {
-
-TEST(SystemInfoTest, SystemInfo) {
- SystemInfo::OSVersionType os_type = SystemInfo::OS_WINDOWS_UNKNOWN;
- DWORD service_pack = 0;
- ASSERT_SUCCEEDED(SystemInfo::CategorizeOS(&os_type, &service_pack));
-}
-
-TEST(SystemInfoTest, GetSystemVersion) {
- int major_version(0);
- int minor_version(0);
- int service_pack_major(0);
- int service_pack_minor(0);
-
- CString name;
- ASSERT_TRUE(SystemInfo::GetSystemVersion(&major_version,
- &minor_version,
- &service_pack_major,
- &service_pack_minor,
- CStrBuf(name, MAX_PATH),
- MAX_PATH));
- EXPECT_NE(0, major_version);
- EXPECT_EQ(0, service_pack_minor);
-
- EXPECT_FALSE(name.IsEmpty());
-}
-
-TEST(SystemInfoTest, Is64BitWindows) {
- DWORD arch(SystemInfo::GetProcessorArchitecture());
-
- if (arch == PROCESSOR_ARCHITECTURE_INTEL) {
- EXPECT_FALSE(SystemInfo::Is64BitWindows());
- } else {
- EXPECT_TRUE(SystemInfo::Is64BitWindows());
- }
-}
-
-TEST(SystemInfoTest, GetProcessorArchitecture) {
- DWORD arch(SystemInfo::GetProcessorArchitecture());
-
- // TODO(omaha3): Maybe we could look for the presence of a wow6432 key in the
- // registry to detect.
- EXPECT_TRUE(arch == PROCESSOR_ARCHITECTURE_INTEL ||
- arch == PROCESSOR_ARCHITECTURE_AMD64);
-}
-
-} // namespace omaha
-
« no previous file with comments | « base/system_info.cc ('k') | base/system_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698